pestctrl/guess-filename.py
1
0
Fork 0
forked from Github/guess-filename.py
Code Issues Pull requests Projects Releases Packages Wiki Activity

added support for Android Bokeh photographs to IMG_INDEXGROUPS

Browse source
This commit is contained in:
Karl Voit 2019-03-10 12:18:26 +01:00
parent 7c411ba4e6
commit 40a010f6a6
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guessfilename/__init__.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
PROG_VERSION = u"Time-stamp: <2018-11-01 22:19:54 vk>" PROG_VERSION = u"Time-stamp: <2019-03-10 12:17:32 vk>"
# TODO: # TODO:
@ -158,7 +158,8 @@ class GuessFilename(object):
SIGNAL_REGEX = re.compile('signal-' + DATESTAMP_REGEX + '-' + TIMESTAMP_REGEX + '(.+)?.jpg', re.UNICODE) SIGNAL_REGEX = re.compile('signal-' + DATESTAMP_REGEX + '-' + TIMESTAMP_REGEX + '(.+)?.jpg', re.UNICODE)
IMG_REGEX = re.compile('IMG_' + DATESTAMP_REGEX + '_' + TIMESTAMP_REGEX + '(_Bokeh)?(.+)?.jpg', re.UNICODE) IMG_REGEX = re.compile('IMG_' + DATESTAMP_REGEX + '_' + TIMESTAMP_REGEX + '(_Bokeh)?(.+)?.jpg', re.UNICODE)
IMG_INDEXGROUPS = [1, '-', 2, '-', 3, 'T', 4, '.', 5, ['.', 7], 9, '.jpg'] IMG_INDEXGROUPS_NORMAL = [1, '-', 2, '-', 3, 'T', 4, '.', 5, ['.', 7], 9, '.jpg']
IMG_INDEXGROUPS_BOKEH = [1, '-', 2, '-', 3, 'T', 4, '.', 5, ['.', 7], ' Bokeh', 9, '.jpg']
VID_REGEX = re.compile('VID_' + DATESTAMP_REGEX + '_' + TIMESTAMP_REGEX + '(.+)?.mp4', re.UNICODE) VID_REGEX = re.compile('VID_' + DATESTAMP_REGEX + '_' + TIMESTAMP_REGEX + '(.+)?.mp4', re.UNICODE)
VID_INDEXGROUPS = [1, '-', 2, '-', 3, 'T', 4, '.', 5, ['.', 7], 8, '.mp4'] VID_INDEXGROUPS = [1, '-', 2, '-', 3, 'T', 4, '.', 5, ['.', 7], 8, '.mp4']
@ -882,7 +883,10 @@ class GuessFilename(object):
# digital camera images: IMG_20161014_214404 foo bar.jpg -> 2016-10-14T21.44.04 foo bar.jpg OR # digital camera images: IMG_20161014_214404 foo bar.jpg -> 2016-10-14T21.44.04 foo bar.jpg OR
regex_match = re.match(self.IMG_REGEX, oldfilename) regex_match = re.match(self.IMG_REGEX, oldfilename)
if regex_match: if regex_match:
return self.build_string_via_indexgroups(regex_match, self.IMG_INDEXGROUPS) if regex_match.group(8) == '_Bokeh':
return self.build_string_via_indexgroups(regex_match, self.IMG_INDEXGROUPS_BOKEH)
else:
return self.build_string_via_indexgroups(regex_match, self.IMG_INDEXGROUPS_NORMAL)
# VID_20170105_173104.mp4 -> 2017-01-05T17.31.04.mp4 # VID_20170105_173104.mp4 -> 2017-01-05T17.31.04.mp4
regex_match = re.match(self.VID_REGEX, oldfilename) regex_match = re.match(self.VID_REGEX, oldfilename)
if regex_match: if regex_match:

11
guessfilename_test.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8; mode: python; -*- # -*- coding: utf-8; mode: python; -*-
# Time-stamp: <2018-11-01 11:17:03 vk> # Time-stamp: <2019-03-10 12:15:54 vk>
import unittest import unittest
import logging import logging
@ -199,6 +199,15 @@ class TestGuessFilename(unittest.TestCase):
self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename('20181025T210500 ORF - Am Schauplatz - Am Schauplatz_ Wenn alles zusammenbricht -ORIGINALlow- playlist.m3u8.mp4'), self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename('20181025T210500 ORF - Am Schauplatz - Am Schauplatz_ Wenn alles zusammenbricht -ORIGINALlow- playlist.m3u8.mp4'),
'2018-10-25T21.05.00 ORF - Am Schauplatz - Am Schauplatz_ Wenn alles zusammenbricht -- lowquality.mp4') '2018-10-25T21.05.00 ORF - Am Schauplatz - Am Schauplatz_ Wenn alles zusammenbricht -- lowquality.mp4')
# Digital camera from Android
self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename('IMG_20190118_133928.jpg'),
'2019-01-18T13.39.28.jpg')
self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename('IMG_20190118_133928 This is a note.jpg'),
'2019-01-18T13.39.28 This is a note.jpg')
self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename('IMG_20190118_133928_Bokeh.jpg'),
'2019-01-18T13.39.28 Bokeh.jpg')
self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename('IMG_20190118_133928_Bokeh This is a note.jpg'),
'2019-01-18T13.39.28 Bokeh This is a note.jpg')
# self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename(''), # self.assertEqual(self.guess_filename.derive_new_filename_from_old_filename(''),
# '') # '')