mirror of
https://github.com/vladmandic/automatic
synced 2026-09-19 17:24:32 +02:00
Merge branch 'dev' into ext-table
This commit is contained in:
@@ -40,7 +40,7 @@ def list_extensions():
|
||||
fn = os.path.join(paths.script_path, "html", "extensions.json")
|
||||
extensions_list = shared.readfile(fn, silent=True, as_type="list")
|
||||
if len(extensions_list) == 0:
|
||||
shared.log.info(f'Extension list is empty or invalid. Try refreshing or verifying downloaded data. file="{fn}"')
|
||||
shared.log.info("Extension List: No information found. Refresh required.")
|
||||
found = []
|
||||
for ext in extensions.extensions:
|
||||
ext.read_info()
|
||||
@@ -107,7 +107,7 @@ def check_updates(_id_task, disable_list, search_text, sort_column):
|
||||
ext.check_updates()
|
||||
if ext.can_update:
|
||||
ext.git_fetch()
|
||||
ext.read_info(True)
|
||||
ext.read_info()
|
||||
commit_date = ext.commit_date or 1577836800
|
||||
shared.log.info(f'Extensions updated: {ext.name} {ext.commit_hash[:8]} {extensions.format_dt(extensions.ts2utc(commit_date), seconds=True)}')
|
||||
else:
|
||||
@@ -228,7 +228,7 @@ def update_extension(extension_path, search_text, sort_column):
|
||||
ext.check_updates()
|
||||
if ext.can_update:
|
||||
ext.git_fetch()
|
||||
ext.read_info(True)
|
||||
ext.read_info()
|
||||
commit_date = ext.commit_date or 1577836800
|
||||
shared.log.info(f'Extensions updated: {ext.name} {ext.commit_hash[:8]} {extensions.format_dt(extensions.ts2utc(commit_date), seconds=True)}')
|
||||
else:
|
||||
@@ -339,7 +339,7 @@ def create_html(search_text, sort_column):
|
||||
debug(f'Extension not from github: name={ext["name"]} url={ext["url"]}')
|
||||
except Exception as e:
|
||||
debug(f'Extension get updated error: name={ext["name"]} url={ext["url"]} {e}')
|
||||
local_ver_date = datetime.fromtimestamp(ext['commit_date'], timezone.utc) # TZ-aware
|
||||
local_ver_date = extensions.ts2utc(ext['commit_date']) # TZ-aware
|
||||
update_available = (installed is not None) and (not ext['is_builtin']) and (ext['remote'] is not None) and (updated > local_ver_date) # TZ-aware
|
||||
if update_available:
|
||||
debug(f'Extension update available: name={ext["name"]} updated={extensions.format_dt(updated, seconds=True)} commit={extensions.format_dt(local_ver_date, seconds=True)}') # TZ-aware
|
||||
|
||||
Reference in New Issue
Block a user