untag in: def thumbnail()
This commit is contained in:
parent
085c75ca61
commit
9184127623
1 changed files with 11 additions and 6 deletions
|
|
@ -26,6 +26,15 @@ ignore = Ignore()
|
|||
PATTERN_TAG = re.compile(r"(?P<name>.+?)(?P<tags>\#.+)*\.(?P<ext>.{1,4}$)")
|
||||
PATTERN_TAG_FOLDER = re.compile(r"(?P<name>.+?)(?P<tags>\#.+)\/(?P<file>.+)")
|
||||
|
||||
def untag(name):
|
||||
m = PATTERN_TAG.search(name)
|
||||
if m:
|
||||
file_name = m.group('name')
|
||||
file_ext = m.group('ext')
|
||||
return (file_name + "." + file_ext)
|
||||
else:
|
||||
return name
|
||||
|
||||
def caption(image):
|
||||
try:
|
||||
process = subprocess.Popen(
|
||||
|
|
@ -78,7 +87,7 @@ def thumbnail(image, name, args):
|
|||
if args.captions:
|
||||
cap = caption(image)
|
||||
else:
|
||||
cap = name
|
||||
cap = untag(name)
|
||||
|
||||
m = PATTERN_TAG_FOLDER.search(cap)
|
||||
if m:
|
||||
|
|
@ -107,11 +116,7 @@ def div(args, type_, subtype, tag, name, fid):
|
|||
|
||||
|
||||
|
||||
m = PATTERN_TAG.search(name)
|
||||
if m:
|
||||
file_name = m.group('name')
|
||||
file_ext = m.group('ext')
|
||||
name = file_name + "." + file_ext
|
||||
name = untag(name)
|
||||
|
||||
if args.no_filenames:
|
||||
filename = ''
|
||||
|
|
|
|||
Loading…
Reference in a new issue