Merge pull request #1 from reprodev/dev

reprodev · web-flow · commit f5019408f1d5 · 2026-02-11T12:37:06.000Z
Add desktop download fix and end-user compose config
diff --git a/README.md b/README.md
@@ -51,12 +51,12 @@ Outputs are written to `/data/outputs` (mapped to your local volume path).
 Use the included compose example:
 
 ```bash
-docker compose -f docker-compose.ghcr.yml up -d
+docker compose up -d
 ```
 
 Default image reference in that file:
 
-- `ghcr.io/reprodev/capotokeys:v1.0`
+- `ghcr.io/reprodev/capo2keys_private:latest`
 
 If the package is private, authenticate first:
 
@@ -74,8 +74,7 @@ Common tags:
 
 - `latest` (default branch)
 - `dev` (dev branch)
-- `v1.0` (current release tag)
-- `vX.Y.Z` (future release tags)
+- `vX.Y.Z` (release tags)
 - `sha-<commit>`
 
 ## Configuration
@@ -171,4 +170,3 @@ GHCR setup details: `docs/GHCR_SETUP.md`
 
 MIT — see `LICENSE`.
 
-
diff --git a/desktop_app.py b/desktop_app.py
@@ -42,9 +42,10 @@ def main():
     except ImportError as exc:
         raise SystemExit("Desktop mode needs pywebview. Install requirements-desktop.txt") from exc
 
-    webview.create_window("CapoToKeys", f"http://{host}:{port}", min_size=(960, 700))
+    # Let links with target=_blank open in the system browser.`r`n    # This ensures file downloads work in desktop executable mode.`r`n    webview.settings["OPEN_EXTERNAL_LINKS_IN_BROWSER"] = True`r`n    webview.create_window("CapoToKeys", f"http://{host}:{port}", min_size=(960, 700))
     webview.start()
 
 
 if __name__ == "__main__":
     main()
+
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,13 @@
+﻿services:
+  capotokeys:
+    image: ghcr.io/reprodev/capotokeys:v1.0
+    container_name: capotokeys
+    ports:
+      - "4506:4506"
+    environment:
+      OUTPUT_CONFLICT_MODE: suffix
+      WEB_HOST: 0.0.0.0
+      WEB_PORT: 4506
+    volumes:
+      - ./appdata/config/capotokeys:/data
+    restart: unless-stopped
diff --git a/templates/index.html b/templates/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+﻿<!doctype html>
 <html lang="en">
 
 <head>
@@ -77,7 +77,7 @@ <h3>Transposed Result</h3>
 
       <div class="row">
         <div class="actions">
-          <a class="btn btn-sm" href="{{ url_for('download', filename=txt_name) }}">
+          <a class="btn btn-sm" href="{{ url_for('download', filename=txt_name) }}" target="_blank" rel="noopener">
             <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
               stroke-linecap="round" stroke-linejoin="round">
               <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v4"></path>
@@ -86,7 +86,7 @@ <h3>Transposed Result</h3>
             </svg>
             Download TXT
           </a>
-          <a class="btn btn-sm" href="{{ url_for('download', filename=pdf_name) }}">
+          <a class="btn btn-sm" href="{{ url_for('download', filename=pdf_name) }}" target="_blank" rel="noopener">
             <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
               stroke-linecap="round" stroke-linejoin="round">
               <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v4"></path>
@@ -117,3 +117,4 @@ <h3>Transposed Result</h3>
 
 
 
+
diff --git a/templates/list.html b/templates/list.html
@@ -1,4 +1,4 @@
-<!doctype html>
+﻿<!doctype html>
 <html lang="en">
 
 <head>
@@ -107,7 +107,7 @@ <h3 style="margin-top: 0;">Selected Files</h3>
                                     <a class="btn btn-secondary btn-sm" href="{{ url_for('view_file', filename=f.name) }}"
                                         target="_blank">View</a>
                                     <a class="btn btn-secondary btn-sm"
-                                        href="{{ url_for('download', filename=f.name) }}">Download</a>
+                                        href="{{ url_for('download', filename=f.name) }}" target="_blank" rel="noopener">Download</a>
                                     <form method="post" action="{{ url_for('delete_file', filename=f.name) }}"
                                         onsubmit="return confirm('Permanently delete {{ f.name }}?');">
                                         <button class="btn btn-danger btn-sm" type="submit">Delete</button>
@@ -134,3 +134,4 @@ <h3 style="margin-top: 0;">Selected Files</h3>
 
 
 
+
