mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-06 11:57:59 +00:00
Code Activity

avoid duplicates when re-import existing dotfile

Browse Source
This commit is contained in:
deadc0de6
2019-07-08 19:17:58 +02:00
parent 6f165d0d3e
commit 229a7797d0
2 changed files with 166 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dotdrop/cfg_aggregator.py
View File

@@ -244,12 +244,10 @@ class CfgAggregator:
def path_to_dotfile_dst(self, path):
"""normalize the path to match dotfile dst"""
path = os.path.expanduser(path)
path = os.path.expandvars(path)
path = os.path.abspath(path)
home = os.path.expanduser(TILD) + os.sep
path = self._norm_path(path)
# normalize the path
# use tild for home
home = os.path.expanduser(TILD) + os.sep
if path.startswith(home):
path = path[len(home):]
path = os.path.join(TILD, path)
@@ -257,10 +255,12 @@ class CfgAggregator:
def get_dotfile_by_dst(self, dst):
"""get a dotfile by dst"""
try:
return next(d for d in self.dotfiles if d.dst == dst)
except StopIteration:
return None
dst = self._norm_path(dst)
for d in self.dotfiles:
left = self._norm_path(d.dst)
if left == dst:
return d
return None
def save(self):
"""save the config"""
@@ -350,3 +350,9 @@ class CfgAggregator:
return next(x for x in self.trans_w if x.key == key)
except StopIteration:
return None
def _norm_path(self, path):
path = os.path.expanduser(path)
path = os.path.expandvars(path)
path = os.path.abspath(path)
return path