Update app.py

app.py

@@ -81,22 +81,20 @@ def _drive_service_from_env():
 
 
 def _normalize_folder_id(raw_id: str) -> Optional[str]:
-    """Accept a bare ID or a full drive URL and return the folder ID."""
+    """Accept a bare ID or a full Drive URL; return clean folder ID."""
     if not raw_id:
         return None
-    raw_id = raw_id.strip()
-    # URL like https://drive.google.com/drive/folders/<ID>
-    m = re.search(r"/folders/([A-Za-z0-9_-]+)", raw_id)
+    raw = raw_id.strip()
+    # from full URL
+    m = re.search(r"/folders/([A-Za-z0-9_-]+)", raw)
     if m:
-        return m.group(1)
-    # Sometimes users paste file URL that ends with ?usp=sharing
-    m = re.search(r"/folders/([A-Za-z0-9_-]+)", raw_id.split("?")[0])
-    if m:
-        return m.group(1)
-    # If it's already an ID-ish token
-    if re.fullmatch(r"[A-Za-z0-9_-]{20,}", raw_id):
-        return raw_id
-    return None
+        raw = m.group(1)
+    # drop query string
+    raw = raw.split("?")[0]
+    # drop常見結尾符號（避免誤貼 '...-dRo.' 或全形符號）
+    raw = raw.rstrip(" .。；;，,』」）」)】]}")
+    # validate
+    return raw if re.fullmatch(r"[A-Za-z0-9_-]{20,}", raw) else None
 
 
 def _upload_to_drive(local_path: str, service, folder_id: Optional[str] = None,
@@ -154,7 +152,7 @@ def generate_and_upload(points_text: str, title: str,
                f"\nDebug: {err}")
         return local_png, msg
 
-    # 3) folder id（UI 覆蓋 Secret，並支援整個 URL 自動萃取）
+    # 3) folder id（UI 覆蓋 Secret，並支援整個 URL 自動萃取 + 去尾端符號）
     folder_id_env = os.environ.get("DRIVE_FOLDER_ID", "").strip()
     raw_folder = (drive_folder_id_input or folder_id_env or "").strip()
     folder_id = _normalize_folder_id(raw_folder)
@@ -306,19 +304,4 @@ with gr.Blocks(title="Map → Google Drive Uploader") as demo:
                 list_btn = gr.Button("📄 列出資料夾內容")
 
         with gr.Column():
-            out_image = gr.Image(label="Preview", type="filepath")
-            out_msg = gr.Markdown(label="Result / Link")
-            cfg_out = gr.Markdown(label="Debug")
-            list_out = gr.Markdown(label="Folder Listing")
-
-    run_btn.click(
-        fn=generate_and_upload,
-        inputs=[points_in, title_in, min_lon_in, max_lon_in, min_lat_in, max_lat_in,
-                folder_id_in, make_public_in],
-        outputs=[out_image, out_msg],
-    )
-    cfg_btn.click(fn=check_config, inputs=None, outputs=cfg_out)
-    list_btn.click(fn=list_folder_contents, inputs=folder_id_in, outputs=list_out)
-
-if __name__ == "__main__":
-    demo.launch()
+            out_image =