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

more logs

Browse Source
This commit is contained in:
deadc0de6
2023-05-15 07:51:10 +02:00
committed by deadc0de
parent 31606969cc
commit 29351a82b1
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dotdrop/updater.py
View File

@@ -273,6 +273,7 @@ class Updater:
ignore_missing_in_dotdrop,
ignores):
"""create dirs that don't exist in dotdrop"""
self.log.dbg(f'_merge_dirs_create_left_only: {diff.left_only}')
for toadd in diff.left_only:
exist = os.path.join(left, toadd)
if not os.path.isdir(exist):
@@ -315,6 +316,7 @@ class Updater:
ignore_missing_in_dotdrop,
ignores):
"""remove dirs that don't exist in deployed version"""
self.log.dbg(f'_merge_dirs_remove_right_only: {diff.right_only}')
for toremove in diff.right_only:
old = os.path.join(right, toremove)
if not os.path.isdir(old):
@@ -333,6 +335,7 @@ class Updater:
# handle files diff
# sync files that exist in both but are different
self.log.dbg(f'_merge_dirs_remove_right_only: {diff.diff_files}')
fdiff = diff.diff_files
fdiff.extend(diff.funny_files)
fdiff.extend(diff.common_funny)
@@ -354,6 +357,7 @@ class Updater:
ignore_missing_in_dotdrop,
ignores):
"""copy files that don't exist in dotdrop"""
self.log.dbg(f'_merge_dirs_copy_left_only: {diff.left_only}')
for toadd in diff.left_only:
exist = os.path.join(left, toadd)
if os.path.isdir(exist):
@@ -379,6 +383,7 @@ class Updater:
def _merge_dirs_remove_right_only_2(self, diff, right, ignores):
"""remove files that don't exist in deployed version"""
self.log.dbg(f'_merge_dirs_remove_right_only_2: {diff.right_only}')
for toremove in diff.right_only:
new = os.path.join(right, toremove)
if not os.path.exists(new):

34
tests-ng/update-negative-ignore-all-but.sh vendored
View File

@@ -42,20 +42,20 @@ echo "[+] dst dir: ${tmpd}"
# dotfiles in dotdrop
mkdir -p "${basedir}"/dotfiles/a/{b,c,x}
echo 'a' > "${basedir}"/dotfiles/a/b/abfile1
echo 'a' > "${basedir}"/dotfiles/a/b/abfile2
echo 'a' > "${basedir}"/dotfiles/a/b/abfile3
echo 'a' > "${basedir}"/dotfiles/a/c/acfile
echo 'a' > "${basedir}"/dotfiles/a/x/axfile
echo 'original' > "${basedir}"/dotfiles/a/b/abfile1
echo 'original' > "${basedir}"/dotfiles/a/b/abfile2
echo 'original' > "${basedir}"/dotfiles/a/b/abfile3
echo 'original' > "${basedir}"/dotfiles/a/c/acfile
echo 'original' > "${basedir}"/dotfiles/a/x/axfile
# filesystem
mkdir -p "${tmpd}"/a/{b,c,d,x}
echo "b" > "${tmpd}/a/b/abfile1"
echo "b" > "${tmpd}/a/b/abfile2"
echo "b" > "${tmpd}/a/b/abfile3"
echo "b" > "${tmpd}/a/c/acfile"
echo "b" > "${tmpd}/a/d/adfile"
echo "b" > "${tmpd}/a/x/axfile"
echo "updated" > "${tmpd}/a/b/abfile1"
echo "updated" > "${tmpd}/a/b/abfile2"
echo "updated" > "${tmpd}/a/b/abfile3"
echo "updated" > "${tmpd}/a/c/acfile"
echo "updated" > "${tmpd}/a/d/adfile"
echo "updated" > "${tmpd}/a/x/axfile"
clear_on_exit "${basedir}"
clear_on_exit "${tmpd}"
@@ -87,13 +87,13 @@ echo "[+] update"
cd "${ddpath}" | ${bin} update -f -c "${cfg}" --verbose --profile=p1 --key d_abc
# check files haven't been updated
grep_or_fail a "${basedir}"/dotfiles/a/b/abfile1
grep_or_fail a "${basedir}"/dotfiles/a/b/abfile2
grep_or_fail a "${basedir}"/dotfiles/a/b/abfile3
grep_or_fail b "${basedir}"/dotfiles/a/c/acfile
grep_or_fail "original" "${basedir}"/dotfiles/a/b/abfile1
grep_or_fail "original" "${basedir}"/dotfiles/a/b/abfile2
grep_or_fail "original" "${basedir}"/dotfiles/a/b/abfile3
grep_or_fail "updated" "${basedir}"/dotfiles/a/c/acfile
[ ! -s "${basedir}"/dotfiles/a/d/adfile ] && echo "adfile not updated" && exit 1
grep_or_fail b "${basedir}"/dotfiles/a/d/adfile
grep_or_fail a "${basedir}"/dotfiles/a/x/axfile
grep_or_fail "updated" "${basedir}"/dotfiles/a/d/adfile
grep_or_fail "original" "${basedir}"/dotfiles/a/x/axfile
echo "OK"
exit 0