mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-05 12:38:50 +00:00
Code Activity

linting

Browse Source
This commit is contained in:
deadc0de6
2021-04-29 15:54:35 +02:00
parent 4f19dc790c
commit c80ea1a4f2
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dotdrop/importer.py
View File

@@ -150,6 +150,26 @@ class Importer:
self.log.sub('\"{}\" imported'.format(path))
return 1
def _prepare_hier_when_exists(self, srcf, dst):
"""a dotfile in dotpath already exists at that spot"""
if not os.path.exists(srcf):
return True
if not self.safe:
return True
cmp = Comparator(debug=self.debug,
diff_cmd=self.diff_cmd)
diff = cmp.compare(srcf, dst)
if diff != '':
# files are different, dunno what to do
self.log.log('diff \"{}\" VS \"{}\"'.format(dst, srcf))
self.log.emph(diff)
# ask user
msg = 'Dotfile \"{}\" already exists, overwrite?'
if not self.log.ask(msg.format(srcf)):
return False
self.log.dbg('will overwrite existing file')
return True
def _prepare_hierarchy(self, src, dst):
"""prepare hierarchy for dotfile"""
srcf = os.path.join(self.dotpath, src)
@@ -157,21 +177,8 @@ class Importer:
if self._ignore(srcf) or self._ignore(srcfd):
return False
# a dotfile in dotpath already exists at that spot
if os.path.exists(srcf):
if self.safe:
cmp = Comparator(debug=self.debug,
diff_cmd=self.diff_cmd)
diff = cmp.compare(srcf, dst)
if diff != '':
# files are different, dunno what to do
self.log.log('diff \"{}\" VS \"{}\"'.format(dst, srcf))
self.log.emph(diff)
# ask user
msg = 'Dotfile \"{}\" already exists, overwrite?'
if not self.log.ask(msg.format(srcf)):
return False
self.log.dbg('will overwrite existing file')
if not self._prepare_hier_when_exists(srcf, dst):
return False
# create directory hierarchy
if self.dry: