doohoyi/distribusi-foh000
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

untag in: def thumbnail()

Browse source
This commit is contained in:
Dooho Yi 2021-09-16 00:17:04 +09:00
parent 085c75ca61
commit 9184127623
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
distribusi/distribusi/distribusi.py
View file

@ -26,6 +26,15 @@ ignore = Ignore()
PATTERN_TAG = re.compile(r"(?P<name>.+?)(?P<tags>\#.+)*\.(?P<ext>.{1,4}$)") 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>.+)") 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): def caption(image):
try: try:
process = subprocess.Popen( process = subprocess.Popen(
@ -78,7 +87,7 @@ def thumbnail(image, name, args):
if args.captions: if args.captions:
cap = caption(image) cap = caption(image)
else: else:
cap = name cap = untag(name)
m = PATTERN_TAG_FOLDER.search(cap) m = PATTERN_TAG_FOLDER.search(cap)
if m: if m:
@ -107,11 +116,7 @@ def div(args, type_, subtype, tag, name, fid):
m = PATTERN_TAG.search(name) name = untag(name)
if m:
file_name = m.group('name')
file_ext = m.group('ext')
name = file_name + "." + file_ext
if args.no_filenames: if args.no_filenames:
filename = '' filename = ''