Update app.py

app.py

@@ -13,14 +13,38 @@ from googleapiclient.http import MediaIoBaseUpload
 from googleapiclient.errors import HttpError
 from google.oauth2.service_account import Credentials
 
-# ---------------- Config ----------------
+# ====== CONFIG ======
 DEFAULT_EXTENT = (119.0, 123.5, 21.5, 25.5)  # Taiwan region
-SCOPES = ["https://www.googleapis.com/auth/drive.file"]  # manage files created by the app
+SCOPES = ["https://www.googleapis.com/auth/drive.file"]  # create/manage files created by this app
+DEFAULT_FOLDER_URL = "https://drive.google.com/drive/folders/1B7D4Z6vV_G30nIrBr8qFsgNA4l2G-dRo"  # 你的指定資料夾
+
+# ====== UTILS ======
+def clean_folder_id(folder_input: str) -> Optional[str]:
+    """
+    接受整個 Drive 資料夾網址或純 ID，回傳乾淨的 folder ID。
+    會自動移除結尾的 ., 。, 引號與常見標點。
+    """
+    if not folder_input:
+        return None
+    raw = folder_input.strip()
+
+    # 從 URL 擷取 /folders/<ID>
+    m = re.search(r"/folders/([A-Za-z0-9_-]+)", raw)
+    if m:
+        raw = m.group(1)
+
+    # 移除 query string 與尾端雜訊
+    raw = raw.split("?")[0]
+    raw = raw.strip().strip('"\'')
 
+    # 去掉常見尾端符號（半形/全形）
+    raw = raw.rstrip(" .。；;，,！!？?、/\\』」）》）】]}")
 
-# --------------- Helpers ----------------
-def _parse_points(csv_text: str) -> List[Tuple[float, float]]:
-    """Parse lines like '121.5,25.0' (lon,lat). Ignore blank/comment/invalid."""
+    # 驗證 ID 合法性
+    return raw if re.fullmatch(r"[A-Za-z0-9_-]{20,}", raw) else None
+
+
+def parse_points(csv_text: str) -> List[Tuple[float, float]]:
     pts: List[Tuple[float, float]] = []
     if not csv_text:
         return pts
@@ -39,10 +63,9 @@ def _parse_points(csv_text: str) -> List[Tuple[float, float]]:
     return pts
 
 
-def _make_figure(points: List[Tuple[float, float]], title: str,
-                 extent: Tuple[float, float, float, float] = DEFAULT_EXTENT,
-                 dpi: int = 150) -> str:
-    """Draw scatter in extent and save to a temp PNG; return file path."""
+def make_figure(points: List[Tuple[float, float]], title: str,
+                extent: Tuple[float, float, float, float] = DEFAULT_EXTENT,
+                dpi: int = 150) -> str:
     min_lon, max_lon, min_lat, max_lat = extent
     fig, ax = plt.subplots(figsize=(6.5, 6.5), dpi=dpi)
     ax.set_title(title or "Map Plot", pad=10)
@@ -62,11 +85,10 @@ def _make_figure(points: List[Tuple[float, float]], title: str,
     return out_path
 
 
-def _drive_service_from_env():
-    """Build Drive service from SERVICE_ACCOUNT_JSON. Returns (service, client_email, err)."""
+def drive_service_from_secret():
     raw = os.environ.get("SERVICE_ACCOUNT_JSON", "").strip()
     if not raw:
-        return None, None, "SERVICE_ACCOUNT_JSON not found (no secret injected)."
+        return None, None, "SERVICE_ACCOUNT_JSON not found."
     try:
         info = json.loads(raw)
     except Exception as e:
@@ -80,44 +102,21 @@ def _drive_service_from_env():
         return None, None, f"Failed to build Drive service: {e}"
 
 
-def _normalize_folder_id(raw_id: str) -> Optional[str]:
-    """Accept a bare ID or a full Drive URL; return clean folder ID."""
-    if not raw_id:
-        return None
-    raw = raw_id.strip()
-    # 從完整 URL 擷取 /folders/<ID>
-    m = re.search(r"/folders/([A-Za-z0-9_-]+)", raw)
-    if m:
-        raw = m.group(1)
-    # 去掉 query string
-    raw = raw.split("?")[0]
-    # 去掉常見尾端符號（半形/全形），避免 '...dRo.' / '...dRo。'
-    raw = raw.rstrip(" .。；;，,！!？?、/\\』」）》）】]}")
-    # 驗證格式
-    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,
-                     make_public_link: bool = False) -> Tuple[str, str]:
-    """Upload file; return (file_id, webViewLink). Supports Shared Drives."""
-    fname = os.path.basename(local_path)
-    meta = {"name": fname}
+def upload_png_to_drive(local_png: str, service, folder_id: Optional[str], make_public: bool):
+    meta = {"name": os.path.basename(local_png)}
     if folder_id:
         meta["parents"] = [folder_id]
