-
Notifications
You must be signed in to change notification settings - Fork 0
/
syncthing_conflict_resolver.py
174 lines (146 loc) · 7.19 KB
/
syncthing_conflict_resolver.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
#!/usr/bin/env python3
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
####################################################################################
#
# Resolve conflicts with Syncthing's *sync-conflict* files, keep only newest versions
#
# Be careful and use the --dry-run option to check out which files would get deleted!
#
# tested on Python 3.3+
#
# Christoph Haunschmidt 2015-11
__version__ = '2015-11-25.1'
import os.path
import argparse
import re
import logging
from collections import defaultdict
SYNC_CONFLICT_RE = re.compile(r'^(?P<root>.*)\.sync-conflict-\d{8}-\d{6}(?P<extension>\.[^\.]*){0,1}$')
DELETED_FILES = 0
RENAMED_FILES = 0
DELETED_ORPHANED_FILES = 0
def check_conflicting_files(original_fn, conflict_file_set):
"""Checks conflicting files and keeps the newest"""
global DELETED_FILES
global RENAMED_FILES
all_fns = {original_fn} | conflict_file_set
if len(all_fns) < 2:
logging.info('No sync conflict: {}'.format(original_fn))
return
mtime_dict = {os.stat(f).st_mtime: f for f in all_fns}
newest_fn = mtime_dict[max(mtime_dict.keys())]
to_delete_fns = all_fns - {newest_fn}
if ARGS.interactive and not ARGS.dry_run:
print(os.linesep + os.linesep.join(to_delete_fns))
do_delete = input('Y for keeping {} and deleting the files above? '.format(newest_fn)).lower() == 'y'
else:
do_delete = True
if not do_delete:
logging.debug('Skipping deletion of conflicting files for {}'.format(original_fn))
return
for to_delete_fn in to_delete_fns:
if not ARGS.dry_run:
try:
os.remove(to_delete_fn)
DELETED_FILES += 1
logging.debug('Deleted {}'.format(to_delete_fn))
except Exception as e:
logging.error('Error deleting {}: {}'.format(to_delete_fn, e))
else:
logging.info('Dry-run: would delete {}'.format(to_delete_fn))
if original_fn != newest_fn:
if not ARGS.dry_run:
try:
os.rename(newest_fn, original_fn)
RENAMED_FILES += 1
logging.debug('Renamed {} to {}'.format(newest_fn, original_fn))
except Exception as e:
logging.error('Error renaming {} to {}: {}'.format(newest_fn, original_fn, e))
else:
logging.info('Dry-run: would rename {} to {}'.format(newest_fn, original_fn))
def check_dir(directory):
"""Checks a directory (and possible subdirs) for sync-conflict files"""
global DELETED_ORPHANED_FILES
conflicting_files = defaultdict(set)
for root, dirs, files in os.walk(directory):
for fn in files:
try:
m = SYNC_CONFLICT_RE.match(fn)
if m:
conflicting_fn = m.group('root') + (m.group('extension') or '')
full_conflicting_fn = os.path.join(root, conflicting_fn)
full_fn = os.path.join(root, fn)
if conflicting_fn in files:
conflicting_files[full_conflicting_fn].add(full_fn)
logging.debug('Dir {}: conflict {} with {}'.format(root, conflicting_fn, fn))
else:
if ARGS.delete_orphans:
if not ARGS.dry_run:
if ARGS.interactive:
do_delete = input('Y for deleting the orphaned file {}? '.format(
full_fn)).lower() == 'y'
else:
do_delete = True
if do_delete:
try:
os.remove(full_fn)
DELETED_ORPHANED_FILES += 1
logging.debug('Deleted orphaned file {}'.format(full_fn))
except Exception as e:
logging.error('Error deleting orphaned file {}: {}'.format(full_fn, e))
else:
logging.debug('Skipping deletion of orphaned file {}'.format(full_fn))
else:
logging.info('Dry-run: would delete orphaned file {}'.format(full_fn))
else:
logging.info('"Orphaned" sync-conflict file: {}'.format(full_fn))
except Exception as e:
logging.warning(e)
if not ARGS.recursive:
break
for original_fn, conflicting_fns in conflicting_files.items():
check_conflicting_files(original_fn, conflicting_fns)
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Gets rid of Syncthing\'s "*sync-conflict-YYYYMMDD-HHMMSS*" files. '
'It checks the modification date of the conflicting files, determines the newest version and renames it to '
'the original file name, while deleting the other versions. Be careful without any optional arguments!',
epilog='Written by Christoph Haunschmidt. Version: {}'.format(__version__))
parser.add_argument('directory',
metavar='DIRECTORY', help='directory to check for sync conflicts')
parser.add_argument('-n', '--dry-run', action='store_true',
default=False, help='dry run, do not do anything on the file system')
parser.add_argument('-r', '--recursive', action='store_true',
default=False, help='recurse into subdirectories')
parser.add_argument('-i', '--interactive', action='store_true',
default=False, help='prompt for the actions for every sync conflict')
parser.add_argument('-o', '--delete-orphans', action='store_true',
default=False, help='delete "orphaned" *sync-conflict* files')
parser.add_argument('-l', '--log', action='store', default='INFO',
help='log level. Can be CRITICAL, ERROR, WARNING, INFO, or DEBUG (default: %(default)s)')
ARGS = parser.parse_args()
numeric_level = getattr(logging, ARGS.log.upper(), None)
if not isinstance(numeric_level, int):
raise ValueError('Invalid log level: {}'.format(ARGS.log))
logging.basicConfig(
format='%(asctime)s %(levelname)s: %(message)s',
level=numeric_level,
datefmt='%Y-%m-%d %H:%M')
if os.path.isdir(ARGS.directory):
check_dir(ARGS.directory)
print('Done, {} files deleted, {} files renamed, {} orphaned files deleted.'.format(
DELETED_FILES, RENAMED_FILES, DELETED_ORPHANED_FILES))
else:
logging.critical('{} is not a directory.'.format(ARGS.directory))