pestctrl/appendfilename
1
0
Fork 0
forked from Github/appendfilename
Code Issues Pull requests Projects Releases Packages Wiki Activity

introduced --separator CLI option according to a suggestion from #9

Browse source
This commit is contained in:
Karl Voit 2022-01-01 11:26:33 +01:00
parent 6db3e4bc9d
commit c9a1bc9322
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
appendfilename/__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: <2022-01-01 11:15:47 vk>" PROG_VERSION = u"Time-stamp: <2022-01-01 11:25:53 vk>"
# TODO: # TODO:
# * fix parts marked with «FIXXME» # * fix parts marked with «FIXXME»
@ -82,7 +82,7 @@ parser.add_option("-t", "--text", dest="text",
help="the text to add to the file name") help="the text to add to the file name")
parser.add_option("-p", "--prepend", dest="prepend", action="store_true", parser.add_option("-p", "--prepend", dest="prepend", action="store_true",
help="Do the opposite: instead of appending the text, prepend the text") help="do the opposite: instead of appending the text, prepend the text")
parser.add_option("--smart-prepend", dest="smartprepend", action="store_true", parser.add_option("--smart-prepend", dest="smartprepend", action="store_true",
help="Like \"--prepend\" but do respect date/time-stamps: insert new text between \"YYYY-MM-DD(Thh.mm(.ss))\" and rest") help="Like \"--prepend\" but do respect date/time-stamps: insert new text between \"YYYY-MM-DD(Thh.mm(.ss))\" and rest")
@ -90,7 +90,7 @@ parser.add_option("--smart-prepend", dest="smartprepend", action="store_true",
parser.add_option("--separator", parser.add_option("--separator",
metavar="separator", metavar="separator",
default=" ", default=" ",
help='Specify the text separator (default: "' + DEFAULT_TEXT_SEPARATOR + '").') help='override the defailt text separator which is "' + DEFAULT_TEXT_SEPARATOR + '"')
parser.add_option("-d", "--dryrun", dest="dryrun", action="store_true", parser.add_option("-d", "--dryrun", dest="dryrun", action="store_true",
help="enable dryrun mode: just simulate what would happen, do not modify file(s)") help="enable dryrun mode: just simulate what would happen, do not modify file(s)")
@ -309,18 +309,18 @@ def handle_file(filename, text, dryrun):
try: try:
if options.prepend: if options.prepend:
new_filename = os.path.join(os.path.dirname(filename), text + DEFAULT_TEXT_SEPARATOR + old_basename + tags_with_extension) new_filename = os.path.join(os.path.dirname(filename), text + separator() + old_basename + tags_with_extension)
elif options.smartprepend: elif options.smartprepend:
match = re.match(WITHTIME_AND_SECONDS_PATTERN, filename) match = re.match(WITHTIME_AND_SECONDS_PATTERN, filename)
if not match: if not match:
logging.debug('can\'t find a date/time-stamp, doing a simple prepend') logging.debug('can\'t find a date/time-stamp, doing a simple prepend')
new_filename = os.path.join(os.path.dirname(filename), text + DEFAULT_TEXT_SEPARATOR + old_basename + tags_with_extension) new_filename = os.path.join(os.path.dirname(filename), text + separator() + old_basename + tags_with_extension)
else: else:
logging.debug('date/time-stamp found, insert text between date/time-stamp and rest') logging.debug('date/time-stamp found, insert text between date/time-stamp and rest')
new_filename = os.path.join(os.path.dirname(filename), match.group(1) + DEFAULT_TEXT_SEPARATOR + text + DEFAULT_TEXT_SEPARATOR + match.group(len(match.groups()))) new_filename = os.path.join(os.path.dirname(filename), match.group(1) + separator() + text + separator + match.group(len(match.groups())))
#import pdb; pdb.set_trace() #import pdb; pdb.set_trace()
else: else:
new_filename = os.path.join(os.path.dirname(filename), old_basename + DEFAULT_TEXT_SEPARATOR + text + tags_with_extension) new_filename = os.path.join(os.path.dirname(filename), old_basename + separator() + text + tags_with_extension)
except: except:
logging.error("Error while trying to build new filename: " + str(sys.exc_info()[0])) logging.error("Error while trying to build new filename: " + str(sys.exc_info()[0]))
num_errors += 1 num_errors += 1
@ -344,6 +344,15 @@ def handle_file(filename, text, dryrun):
return num_errors, new_filename return num_errors, new_filename
def separator():
"""returns the separator between the previous file name and the new text"""
if options.separator:
## FIXXME: the user-provided separator is not checked at all: please do add some checks like removing '\n' and similar.
return options.separator
else:
return DEFAULT_TEXT_SEPARATOR
def main(): def main():
"""Main function""" """Main function"""