-
-    print(f"[Drive] creating file: name={fname}, folder_id={folder_id}")  # DEBUG
-
-    with open(local_path, "rb") as f:
+    with open(local_png, "rb") as f:
         media = MediaIoBaseUpload(f, mimetype="image/png", resumable=False)
         created = (service.files()
                    .create(body=meta, media_body=media,
                            fields="id, webViewLink, webContentLink",
                            supportsAllDrives=True)
                    .execute())
-    file_id = created.get("id", ""); view_link = created.get("webViewLink", "")
-    print(f"[Drive] created file_id={file_id}, view_link={view_link}")  # DEBUG
+    file_id = created.get("id", "")
+    web_view = created.get("webViewLink", "")
 
-    if make_public_link and file_id:
+    if make_public and file_id:
         try:
             service.permissions().create(
                 fileId=file_id,
@@ -125,120 +124,108 @@ def _upload_to_drive(local_path: str, service, folder_id: Optional[str] = None,
                 fields="id",
                 supportsAllDrives=True,
             ).execute()
-            print(f"[Drive] set anyone-with-link permission on {file_id}")  # DEBUG
         except HttpError as e:
-            print(f"[Drive] set permission failed: {e}")  # DEBUG
-    return file_id, view_link
+            web_view += f"\n(設定公開連結失敗: {e})"
+    return file_id, web_view
 
-
-# --------------- Gradio handlers ---------------
-def generate_and_upload(points_text: str, title: str,
-                        min_lon: float, max_lon: float, min_lat: float, max_lat: float,
-                        drive_folder_id_input: str, make_public: bool):
-    # 1) render figure
+# ====== GRADIO HANDLERS ======
+def generate_and_upload(points_text, title, min_lon, max_lon, min_lat, max_lat,
+                        folder_input, make_public):
+    # 1) 畫圖
     try:
-        points = _parse_points(points_text)
-        extent = (min_lon, max_lon, min_lat, max_lat)
-        local_png = _make_figure(points, title, extent=extent)
+        pts = parse_points(points_text)
+        png = make_figure(pts, title, extent=(min_lon, max_lon, min_lat, max_lat))
     except Exception as e:
         return None, f"❌ Failed to render figure: {e}"
 
-    # 2) drive service
-    service, client_email, err = _drive_service_from_env()
+    # 2) Drive 服務
+    service, client_email, err = drive_service_from_secret()
     if service is None:
-        msg = ("⚠️ Google Drive upload is not configured.\n"
-               "請在 Settings → Secrets 新增 `SERVICE_ACCOUNT_JSON`（貼完整 JSON）。\n"
-               "（可選）新增 `DRIVE_FOLDER_ID` 指定資料夾。"
-               f"\nDebug: {err}")
-        return local_png, msg
+        return png, ("⚠️ 未設定 Google Drive：請在 Settings → Secrets 新增 `SERVICE_ACCOUNT_JSON`。\n"
+                     f"Debug: {err}")
 
-    # 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)
+    # 3) 取得資料夾 ID（優先：UI → Secret → 預設網址）
+    env_folder = os.environ.get("DRIVE_FOLDER_ID", "").strip()
+    raw_folder = folder_input or env_folder or DEFAULT_FOLDER_URL
+    folder_id = clean_folder_id(raw_folder)
 
-    # DEBUG
-    print(f"[Drive] client_email={client_email}, using folder_id={folder_id}")  # DEBUG
+    if not folder_id:
+        return png, ("❌ 無效的 Folder ID/URL。請貼整個資料夾網址或正確的 ID。\n"
+                     f"收到：`{raw_folder}`")
 
-    # 4) upload
+    # 4) 上傳
     try:
-        file_id, view_link = _upload_to_drive(local_png, service, folder_id, make_public)
-        details = [
+        file_id, view_link = upload_png_to_drive(png, service, folder_id, make_public)
+        msg = [
             "✅ Uploaded to Google Drive.",
+            f"• Service account: `{client_email}`",
+            f"• Folder ID used: `{folder_id}`",
             f"• File ID: `{file_id}`",
-            f"• Folder ID used: `{folder_id or '(none)'}`",
         ]
         if view_link:
-            details.append(f"• Open: {view_link}")
+            msg.append(f"• Open: {view_link}")
         if not make_public:
-            details.append("• Note: 連結權限沿用資料夾/硬碟設定（未自動公開）。")
-        return local_png, "\n".join(details)
+            msg.append("• Note: 未勾選公開，檔案權限沿用資料夾/硬碟設定。")
+        return png, "\n".join(msg)
     except HttpError as e:
-        return local_png, f"❌ Upload failed (HttpError): {e}"
+        return png, f"❌ Upload failed (HttpError): {e}"
     except Exception as e:
-        return local_png, f"❌ Upload failed: {e}"
+        return png, f"❌ Upload failed: {e}"
 
 
 def check_config():
-    """Quick diagnostics for SERVICE_ACCOUNT_JSON and DRIVE_FOLDER_ID."""
     raw = os.environ.get("SERVICE_ACCOUNT_JSON", None)
-    folder_id_env = os.environ.get("DRIVE_FOLDER_ID", "").strip()
-    folder_id = _normalize_folder_id(folder_id_env) if folder_id_env else None
+    env_folder = os.environ.get("DRIVE_FOLDER_ID", "").strip()
+    default_used = DEFAULT_FOLDER_URL
+    folder_id = clean_folder_id(env_folder or default_used)
 
     if raw is None:
-        return "❌ 環境變數 `SERVICE_ACCOUNT_JSON` 不存在（Secret 未注入或名稱拼錯）。"
-    if len(raw.strip()) == 0:
-        return "❌ `SERVICE_ACCOUNT_JSON` 是空字串。請重新貼完整 JSON。"
+        return "❌ `SERVICE_ACCOUNT_JSON` 不存在。"
     try:
         info = json.loads(raw)
+        client_email = info.get("client_email")
     except Exception as e:
         return f"❌ `SERVICE_ACCOUNT_JSON` 不是有效 JSON：{e}"
-    client_email = info.get("client_email")
 
-    # 嘗試讀取資料夾名稱以確認 ID 與讀取權限
-    folder_line = f"• Folder ID (from Secret): `{folder_id or '(none)'}`"
+    out = [f"✅ 讀到 SERVICE_ACCOUNT_JSON，client_email = {client_email}",
+           f"• Folder ID (Secret/Default)：`{folder_id}`"]
     try:
-        service, _, err = _drive_service_from_env()
+        service, _, err = drive_service_from_secret()
         if service and folder_id:
             meta = service.files().get(
                 fileId=folder_id, fields="id, name", supportsAllDrives=True
             ).execute()
-            folder_line += f"（name: {meta.get('name')}）"
+            out.append(f"• Folder name: {meta.get('name')}")
         elif err:
-            folder_line += f"（service build error: {err}）"
+            out.append(f"• service 建立失敗：{err}")
     except HttpError as e:
-        folder_line += f"（get folder meta failed: {e}）"
-
-    return f"✅ 已讀到 SERVICE_ACCOUNT_JSON，client_email = {client_email}\n{folder_line}"
+        out.append(f"• 讀取資料夾資訊失敗：{e}")
+    return "\n".join(out)
 
-
-def list_folder_contents(drive_folder_id_input: str):
-    """列出指定 Folder 的前 50 個檔案；若輸入框為空則用 Secret 的 DRIVE_FOLDER_ID。支援貼整個 URL。"""
-    service, client_email, err = _drive_service_from_env()
+def list_folder(folder_input):
+    service, client_email, err = drive_service_from_secret()
     if service is None:
-        return f"❌ 讀取 SERVICE_ACCOUNT_JSON 失敗：{err}"
+        return f"❌ 無法建立 Drive 服務：{err}"
 
-    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)
+    env_folder = os.environ.get("DRIVE_FOLDER_ID", "").strip()
+    raw_folder = folder_input or env_folder or DEFAULT_FOLDER_URL
+    folder_id = clean_folder_id(raw_folder)
     if not folder_id:
-        return "❌ 沒有提供有效的 Folder ID（輸入框與 Secret 都是空的或格式不對）。"
+        return "❌ 無效的 Folder ID/URL。"
 
     try:
-        folder_meta = service.files().get(
+        meta = service.files().get(
             fileId=folder_id, fields="id, name, mimeType",
             supportsAllDrives=True
         ).execute()
+        if meta.get("mimeType") != "application/vnd.google-apps.folder":
+            return f"⚠️ 這不是資料夾：{meta.get('name')} ({meta.get('mimeType')})"
     except HttpError as e:
-        return f"❌ 取得資料夾資訊失敗（可能 ID 錯誤或沒權限）：{e}"
-
-    if folder_meta.get("mimeType") != "application/vnd.google-apps.folder":
-        return f"⚠️ 這個 ID 不是資料夾：{folder_meta.get('name')} ({folder_meta.get('mimeType')})"
+        return f"❌ 取得資料夾資訊失敗：{e}"
 
     try:
-        query = f"'{folder_id}' in parents and trashed=false"
         res = service.files().list(
-            q=query,
+            q=f"'{folder_id}' in parents and trashed=false",
             fields="files(id, name, mimeType, webViewLink)",
             pageSize=50,
             supportsAllDrives=True,
@@ -247,31 +234,26 @@ def list_folder_contents(drive_folder_id_input: str):
         ).execute()
         files = res.get("files", [])
     except HttpError as e:
-        return f"❌ 列出資料夾內容失敗：{e}"
+        return f"❌ 列出內容失敗：{e}"
 
     lines = [
         f"✅ Service account：`{client_email}`",
-        f"✅ 資料夾：**{folder_meta.get('name')}** (`{folder_id}`)",
+        f"✅ 資料夾：**{meta.get('name')}** (`{folder_id}`)",
         "📁 內容（最多 50 筆）："
     ]
     if not files:
-        lines.append("（空資料夾或沒有讀取權限的檔案）")
+        lines.append("（空資料夾或無可見檔案）")
     else:
         for f in files:
-            lines.append(f"- `{f.get('name')}`  |  `{f.get('mimeType')}`  |  {f.get('webViewLink')}")
+            lines.append(f"- `{f['name']}` | `{f['mimeType']}` | {f['webViewLink']}")
     return "\n".join(lines)
 
-
-# ----------------- Gradio UI -----------------
+# ====== UI ======
 with gr.Blocks(title="Map → Google Drive Uploader") as demo:
     gr.Markdown("""
 # 🗺️ Map → Google Drive Uploader
-貼上 `lon,lat`（每行一組），設定視窗範圍並上傳至 Google Drive。
-**設定提醒：**
-- 到 Space **Settings → Secrets** 新增：
-  - `SERVICE_ACCOUNT_JSON`：貼完整的 Service Account JSON
-  - （可選）`DRIVE_FOLDER_ID`：Google Drive 資料夾 ID（或直接貼整個 URL，程式會自動擷取）
-- 若要上傳到指定資料夾，請先在 Google Drive 將該資料夾**分享給** Service Account 的 email（編輯者）。
+預設會上傳到：`https://drive.google.com/drive/folders/1B7D4Z6vV_G30nIrBr8qFsgNA4l2G-dRo`  
+（也可在下方覆蓋資料夾 URL/ID；或在 Secrets 設 `DRIVE_FOLDER_ID`）
 """)
 
     with gr.Row():
@@ -289,9 +271,9 @@ with gr.Blocks(title="Map → Google Drive Uploader") as demo:
                 min_lat_in = gr.Number(label="min_lat", value=DEFAULT_EXTENT[2])
                 max_lat_in = gr.Number(label="max_lat", value=DEFAULT_EXTENT[3])
 
-            folder_id_in = gr.Textbox(
-                label="Google Drive Folder ID 或整個 URL（可選，覆蓋 Space Secret）",
-                placeholder="e.g. 1AbCdEfGhIJKlmnopQRstuVWxyz 或 https://drive.google.com/drive/folders/1AbC...",
+            folder_in = gr.Textbox(
+                label="（可選）覆蓋資料夾：貼整個 URL 或純 ID",
+                placeholder=DEFAULT_FOLDER_URL,
             )
             make_public_in = gr.Checkbox(
                 label="建立公開連結（anyone with the link, reader）", value=False
@@ -311,11 +293,11 @@ with gr.Blocks(title="Map → Google Drive Uploader") as demo:
     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],
+                folder_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)
+    list_btn.click(fn=list_folder, inputs=folder_in, outputs=list_out)
 
 if __name__ == "__main__":
-    demo.launch()
+    demo.launch()