tyler.durden
/
cockpit-navigator
mirror of https://github.com/45Drives/cockpit-navigator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

put conflict number before extension

This commit is contained in:
joshuaboud 2021-12-16 17:12:26 -04:00
parent da920db018
commit 7e4d1a6b9a
No known key found for this signature in database
GPG Key ID: 17EFB59E2A8BF50E
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
navigator/scripts/paste.py3
View File

@ -115,10 +115,10 @@ def filter_existing(files):
elif choice == "rename":
for conflict in conflicts:
num = 1
conflict.dst += "(1)"
conflict.dst = "(1)".join(os.path.splitext(conflict.dst))
while conflict.check_if_exists():
num += 1
conflict.dst = re.sub(r'\(\d+\)$', f"({num})", conflict.dst)
conflict.dst = re.sub(r'\(\d+\)(?=(\.[^(]+)?$)', f"({num})", conflict.dst)
non_conflicts.extend(conflicts)
elif choice == "skip-conflicts":
pass