Merge pull request #17 from nbehrnd/re_02

bugfix stamp retraction
This commit is contained in:
Karl Voit 2021-11-25 15:22:49 +01:00 committed by GitHub
commit 9e9606ae39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View file

@ -36,6 +36,7 @@ Run "date2name --help" for usage hints such as:
: -C, --compact use compact datestamp (YYYYMMDD)
: -M, --month use datestamp with year and month (YYYY-MM)
: -w, --withtime use datestamp including seconds (YYYY-MM-DDThh.mm.ss)
: -r, --remove remove all known datestamps
: -m, --mtime take modification time for datestamp [default]
: -c, --ctime take creation time for datestamp
: --delimiter overwrite default delimiter

View file

@ -31,13 +31,13 @@ FORMATSTRING_MONTH = "%Y-%m"
FORMATSTRING_WITHTIME = "%Y-%m-%dT%H.%M.%S"
REGEX_PATTERNS = {
'NODATESTAMP': re.compile('^\D'),
'SHORT': re.compile('^\d{2,2}[01]\d[0123]\d[- _]'),
'COMPACT': re.compile('^\d{4,4}[01]\d[0123]\d[- _]'),
'STANDARD': re.compile('^\d{4,4}-[01]\d-[0123]\d[- _]'),
'MONTH': re.compile('^\d{4,4}-[01]\d[- _]'),
'WITHTIME_AND_SECONDS': re.compile('^\d{4,4}-[01]\d-[0123]\d([T :_-])([012]\d)([:.-])([012345]\d)([:.-])([012345]\d)[- _.]'),
'WITHTIME_NO_SECONDS': re.compile('^\d{4,4}-[01]\d-[0123]\d([T :_-])([012]\d)([:.-])([012345]\d)[- _.]'),
'WITHSECONDS': re.compile('^\d{4,4}-[01]\d-[0123]\d[T :_-][012]\d[:.-][012345]\d[:.-][012345]\d[- _]'),
'SHORT': re.compile('^(\d{2})([01]\d)([0123]\d)([- _])'),
'COMPACT': re.compile('^(\d{4})([01]\d)([0123]\d)([- _])'),
'STANDARD': re.compile('^(\d{4})-([01]\d)-([0123]\d)([- _])'),
'MONTH': re.compile('^(\d{4})-([01]\d)(?!-[0123]\d)([- _])'),
'WITHTIME_AND_SECONDS': re.compile('^(\d{4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([:.-])([012345]\d)([- _.])'),
'WITHTIME_NO_SECONDS': re.compile('^(\d{4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([- _.])'),
'WITHSECONDS': re.compile('^(\d{4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([:.-])([012345]\d)([- _])'),
}
MAX_PATHLENGTH = 255 # os.pathconf('/', 'PC_PATH_MAX') may be longer but os.rename() seems to have hard-coded 256
@ -99,7 +99,7 @@ parser.add_option("--delimiter", dest="delimiter", metavar='DELIMITER_STRING',
'space, or underscore may result in not recognizing the delimiter ' +
'for further operations such as fixing slightly wrong formatted time-stamps.')
parser.add_option("--nocorrections", dest="nocorrections", action="store_true",
help="do not convert existing but slightely wrong formatted date/time-stamps to new format")
help="do not convert existing but slightly wrong formatted date/time-stamps to new format")
parser.add_option("-q", "--quiet", dest="quiet", action="store_true",
help="do not output anything but just errors on console")
parser.add_option("-v", "--verbose", dest="verbose", action="store_true",