From 9184127623c8353836c29c74371f176261a025b5 Mon Sep 17 00:00:00 2001
From: Dooho Yi <pilotedeguerre@gmail.com>
Date: Thu, 16 Sep 2021 00:17:04 +0900
Subject: [PATCH] untag in: def thumbnail()

---
 distribusi/distribusi/distribusi.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/distribusi/distribusi/distribusi.py b/distribusi/distribusi/distribusi.py
index 8447722..486d70a 100644
--- a/distribusi/distribusi/distribusi.py
+++ b/distribusi/distribusi/distribusi.py
@@ -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 = ''