# HG changeset patch # User mdd # Date 1606082897 -3600 # Node ID ef9db9d5103c9eaee5db1e1b3dd721530d2de907 # Parent 5be334b71b089c0927d56a1b39ba9f630bf2a790 file extensions and finetuning autocrop diff -r 5be334b71b08 -r ef9db9d5103c dupecheck.py --- a/dupecheck.py Mon Mar 09 12:19:29 2020 +0100 +++ b/dupecheck.py Sun Nov 22 23:08:17 2020 +0100 @@ -74,7 +74,7 @@ title = RE_PARENTHESES.sub("", title) self.filelist.append([title, filename, root, ext]) - elif ext in ['.mkv', '.avi', '.mpg', '.mpeg', '.mp4', '.ogg', '.mp3', '.iso']: + elif ext in ['.mkv', '.avi', '.mpg', '.mpeg', '.mp4', '.flv', '.ogg', '.mp3', '.iso']: title = filename[:-4].lower() title = RE_PARENTHESES.sub("", title) self.filelist.append([title, filename, root, ext]) diff -r 5be334b71b08 -r ef9db9d5103c ts2mkv.py --- a/ts2mkv.py Mon Mar 09 12:19:29 2020 +0100 +++ b/ts2mkv.py Sun Nov 22 23:08:17 2020 +0100 @@ -416,13 +416,20 @@ flt = [] crop = self.get_crop_option() - if not crop: + crop_loop_minutes = range(6, 10) + crop_loop_minutes.append(20) + crop_loop_minutes.append(25) + crop_loop_minutes.append(30) + crop_loop_minutes.append(35) + for crop_loop in crop_loop_minutes: # load input file to get informations about # scan to other position and try again - print "Scanning again for autocrop..." - self.info["msg_prepare"] += "Rescan autocrop on other position in input stream...\n" - self.__get_ffmpeg_input_info(fn["in"], 9) + print "Scanning again for autocrop at minute %s..." % crop_loop + self.info["msg_prepare"] += "Rescan autocrop on other position (minute %s) in input stream...\n" % crop_loop + self.__get_ffmpeg_input_info(fn["in"], crop_loop) crop = self.get_crop_option() + if crop: + break if crop: flt.append(crop)