Skip to content

system: prepare transition from glob2 to stdlib glob in FileMapper #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

system: prepare transition from glob2 to stdlib glob in FileMapper #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion nimp/system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
'''System utilities (paths, processes)'''

import fnmatch
import glob
import importlib
import json
import logging
Expand Down Expand Up @@ -292,7 +293,25 @@ def _glob_mapper(src, dest):
else:
glob_path = os.path.join(src, pattern)

for glob_source in glob2.glob(glob_path, include_hidden=True):
glob2_res = glob2.glob(glob_path, include_hidden=True)
glob_res = set(glob.glob(glob_path, include_hidden=True, recursive=True))

if glob_add_elems := glob_res.difference(glob2_res):
logging.warning(
"[GLOB2->GLOB] Found elements in glob, that are not in glob2.\n"
"Please open an issue at https://github.com/dontnod/nimp/issues\n"
"elements: %s",
glob_add_elems,
)
if glob2_add_elems := set(glob2_res).difference(glob_res):
logging.warning(
"[GLOB2->GLOB] Found elements in glob2, that are not in glob.\n"
"Please open an issue at https://github.com/dontnod/nimp/issues\n"
"elements: %s",
glob2_add_elems,
)

for glob_source in glob2_res:
found = True
glob_source = str(glob_source)
# This is merely equivalent to os.path.relpath(src, self._source_path)
Expand Down