linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speed up compare by not use difflib if we dont need to (and fix type found by syntastic)

Browse Source
This commit is contained in:
Douglas Clowes
2014-10-31 12:14:49 +11:00
parent af4aa2c876
commit 79e4be4ca6
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
site_ansto/instrument/compareSICS.py
View File

@ -219,7 +219,8 @@ if __name__ == "__main__":
if not os.path.exists(destin): if not os.path.exists(destin):
print " ", destin, "does not exist" print " ", destin, "does not exist"
continue continue
delta = list(difflib.unified_diff(\ if args.show:
delta = list(difflib.unified_diff(\
open(source).read().splitlines(),\ open(source).read().splitlines(),\
open(destin).read().splitlines(),\ open(destin).read().splitlines(),\
fromfile=source,\ fromfile=source,\
@ -227,6 +228,10 @@ if __name__ == "__main__":
fromfiledate=datetime.datetime.fromtimestamp(os.path.getmtime(source)),\ fromfiledate=datetime.datetime.fromtimestamp(os.path.getmtime(source)),\
tofiledate=datetime.datetime.fromtimestamp(os.path.getmtime(destin)),\ tofiledate=datetime.datetime.fromtimestamp(os.path.getmtime(destin)),\
lineterm="")) lineterm=""))
elif open(source).read() == open(destin).read():
delta = []
else:
delta = [""]
delta_len = len(delta) delta_len = len(delta)
if delta_len > 0: if delta_len > 0:
print_list[destin] = (source, list(delta)) print_list[destin] = (source, list(delta))
@ -240,7 +245,7 @@ if __name__ == "__main__":
else: else:
print args.command, source, destin print args.command, source, destin
else: else:
print source, destin, "#%d" % len(delta) print source, destin
if args.show: if args.show:
for line in delta: for line in delta:
print line print line
@ -286,7 +291,7 @@ if __name__ == "__main__":
if len(lines) > 0: if len(lines) > 0:
tgt = "/tmp/link_%s" % str(os.getpid()) tgt = "/tmp/link_%s" % str(os.getpid())
if (os.path.exists(tgt)): if (os.path.exists(tgt)):
for root, disr, files in os.walk(tgt, topdown=False): for root, dirs, files in os.walk(tgt, topdown=False):
for name in files: for name in files:
os.remove(os.path.join(root, name)) os.remove(os.path.join(root, name))
for name in dirs: for name in dirs: