1
0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-12 18:45:13 +00:00

refactoring

This commit is contained in:
deadc0de6
2020-10-08 19:48:12 +02:00
parent a57496a9ba
commit 96fcff89c8

View File

@@ -103,11 +103,11 @@ class Installer:
self.log.dbg('install {} to {}'.format(src, dst)) self.log.dbg('install {} to {}'.format(src, dst))
self.log.dbg('is a directory \"{}\": {}'.format(src, isdir)) self.log.dbg('is a directory \"{}\": {}'.format(src, isdir))
if isdir: if isdir:
b, e = self._handle_dir(templater, src, dst, b, e = self._install_dir(templater, src, dst,
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, ignore=ignore) noempty=noempty, ignore=ignore)
return self._log_install(b, e) return self._log_install(b, e)
b, e = self._handle_file(templater, src, dst, b, e = self._install_file(templater, src, dst,
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, ignore=ignore) noempty=noempty, ignore=ignore)
return self._log_install(b, e) return self._log_install(b, e)
@@ -306,7 +306,7 @@ class Installer:
tmp['_dotfile_sub_abs_dst'] = dst tmp['_dotfile_sub_abs_dst'] = dst
return tmp return tmp
def _handle_file(self, templater, src, dst, def _install_file(self, templater, src, dst,
actionexec=None, noempty=False, actionexec=None, noempty=False,
ignore=[]): ignore=[]):
"""install src to dst when is a file""" """install src to dst when is a file"""
@@ -357,7 +357,7 @@ class Installer:
err = 'installing {} to {}'.format(src, dst) err = 'installing {} to {}'.format(src, dst)
return False, err return False, err
def _handle_dir(self, templater, src, dst, def _install_dir(self, templater, src, dst,
actionexec=None, noempty=False, actionexec=None, noempty=False,
ignore=[]): ignore=[]):
"""install src to dst when is a directory""" """install src to dst when is a directory"""
@@ -374,7 +374,7 @@ class Installer:
f = os.path.join(src, entry) f = os.path.join(src, entry)
if not os.path.isdir(f): if not os.path.isdir(f):
# is file # is file
res, err = self._handle_file(templater, f, res, err = self._install_file(templater, f,
os.path.join(dst, entry), os.path.join(dst, entry),
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, noempty=noempty,
@@ -388,7 +388,7 @@ class Installer:
ret = True, None ret = True, None
else: else:
# is directory # is directory
res, err = self._handle_dir(templater, f, res, err = self._install_dir(templater, f,
os.path.join(dst, entry), os.path.join(dst, entry),
actionexec=actionexec, actionexec=actionexec,
noempty=noempty, noempty=noempty,