python/photo-importer
1
0 Fork 0
mirror of https://github.com/sashacmc/photo-importer.git synced 2026-06-15 16:57:03 +02:00
Code Issues Releases Activity

Fix regexp definition and test

Browse Source
This commit is contained in:
sashacmc committed 2024-05-22 23:38:21 +02:00
1 parent 3e37cb28d4
commit 9cbf186ff8
2 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

photo_importer/fileprop.py
+8 -8
View File
@@ -19,28 +19,28 @@ GARBAGE = 4
class FileProp(object):
DATE_REGEX = [
(
re.compile('\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}'),
re.compile(r'\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}'),
'%Y-%m-%d_%H-%M-%S',
),
(
re.compile('\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}'),
re.compile(r'\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}'),
'%Y-%m-%d-%H-%M-%S',
),
(
re.compile('\d{4}-\d{2}-\d{2}T\d{2}.\d{2}.\d{2}'),
re.compile(r'\d{4}-\d{2}-\d{2}T\d{2}.\d{2}.\d{2}'),
'%Y-%m-%dT%H.%M.%S',
),
(
re.compile('\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}'),
re.compile(r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}'),
'%Y-%m-%dT%H:%M:%S',
),
(
re.compile('\d{4}_\d{2}_\d{2}_\d{2}_\d{2}_\d{2}'),
re.compile(r'\d{4}_\d{2}_\d{2}_\d{2}_\d{2}_\d{2}'),
'%Y_%m_%d_%H_%M_%S',
),
(re.compile('\d{8}_\d{6}'), '%Y%m%d_%H%M%S'),
(re.compile('\d{14}'), '%Y%m%d%H%M%S'),
(re.compile('\d{8}'), '%Y%m%d'),
(re.compile(r'\d{8}_\d{6}'), '%Y%m%d_%H%M%S'),
(re.compile(r'\d{14}'), '%Y%m%d%H%M%S'),
(re.compile(r'\d{8}'), '%Y%m%d'),
]
SPACE_REGEX = re.compile(r'\s+')
photo_importer/importer_test.py
+1 -1
View File
@@ -62,6 +62,6 @@ class TestImporter(unittest.TestCase):
self.assertEqual(
files[1],
os.path.join(
tmpdirname, 'Foto/2022/2022-11-21/2022-11-21_00-42-07.JPG'
tmpdirname, 'Foto/2022/2022-11-21/2022-11-21_00-42-07.jpg'
),
)