From 031c41f07dcd0e19872f0ffb1895a4978be69ce3 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sun, 8 Mar 2020 15:34:13 +0100 Subject: [PATCH] Use floor to avoid non-integer keys --- make_arq.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) mode change 100644 => 100755 make_arq.py diff --git a/make_arq.py b/make_arq.py old mode 100644 new mode 100755 index 674c23a..7607fea --- a/make_arq.py +++ b/make_arq.py @@ -27,6 +27,7 @@ import json import subprocess import stat +import math try: from _makearq import get_frame_data as _get_frame_data @@ -127,9 +128,10 @@ def get_frames(framenames): } def key(t): sn = t[1]['MakerNotes:SequenceNumber'] - 1 + print("sn: {0}".format(sn)) s = 1 + (sn) % 4 i = seq2idx[s] - g = seq2idx[1 + sn / 4] + g = seq2idx[1 + math.floor(sn / 4)] return (g, i) frames.sort(key=key) w, h = frames[0][1]['EXIF:ImageWidth'], frames[0][1]['EXIF:ImageHeight'] @@ -215,8 +217,4 @@ def main(): if __name__ == '__main__': - try: - main() - except Exception as e: - print('ERROR: %s' % str(e)) - exit(-1) + main()