monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-11-21 20:35:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/AddExcludeDirs' into dev

Browse source
This commit is contained in:
JackDandy 2023-10-28 13:48:58 +01:00
commit 9b8f8ffaa2
2 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
lib/sg_helpers.py
View file

@ -1079,40 +1079,58 @@ def save_failure(url, domain, log_failure_url, post_data, post_json):
def scantree(path, # type: AnyStr def scantree(path, # type: AnyStr
exclude=None, # type: Optional[AnyStr, List[AnyStr]] exclude=None, # type: Optional[AnyStr, List[AnyStr]]
exclude_dirs=None, # type: Optional[AnyStr, List[AnyStr]]
include=None, # type: Optional[AnyStr, List[AnyStr]] include=None, # type: Optional[AnyStr, List[AnyStr]]
follow_symlinks=False, # type: bool follow_symlinks=False, # type: bool
filter_kind=None, # type: Optional[bool] filter_kind=None, # type: Optional[bool]
recurse=True, # type: bool recurse=True, # type: bool
exclude_folders_with_files=None # type: Optional[List[AnyStr]] exclude_folders_with_files=None, # type: Optional[List[AnyStr]]
internal_call=False, # type: bool
rc_exc=None, # type: List
rc_exc_dir=None, # type: List
rc_inc=None # type: List
): ):
# type: (...) -> Generator[DirEntry, None, None] # type: (...) -> Generator[DirEntry, None, None]
"""Yield DirEntry objects for given path. Returns without yield if path fails sanity check """Yield DirEntry objects for given path. Returns without yield if path fails sanity check
:param path: Path to scan, sanity check is_dir and exists :param path: Path to scan, sanity check is_dir and exists
:param exclude: Escaped regex string(s) to exclude :param exclude: Escaped regex string(s) to exclude (files and directories)
:param exclude_dirs: Escaped regex string(s) to exclude (directories only)
:param include: Escaped regex string(s) to include :param include: Escaped regex string(s) to include
:param follow_symlinks: Follow symlinks :param follow_symlinks: Follow symlinks
:param filter_kind: None to yield everything, True yields directories, False yields files :param filter_kind: None to yield everything, True yields directories, False yields files
:param recurse: Recursively scan the tree :param recurse: Recursively scan the tree
:param exclude_folders_with_files: exclude folder that contain the listed file(s) :param exclude_folders_with_files: exclude folder that contain the listed file(s)
:param internal_call: internal use
:param rc_exc: internal use
:param rc_exc_dir: internal use
:param rc_inc: internal use
""" """
if isinstance(path, string_types) and path and os.path.isdir(path): if isinstance(path, string_types) and path and os.path.isdir(path):
rc_exc, rc_inc = [re.compile(rx % '|'.join( if not internal_call:
[x for x in (param, ([param], [])[None is param])[not isinstance(param, list)]])) rc_exc, rc_exc_dir, rc_inc = [re.compile(rx % '|'.join(
for rx, param in ((r'(?i)^(?:(?!%s).)*$', exclude), (r'(?i)%s', include))] [x for x in (param, ([param], [])[None is param])[not isinstance(param, list)]]))
for rx, param in ((r'(?i)^(?:(?!%s).)*$', exclude), (r'(?i)^(?:(?!%s).)*$', exclude_dirs),
(r'(?i)%s', include))]
for entry in scandir(path): for entry in scandir(path):
is_dir = entry.is_dir(follow_symlinks=follow_symlinks) is_dir = entry.is_dir(follow_symlinks=follow_symlinks)
is_file = entry.is_file(follow_symlinks=follow_symlinks) is_file = entry.is_file(follow_symlinks=follow_symlinks)
no_filter = any([None is filter_kind, filter_kind and is_dir, not filter_kind and is_file]) no_filter = any([None is filter_kind, filter_kind and is_dir, not filter_kind and is_file])
if (rc_exc.search(entry.name), True)[not exclude] and (rc_inc.search(entry.name), True)[not include] \ if ((not exclude or rc_exc.search(entry.name))
and (no_filter or (not filter_kind and is_dir and recurse)): and (not exclude_dirs or not is_dir or rc_exc_dir.search(entry.name))
and (not include or rc_inc.search(entry.name))
and (no_filter or (not filter_kind and is_dir and recurse))):
if is_dir and exclude_folders_with_files and any(os.path.isfile(os.path.join(entry.path, e_f)) if is_dir and exclude_folders_with_files and any(os.path.isfile(os.path.join(entry.path, e_f))
for e_f in exclude_folders_with_files): for e_f in exclude_folders_with_files):
logger.debug(f'Ignoring Folder: "{entry.path}", because it contains a exclude file' logger.debug(f'Ignoring Folder: "{entry.path}", because it contains a exclude file'
f' "{", ".join(exclude_folders_with_files)}"') f' "{", ".join(exclude_folders_with_files)}"')
continue continue
if recurse and is_dir: if recurse and is_dir:
for subentry in scantree(entry.path, exclude, include, follow_symlinks, filter_kind, recurse): for subentry in scantree(
path=entry.path, exclude=exclude, exclude_dirs=exclude_dirs, include=include,
follow_symlinks=follow_symlinks, filter_kind=filter_kind, recurse=recurse,
exclude_folders_with_files=exclude_folders_with_files, internal_call=True,
rc_exc=rc_exc, rc_exc_dir=rc_exc_dir, rc_inc=rc_inc):
yield subentry yield subentry
if no_filter: if no_filter:
yield entry yield entry

