mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-04 17:24:46 +00:00
Code Activity

fix stuff

Browse Source
This commit is contained in:
deadc0de6
2024-01-29 23:19:52 +01:00
committed by deadc0de
parent 7f1208a408
commit 9ff3c5dff1
3 changed files with 74 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dotdrop/comparator.py
View File

@@ -146,10 +146,16 @@ class Comparator:
for i in lonly: for i in lonly:
path = os.path.join(local_path, i) path = os.path.join(local_path, i)
if os.path.isdir(path):
# ignore dir
continue
ret.append(f'=> \"{path}\" does not exist on destination\n') ret.append(f'=> \"{path}\" does not exist on destination\n')
if not self.ignore_missing_in_dotdrop: if not self.ignore_missing_in_dotdrop:
for i in ronly: for i in ronly:
path = os.path.join(deployed_path, i) path = os.path.join(deployed_path, i)
if os.path.isdir(path):
# ignore dir
continue
ret.append(f'=> \"{path}\" does not exist in dotdrop\n') ret.append(f'=> \"{path}\" does not exist in dotdrop\n')
# test for content difference # test for content difference

114
dotdrop/importer.py
View File

@@ -10,10 +10,10 @@ import shutil
# local imports # local imports
from dotdrop.logger import Logger from dotdrop.logger import Logger
from dotdrop.ftree import FTreeDir
from dotdrop.utils import strip_home, get_default_file_perms, \ from dotdrop.utils import strip_home, get_default_file_perms, \
get_file_perm, get_umask, must_ignore, \ get_file_perm, get_umask, must_ignore, \
get_unique_tmp_name, removepath, copytree_with_ign, \ get_unique_tmp_name, removepath
copyfile
from dotdrop.linktypes import LinkTypes from dotdrop.linktypes import LinkTypes
from dotdrop.comparator import Comparator from dotdrop.comparator import Comparator
from dotdrop.templategen import Templategen from dotdrop.templategen import Templategen
@@ -118,38 +118,39 @@ class Importer:
""" """
# normalize path # normalize path
dst = path.rstrip(os.sep) infspath = path.rstrip(os.sep)
dst = os.path.abspath(dst) infspath = os.path.abspath(infspath)
# test if must be ignored # test if must be ignored
if self._ignore(dst): if self._ignore(infspath):
return 0 return 0
# ask confirmation for symlinks # ask confirmation for symlinks
if self.safe: if self.safe:
realdst = os.path.realpath(dst) realdst = os.path.realpath(infspath)
if dst != realdst: if infspath != realdst:
msg = f'\"{dst}\" is a symlink, dereference it and continue?' msg = f'\"{infspath}\" is a symlink, '
msg += 'dereference it and continue?'
if not self.log.ask(msg): if not self.log.ask(msg):
return 0 return 0
# create src path # create src path
src = strip_home(dst) indotpath = strip_home(infspath)
if import_as: if import_as:
# handle import as # handle import as
src = os.path.expanduser(import_as) indotpath = os.path.expanduser(import_as)
src = src.rstrip(os.sep) indotpath = indotpath.rstrip(os.sep)
src = os.path.abspath(src) indotpath = os.path.abspath(indotpath)
src = strip_home(src) indotpath = strip_home(indotpath)
self.log.dbg(f'import src for {dst} as {src}') self.log.dbg(f'import src for {infspath} as {indotpath}')
# with or without dot prefix # with or without dot prefix
strip = '.' + os.sep strip = '.' + os.sep
if self.keepdot: if self.keepdot:
strip = os.sep strip = os.sep
src = src.lstrip(strip) indotpath = indotpath.lstrip(strip)
# get the permission # get the permission
perm = get_file_perm(dst) perm = get_file_perm(infspath)
# get the link attribute # get the link attribute
linktype = import_link linktype = import_link
@@ -158,15 +159,18 @@ class Importer:
self.log.err(f'importing \"{path}\" failed!') self.log.err(f'importing \"{path}\" failed!')
return -1 return -1
if self._already_exists(src, dst): if self._already_exists(indotpath, infspath):
return -1 return -1
self.log.dbg(f'import dotfile: src:{src} dst:{dst}') self.log.dbg(f'import dotfile: src:{indotpath} dst:{infspath}')
if not self._import_to_dotpath(indotpath,
if not self._import_to_dotpath(src, dst, trans_update=trans_update): infspath,
trans_update=trans_update):
self.log.dbg('import files failed')
return -1 return -1
return self._import_in_config(path, src, dst, perm, linktype, return self._import_in_config(path, indotpath,
infspath, perm, linktype,
import_mode, import_mode,
trans_update=trans_update, trans_update=trans_update,
trans_install=trans_install) trans_install=trans_install)
@@ -203,7 +207,7 @@ class Importer:
def _check_existing_dotfile(self, src, dst): def _check_existing_dotfile(self, src, dst):
""" """
check if a dotfile in the dotpath check if a dotfile file in the dotpath
already exists for this src already exists for this src
""" """
if not os.path.exists(src): if not os.path.exists(src):
@@ -226,48 +230,60 @@ class Importer:
def _import_to_dotpath(self, in_dotpath, in_fs, trans_update=None): def _import_to_dotpath(self, in_dotpath, in_fs, trans_update=None):
""" """
prepare hierarchy for dotfile in dotpath and copy file copy files to dotpath
""" """
srcf = os.path.join(self.dotpath, in_dotpath) in_dotpath_abs = os.path.join(self.dotpath, in_dotpath)
# check we are not overwritting # check we are not overwritting
if not self._check_existing_dotfile(srcf, in_fs): if not self._check_existing_dotfile(in_dotpath_abs, in_fs):
self.log.dbg(f'{in_dotpath_abs} exits already')
return False return False
# import the file # import the file
if self.dry: if self.dry:
self.log.dry(f'would copy {in_fs} to {srcf}') self.log.dry(f'would copy {in_fs} to {in_dotpath_abs}')
return True return True
# apply trans_update # apply trans_update
in_fs = self._apply_trans_update(in_fs, trans_update) in_fs = self._apply_trans_update(in_fs, trans_update)
if not in_fs: if not in_fs:
# transformation failed # transformation failed
self.log.dbg(f"trans failed: {in_fs}")
return False return False
# copy the file to the dotpath
try:
if not os.path.isdir(in_fs):
# is a file
self.log.dbg(f'{in_fs} is file')
if not copyfile(in_fs, srcf, debug=self.debug):
self.log.err(f'importing \"{in_fs}\" failed')
return False
else:
# is a dir
if os.path.exists(srcf):
shutil.rmtree(srcf)
self.log.dbg(f'{in_fs} is dir')
if not copytree_with_ign(in_fs, srcf,
ignore_func=self._ignore,
debug=self.debug):
self.log.err(f'importing \"{in_fs}\" failed')
return False
except shutil.Error as exc:
in_dotpath = exc.args[0][0][0]
why = exc.args[0][0][2]
self.log.err(f'importing \"{in_fs}\" failed: {why}')
return os.path.exists(srcf)
if not os.path.isdir(in_fs):
# handle file
self._import_file_to_dotpath(in_fs, in_dotpath_abs)
# handle dir and get a list of all files to import
fstree = FTreeDir(in_fs,
ignores=self.ignore,
debug=self.debug)
self.log.dbg(f'{len(fstree.get_entries())} files to import')
for entry in fstree.get_entries():
self.log.dbg("importing {entry}...")
src = os.path.join(in_fs, entry)
rel_src = os.path.relpath(entry, in_fs)
dst = os.path.join(in_dotpath_abs, rel_src)
if os.path.isdir(src):
# we do not care about directory
# these are created based on files
continue
self._import_file_to_dotpath(src, dst)
return os.path.exists(in_dotpath_abs)
def _import_file_to_dotpath(self, src, dst):
self.log.dbg(f'importing {src} to {dst}')
try:
os.makedirs(os.path.dirname(dst), exist_ok=True)
shutil.copy2(src, dst)
except IOError as exc:
self.log.err(f'importing \"{src}\" failed: {exc}')
return False
return True
def _already_exists(self, src, dst): def _already_exists(self, src, dst):
""" """

3
dotdrop/updater.py
View File

@@ -314,6 +314,9 @@ class Updater:
dstpath = os.path.join(local_path, i) dstpath = os.path.join(local_path, i)
if os.path.isdir(srcpath): if os.path.isdir(srcpath):
continue continue
if not self._same_rights(dstpath, srcpath):
# update rights
self._mirror_file_perms(srcpath, dstpath)
out = diff(modified=dstpath, original=srcpath, out = diff(modified=dstpath, original=srcpath,
debug=self.debug) debug=self.debug)
if not out: if not out: