diff --git a/sickbeard/db.py b/sickbeard/db.py index dfd4b35..92586a7 100644 --- a/sickbeard/db.py +++ b/sickbeard/db.py @@ -32,7 +32,6 @@ from exceptions_helper import ex import sickbeard from . import logger, sgdatetime -from .helpers import scantree from .sgdatetime import timestamp_near from sg_helpers import make_dirs, compress_file, remove_file_perm @@ -782,6 +781,8 @@ def delete_old_db_backups(target): :param target: backup folder to check """ + from .helpers import scantree + use_count = (1, sickbeard.BACKUP_DB_MAX_COUNT)[not sickbeard.BACKUP_DB_ONEDAY] file_list = [f for f in scantree(target, include=['sickbeard|cache|failed'], filter_kind=False)] if use_count < len(file_list): diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py index a315f42..f23c2b0 100644 --- a/sickbeard/helpers.py +++ b/sickbeard/helpers.py @@ -1112,7 +1112,7 @@ def clear_cache(force=False): except OSError: dirty = True - logger.log(u'%s from cache folder %s' % ((('Found items removed', 'Found items not removed')[dirty], + logger.log(u'%s from cache folder %s' % ((('Found items not removed', 'Found items removed')[not dirty], 'No items found to remove')[None is dirty], sickbeard.CACHE_DIR))