fix bugs

Author: Fredolx

flatpak/dev.fredol.open-tv.metainfo.xml

@@ -29,7 +29,7 @@
   </categories>
   <launchable type="desktop-id">dev.fredol.open-tv.desktop</launchable>
   <releases>
-    <release version="1.3.1" date="2025-01-13">
+    <release version="1.4.1" date="2025-01-22">
       <description>
         <p>
           Please see the official changelog at github.com/fredolx/open-tv/releases

package.json

@@ -1,6 +1,6 @@
 {
   "name": "open-tv",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "scripts": {
     "ng": "ng",
     "tauri": "tauri",
@@ -49,4 +49,4 @@
     "karma-jasmine-html-reporter": "~2.1.0",
     "typescript": "~5.4.2"
   }
-}
+}

src-tauri/src/mpv.rs

@@ -126,8 +126,10 @@ fn set_headers(headers: Option<ChannelHttpHeaders>, args: &mut Vec<String>) {
             args.push(ARG_IGNORE_SSL.to_string());
         }
     }
-    let headers = headers_vec.join(",");
-    args.push(format!("{ARG_HTTP_HEADERS}{headers}"));
+    if headers_vec.len() > 0 {
+        let headers = headers_vec.join(",");
+        args.push(format!("{ARG_HTTP_HEADERS}{headers}"));
+    }
 }
 
 fn get_path(path_str: String) -> String {

src-tauri/src/restream.rs

@@ -1,4 +1,5 @@
 use std::{
+    os::windows::process::CommandExt,
     path::{Path, PathBuf},
     process::{Child, Command, Stdio},
     time::Duration,
@@ -24,14 +25,12 @@ use crate::{
 
 const WAN_IP_API: &str = "https://api.ipify.org";
 const FFMPEG_BIN_NAME: &str = "ffmpeg";
+const CREATE_NO_WINDOW: u32 = 0x08000000;
 
 fn start_ffmpeg_listening(channel: Channel, restream_dir: PathBuf) -> Result<Child> {
     let headers = sql::get_channel_headers_by_id(channel.id.context("no channel id")?)?;
     let playlist_dir = get_playlist_dir(restream_dir);
     let mut command = Command::new(get_bin(FFMPEG_BIN_NAME));
-    command
-        .arg("-i")
-        .arg(channel.url.context("no channel url")?);
     if let Some(headers) = headers {
         if let Some(referrer) = headers.referrer {
             command.arg("-headers");
@@ -52,7 +51,11 @@ fn start_ffmpeg_listening(channel: Channel, restream_dir: PathBuf) -> Result<Chi
             }
         }
     }
+    #[cfg(target_os = "windows")]
+    command.creation_flags(CREATE_NO_WINDOW);
     let child = command
+        .arg("-i")
+        .arg(channel.url.context("no channel url")?)
         .arg("-c")
         .arg("copy")
         .arg("-f")
@@ -76,7 +79,6 @@ fn start_ffmpeg_listening(channel: Channel, restream_dir: PathBuf) -> Result<Chi
         .arg(playlist_dir)
         .stdout(Stdio::null())
         .stderr(Stdio::null())
-        .stdin(Stdio::null())
         .spawn()?;
     Ok(child)
 }

src-tauri/tauri.conf.json

@@ -1,6 +1,6 @@
 {
   "productName": "Open TV",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "identifier": "dev.fredol.open-tv",
   "build": {
     "frontendDist": "../dist/open-tv/browser",
@@ -11,7 +11,7 @@
   "app": {
     "windows": [
       {
-        "title": "Open TV (v1.4.0)",
+        "title": "Open TV (v1.4.1)",
         "width": 800,
         "height": 600,
         "resizable": true,
@@ -35,19 +35,35 @@
     "windows": {
       "wix": {
         "language": "en-US",
-        "fragmentPaths": ["./windows/fragments/deps.wxs"],
-        "componentGroupRefs": ["DependencyComponents"],
-        "componentRefs": ["MpvComponent", "FfmpegComponent", "YtDlpComponent"]
+        "fragmentPaths": [
+          "./windows/fragments/deps.wxs"
+        ],
+        "componentGroupRefs": [
+          "DependencyComponents"
+        ],
+        "componentRefs": [
+          "MpvComponent",
+          "FfmpegComponent",
+          "YtDlpComponent"
+        ]
       }
     },
     "linux": {
       "deb": {
-        "depends": ["mpv", "ffmpeg", "yt-dlp"]
+        "depends": [
+          "mpv",
+          "ffmpeg",
+          "yt-dlp"
+        ]
       },
       "rpm": {
-        "depends": ["mpv", "ffmpeg", "yt-dlp"]
+        "depends": [
+          "mpv",
+          "ffmpeg",
+          "yt-dlp"
+        ]
       }
     }
   },
   "$schema": "../node_modules/@tauri-apps/cli/schema.json"
-}
+}