mirror of
https://github.com/novoid/appendfilename.git
synced 2026-02-16 12:54:15 +00:00
reorganize test section --smart-prepend for extension
Ahead of the addition of checks about three stamp pattern issued by date2name, the checker about appendfilename's the option --smart-prepent is reorganized to be more compact/easier to be read. For now, this outweights each filename being checked twice.
This commit is contained in:
parent
903b6adbe0
commit
c44d7070c4
2 changed files with 32 additions and 44 deletions
|
|
@ -122,29 +122,23 @@ def test_pattern_s3_02(arg1, arg2, arg3):
|
||||||
# analysis section:
|
# analysis section:
|
||||||
old_filename = str(arg1)
|
old_filename = str(arg1)
|
||||||
|
|
||||||
if re.search("^\d{4}-\d{2}-\d{2}_", old_filename):
|
if (re.search("^\d{4}-[012]\d-[0-3]\d_", old_filename) or
|
||||||
# if (running date2name in default mode) then .true.
|
re.search('^\d{4}-[012]\d-[0-3]\dT[012]\d\.[0-5]\d\.[0-5]\d_', old_filename)):
|
||||||
time_stamp = old_filename[:10]
|
|
||||||
time_stamp_separator = old_filename[10]
|
|
||||||
file_extension = old_filename.split(".")[-1]
|
|
||||||
|
|
||||||
old_filename_no_timestamp = old_filename[11:]
|
if re.search("^\d{4}-\d{2}-\d{2}_", old_filename):
|
||||||
stem_elements = old_filename_no_timestamp.split(".")[:-1]
|
# if (running date2name in default mode) then .true.
|
||||||
stem = ".".join(stem_elements)
|
time_stamp = old_filename[:10]
|
||||||
|
time_stamp_separator = old_filename[10]
|
||||||
new_filename = "".join([time_stamp, arg3, text, arg3, stem, str("."), file_extension])
|
file_extension = old_filename.split(".")[-1]
|
||||||
assert os.path.isfile(new_filename)
|
old_filename_no_timestamp = old_filename[11:]
|
||||||
|
|
||||||
os.remove(new_filename)
|
elif re.search('^\d{4}-\d{2}-\d{2}T\d{2}\.\d{2}\.\d{2}_', old_filename):
|
||||||
assert os.path.isfile(new_filename) is False
|
# if (running date2name --withtime) then .true.
|
||||||
|
time_stamp = old_filename[:19]
|
||||||
elif re.search('^\d{4}-\d{2}-\d{2}T\d{2}\.\d{2}\.\d{2}_', old_filename):
|
time_stamp_separator = old_filename[19]
|
||||||
# if (running date2name --withtime) then .true.
|
file_extension = old_filename.split(".")[-1]
|
||||||
time_stamp = old_filename[:19]
|
old_filename_no_timestamp = old_filename[20:]
|
||||||
time_stamp_separator = old_filename[19]
|
|
||||||
file_extension = old_filename.split(".")[-1]
|
|
||||||
|
|
||||||
old_filename_no_timestamp = old_filename[20:]
|
|
||||||
stem_elements = old_filename_no_timestamp.split(".")[:-1]
|
stem_elements = old_filename_no_timestamp.split(".")[:-1]
|
||||||
stem = ".".join(stem_elements)
|
stem = ".".join(stem_elements)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -319,29 +319,23 @@ def test_pattern_s3_02(arg1, arg2, arg3):
|
||||||
# analysis section:
|
# analysis section:
|
||||||
old_filename = str(arg1)
|
old_filename = str(arg1)
|
||||||
|
|
||||||
if re.search("^\d{4}-\d{2}-\d{2}_", old_filename):
|
if (re.search("^\d{4}-[012]\d-[0-3]\d_", old_filename) or
|
||||||
# if (running date2name in default mode) then .true.
|
re.search('^\d{4}-[012]\d-[0-3]\dT[012]\d\.[0-5]\d\.[0-5]\d_', old_filename)):
|
||||||
time_stamp = old_filename[:10]
|
|
||||||
time_stamp_separator = old_filename[10]
|
|
||||||
file_extension = old_filename.split(".")[-1]
|
|
||||||
|
|
||||||
old_filename_no_timestamp = old_filename[11:]
|
if re.search("^\d{4}-\d{2}-\d{2}_", old_filename):
|
||||||
stem_elements = old_filename_no_timestamp.split(".")[:-1]
|
# if (running date2name in default mode) then .true.
|
||||||
stem = ".".join(stem_elements)
|
time_stamp = old_filename[:10]
|
||||||
|
time_stamp_separator = old_filename[10]
|
||||||
new_filename = "".join([time_stamp, arg3, text, arg3, stem, str("."), file_extension])
|
file_extension = old_filename.split(".")[-1]
|
||||||
assert os.path.isfile(new_filename)
|
old_filename_no_timestamp = old_filename[11:]
|
||||||
|
|
||||||
os.remove(new_filename)
|
elif re.search('^\d{4}-\d{2}-\d{2}T\d{2}\.\d{2}\.\d{2}_', old_filename):
|
||||||
assert os.path.isfile(new_filename) is False
|
# if (running date2name --withtime) then .true.
|
||||||
|
time_stamp = old_filename[:19]
|
||||||
elif re.search('^\d{4}-\d{2}-\d{2}T\d{2}\.\d{2}\.\d{2}_', old_filename):
|
time_stamp_separator = old_filename[19]
|
||||||
# if (running date2name --withtime) then .true.
|
file_extension = old_filename.split(".")[-1]
|
||||||
time_stamp = old_filename[:19]
|
old_filename_no_timestamp = old_filename[20:]
|
||||||
time_stamp_separator = old_filename[19]
|
|
||||||
file_extension = old_filename.split(".")[-1]
|
|
||||||
|
|
||||||
old_filename_no_timestamp = old_filename[20:]
|
|
||||||
stem_elements = old_filename_no_timestamp.split(".")[:-1]
|
stem_elements = old_filename_no_timestamp.split(".")[:-1]
|
||||||
stem = ".".join(stem_elements)
|
stem = ".".join(stem_elements)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue