diff --git a/gui/slick/js/inc_bottom.js b/gui/slick/js/inc_bottom.js index 2b954742..e9f24ef4 100644 --- a/gui/slick/js/inc_bottom.js +++ b/gui/slick/js/inc_bottom.js @@ -1,14 +1,17 @@ -function initLazyload(){ - $.ll = new LazyLoad({elements_selector:'img[data-original]', callback_load:function(element){ - if (element.id) { - var el = document.getElementById('loading-' + element.id), className = 'hide'; - if (!!document.body.classList) { - el.classList.add(className); - } else { - el.className += (el.className ? ' ' : '') + className; - } +function hide_lazy_ani (element){ + if (element.id) { + var el = document.getElementById('loading-' + element.id), className = 'hide'; + if (!!document.body.classList) { + el.classList.add(className); + } else { + el.className += (el.className ? ' ' : '') + className; } - }}); + } +} + +function initLazyload(){ + $.ll = new LazyLoad({elements_selector:'img[data-original]', callback_load: hide_lazy_ani, + callback_error: hide_lazy_ani}); $.ll.handleScroll(); return !0; } diff --git a/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz b/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz index fef226e8..fa2f878d 100644 Binary files a/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz and b/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz differ diff --git a/lib/sg_helpers.py b/lib/sg_helpers.py index 08c2d416..52f600ad 100644 --- a/lib/sg_helpers.py +++ b/lib/sg_helpers.py @@ -1148,7 +1148,7 @@ def scantree(path, # type: AnyStr def copy_file(src_file, dest_file): if os.name.startswith('posix'): - subprocess.call(['cp', src_file, dest_file]) + subprocess.call(['cp', '-f', src_file, dest_file]) else: shutil.copyfile(src_file, dest_file) diff --git a/sickgear.py b/sickgear.py index 24d981f7..b30fef9d 100755 --- a/sickgear.py +++ b/sickgear.py @@ -36,9 +36,8 @@ warnings.filterwarnings('ignore', module=r'.*ssl_.*', message='.*SSLContext obje warnings.filterwarnings('ignore', module=r'.*zoneinfo.*', message='.*file or directory.*') warnings.filterwarnings('ignore', message='.*deprecated in cryptography.*') -versions = [((3, 8, 2), (3, 8, 19)), - ((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 19)), - ((3, 10, 0), (3, 12, 5))] # inclusive version ranges +versions = [((3, 9, 0), (3, 9, 2)), ((3, 9, 4), (3, 9, 20)), + ((3, 10, 0), (3, 12, 7))] # inclusive version ranges if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)): major, minor, micro = sys.version_info[:3] print('Python %s.%s.%s detected.' % (major, minor, micro)) diff --git a/sickgear/__init__.py b/sickgear/__init__.py index 1f7eee64..82e3b32d 100644 --- a/sickgear/__init__.py +++ b/sickgear/__init__.py @@ -2475,22 +2475,36 @@ def _save_config(force=False, **kwargs): backup_config = re.sub(r'\.ini$', '.bak', CONFIG_FILE) from .config import check_valid_config try: + if check_valid_config(CONFIG_FILE): + for _t in range(0, 3): copy_file(CONFIG_FILE, backup_config) if not check_valid_config(backup_config): - logger.error('config file seams to be invalid, not backing up.') + if 2 > _t: + logger.debug('backup config file seems to be invalid, retrying...') + else: + logger.warning('backup config file seems to be invalid, not backing up.') + backup_config = None remove_file_perm(backup_config) + 2 > _t and time.sleep(3) + else: + break + else: + logger.warning('existing config file is invalid, not backing it up') backup_config = None except (BaseException, Exception): backup_config = None - for _ in range(0, 3): + for _t in range(0, 3): new_config.write() if check_valid_config(CONFIG_FILE): CONFIG_OLD = copy.deepcopy(new_config) return - logger.warning('saving config file failed, retrying...') + if 2 > _t: + logger.debug('saving config file failed, retrying...') + else: + logger.warning('saving config file failed.') remove_file_perm(CONFIG_FILE) - time.sleep(3) + 2 > _t and time.sleep(3) # we only get here if the config saving failed multiple times if None is not backup_config and os.path.isfile(backup_config): diff --git a/sickgear/helpers.py b/sickgear/helpers.py index 9c682585..4f765cb2 100644 --- a/sickgear/helpers.py +++ b/sickgear/helpers.py @@ -171,7 +171,7 @@ def has_image_ext(filename): :rtype: bool """ try: - if os.path.splitext(filename)[1].lower() in ['.bmp', '.gif', '.jpeg', '.jpg', '.png', '.webp']: + if os.path.splitext(filename)[1].lower() in ['.avif', '.bmp', '.gif', '.jpeg', '.jpg', '.png', '.webp']: return True except (BaseException, Exception): pass diff --git a/sickgear/py_requirement.data b/sickgear/py_requirement.data index 00e897bd..b72ad011 100644 --- a/sickgear/py_requirement.data +++ b/sickgear/py_requirement.data @@ -1 +1 @@ -3.8.2 \ No newline at end of file +3.9.0 \ No newline at end of file