core: expand '~' in get_files & import_dir
This commit is contained in:
parent
403ec18385
commit
c8bdbfd69f
3 changed files with 13 additions and 3 deletions
|
@ -98,7 +98,7 @@ for cls, p in modules:
|
||||||
export_path: Paths
|
export_path: Paths
|
||||||
|
|
||||||
# path to a local clone of hypexport
|
# path to a local clone of hypexport
|
||||||
# alternatively, you can put the repository (or a symlink) in $MY_CONFIG/repos/hypexport
|
# alternatively, you can put the repository (or a symlink) in $MY_CONFIG/my/config/repos/hypexport
|
||||||
hypexport : Optional[PathIsh] = None
|
hypexport : Optional[PathIsh] = None
|
||||||
#+end_src
|
#+end_src
|
||||||
- [[file:../my/reddit.py][my.reddit]]
|
- [[file:../my/reddit.py][my.reddit]]
|
||||||
|
@ -115,7 +115,7 @@ for cls, p in modules:
|
||||||
export_path: Paths
|
export_path: Paths
|
||||||
|
|
||||||
# path to a local clone of rexport
|
# path to a local clone of rexport
|
||||||
# alternatively, you can put the repository (or a symlink) in $MY_CONFIG/repos/rexport
|
# alternatively, you can put the repository (or a symlink) in $MY_CONFIG/my/config/repos/rexport
|
||||||
rexport : Optional[PathIsh] = None
|
rexport : Optional[PathIsh] = None
|
||||||
#+end_src
|
#+end_src
|
||||||
- [[file:../my/twitter/twint.py][my.twitter.twint]]
|
- [[file:../my/twitter/twint.py][my.twitter.twint]]
|
||||||
|
@ -172,7 +172,7 @@ for cls, p in modules:
|
||||||
export_path : Paths
|
export_path : Paths
|
||||||
|
|
||||||
# path to a local clone of instapexport
|
# path to a local clone of instapexport
|
||||||
# alternatively, you can put the repository (or a symlink) in $MY_CONFIG/repos/instapexport
|
# alternatively, you can put the repository (or a symlink) in $MY_CONFIG/my/config/repos/instapexport
|
||||||
instapexport: Optional[PathIsh] = None
|
instapexport: Optional[PathIsh] = None
|
||||||
#+end_src
|
#+end_src
|
||||||
:end:
|
:end:
|
||||||
|
|
|
@ -36,6 +36,8 @@ def import_from(path: PathIsh, name: str) -> types.ModuleType:
|
||||||
|
|
||||||
def import_dir(path: PathIsh, extra: str='') -> types.ModuleType:
|
def import_dir(path: PathIsh, extra: str='') -> types.ModuleType:
|
||||||
p = Path(path)
|
p = Path(path)
|
||||||
|
if p.parts[0] == '~':
|
||||||
|
p = p.expanduser() # TODO eh. not sure about this..
|
||||||
return import_from(p.parent, p.name + extra)
|
return import_from(p.parent, p.name + extra)
|
||||||
|
|
||||||
|
|
||||||
|
@ -130,6 +132,8 @@ def get_files(pp: Paths, glob: str=DEFAULT_GLOB, sort: bool=True) -> Tuple[Path,
|
||||||
|
|
||||||
paths: List[Path] = []
|
paths: List[Path] = []
|
||||||
for src in sources:
|
for src in sources:
|
||||||
|
if src.parts[0] == '~':
|
||||||
|
src = src.expanduser()
|
||||||
if src.is_dir():
|
if src.is_dir():
|
||||||
gp: Iterable[Path] = src.glob(glob)
|
gp: Iterable[Path] = src.glob(glob)
|
||||||
paths.extend(gp)
|
paths.extend(gp)
|
||||||
|
|
|
@ -26,6 +26,12 @@ def test_single_file():
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
"if the path starts with ~, we expand it"
|
||||||
|
assert get_files('~/.bashrc') == (
|
||||||
|
Path('~').expanduser() / '.bashrc',
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_multiple_files():
|
def test_multiple_files():
|
||||||
'''
|
'''
|
||||||
If you pass a directory/multiple directories, it flattens the contents
|
If you pass a directory/multiple directories, it flattens the contents
|
||||||
|
|
Loading…
Add table
Reference in a new issue