14
sickgear/helpers.py
View file

@ -158,9 +158,7 @@ def has_media_ext(filename):
return False return False
sep_file = filename.rpartition('.') sep_file = filename.rpartition('.')
return (None is re.search( return (None is re.search('extras?$', sep_file[0], re.I)) and (sep_file[2].lower() in mediaExtensions)
r'(extras|-(?:Behind\sThe\sScenes|Deleted\sScenes|Featurettes|Interviews|Scenes|Shorts|Trailers|Other))$',
sep_file[0], re.I)) and (sep_file[2].lower() in mediaExtensions)
def has_image_ext(filename): def has_image_ext(filename):
@ -354,10 +352,10 @@ def list_media_files(path):
if [direntry for direntry in scantree(path, include=[r'\.sickgearignore'], filter_kind=False, recurse=False)]: if [direntry for direntry in scantree(path, include=[r'\.sickgearignore'], filter_kind=False, recurse=False)]:
logger.debug('Skipping folder "%s" because it contains ".sickgearignore"' % path) logger.debug('Skipping folder "%s" because it contains ".sickgearignore"' % path)
else: else:
result = [direntry.path for direntry in scantree(path, exclude=[ result = [direntry.path for direntry in scantree(path, exclude_dirs=[
'Extras', '^Extras$',
'Behind The Scenes', 'Deleted Scenes', 'Featurettes', '^Behind The Scenes$', '^Deleted Scenes$', '^Featurettes$',
'Interviews', 'Scenes', 'Shorts', 'Trailers', 'Other' '^Interviews$', '^Scenes$', '^Shorts$', '^Trailers$', '^Other$'
], filter_kind=False, exclude_folders_with_files=['.sickgearignore']) ], filter_kind=False, exclude_folders_with_files=['.sickgearignore'])
if has_media_ext(direntry.name)] if has_media_ext(direntry.name)]
return result return result
@ -1018,7 +1016,7 @@ def clear_cache(force=False):
dirty = None dirty = None
del_time = SGDatetime.timestamp_near(td=datetime.timedelta(hours=12)) del_time = SGDatetime.timestamp_near(td=datetime.timedelta(hours=12))
direntry_args = dict(follow_symlinks=False) direntry_args = dict(follow_symlinks=False)
for direntry in scantree(sickgear.CACHE_DIR, ['images|rss|zoneinfo'], follow_symlinks=True): for direntry in scantree(sickgear.CACHE_DIR, exclude_dirs=['images|rss|zoneinfo'], follow_symlinks=True):
if direntry.is_file(**direntry_args) and (force or del_time > direntry.stat(**direntry_args).st_mtime): if direntry.is_file(**direntry_args) and (force or del_time > direntry.stat(**direntry_args).st_mtime):
dirty = dirty or False if remove_file_perm(direntry.path) else True dirty = dirty or False if remove_file_perm(direntry.path) else True
elif direntry.is_dir(**direntry_args) and direntry.name not in ['cheetah', 'sessions', 'indexers']: elif direntry.is_dir(**direntry_args) and direntry.name not in ['cheetah', 'sessions', 'indexers']: