Merge pull request #176 from ikatson/playlist-content-type

Fix playlist content type issues
ikatson · Aug 10, 2024 · bf1a230 · bf1a230
2 parents 62067b2 + 14b023b
commit bf1a230
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/crates/librqbit/src/http_api.rs b/crates/librqbit/src/http_api.rs
@@ -177,15 +177,13 @@ impl HttpApi {
                 })
                 .join("\r\n");
             (
-                if cfg!(any(target_os = "macos", target_os = "ios")) {
-                    [(
-                        "Content-Type",
-                        "application/vnd.apple.mpegurl; charset=utf-8",
-                    )]
-                } else {
-                    // apple mime does not work with VLC on linux
-                    [("Content-Type", "text/plain; charset=utf-8")]
-                },
+                [
+                    ("Content-Type", "application/mpegurl; charset=utf-8"),
+                    (
+                        "Content-Disposition",
+                        "attachment; filename=\"rqbit-playlist.m3u8\"",
+                    ),
+                ],
                 body,
             )
         }

diff --git a/crates/librqbit/webui/src/api-types.ts b/crates/librqbit/webui/src/api-types.ts
@@ -94,7 +94,7 @@ export interface ErrorDetails {
   path?: string;
   status?: number;
   statusText?: string;
-  text: string;
+  text: string | React.ReactNode;
 }
 
 export type Duration = number;

diff --git a/crates/librqbit/webui/src/components/buttons/TorrentActions.tsx b/crates/librqbit/webui/src/components/buttons/TorrentActions.tsx
@@ -11,6 +11,7 @@ import {
   FaClipboardList,
 } from "react-icons/fa";
 import { useErrorStore } from "../../stores/errorStore";
+import { ErrorComponent } from "../ErrorComponent";
 
 export const TorrentActions: React.FC<{
   id: number;
@@ -45,7 +46,7 @@ export const TorrentActions: React.FC<{
             text: `Error starting torrent id=${id}`,
             details: e,
           });
-        }
+        },
       )
       .finally(() => setDisabled(false));
   };
@@ -62,7 +63,7 @@ export const TorrentActions: React.FC<{
             text: `Error pausing torrent id=${id}`,
             details: e,
           });
-        }
+        },
       )
       .finally(() => setDisabled(false));
   };
@@ -88,17 +89,29 @@ export const TorrentActions: React.FC<{
     try {
       await navigator.clipboard.writeText(playlistUrl);
     } catch (e) {
-      setCloseableError({
-        text: "Error",
-        details: { text: `Error copying playlist URL to clipboard: ${e}` },
+      setAlert({
+        text: "Copy playlist URL",
+        details: {
+          text: (
+            <>
+              <p>
+                Copy{" "}
+                <a href={playlistUrl} className="text-blue-500">
+                  playlist URL
+                </a>{" "}
+                to clipboard and paste into e.g. VLC to play.
+              </p>
+            </>
+          ),
+        },
       });
       return;
     }
 
     setAlert({
       text: "Copied",
       details: {
-        text: `Playlist URL copied to clipboard. Paste into e.g. VLC to play.`,
+        text: "Playlist URL copied to clipboard. Paste into e.g. VLC to play.",
       },
     });
   };