progress

Author: Fredolx

src-tauri/src/lib.rs

@@ -84,7 +84,8 @@ pub fn run() {
             start_restream,
             stop_restream,
             watch_self,
-            get_network_info
+            get_network_info,
+            share_restream
         ])
         .setup(|app| {
             app.manage(Mutex::new(AppState {
@@ -282,7 +283,7 @@ fn add_custom_source(name: String) -> Result<(), String> {
 
 #[tauri::command(async)]
 fn share_custom_channel(channel: Channel) -> Result<(), String> {
-    share::share_custom_channel(channel).map_err(map_err_frontend)
+    share::share_custom_channel(channel, None).map_err(map_err_frontend)
 }
 
 #[tauri::command(async)]
@@ -426,3 +427,8 @@ async fn watch_self(port: u16) -> Result<(), String> {
 async fn get_network_info() -> Result<NetworkInfo, String> {
     restream::get_network_info().await.map_err(map_err_frontend)
 }
+
+#[tauri::command(async)]
+fn share_restream(address: String, channel: Channel) -> Result<(), String> {
+    restream::share_restream(address, channel).map_err(map_err_frontend)
+}

src-tauri/src/restream.rs

@@ -4,7 +4,6 @@ use std::{
 };
 
 use anyhow::{Context, Result};
-use if_addrs::IfAddr;
 use tauri::State;
 use tokio::{
     fs,
@@ -150,20 +149,23 @@ pub async fn watch_self(port: u16) -> Result<()> {
     mpv::play(channel, false).await
 }
 
-fn share_restream(address: String, channel: Channel) -> Result<()> {
-    crate::share::share_custom_channel(Channel {
-        id: Some(-1),
-        name: format!("RST | {}", channel.name).to_string(),
-        url: Some(address),
-        group: None,
-        image: channel.image,
-        media_type: crate::media_type::LIVESTREAM,
-        source_id: None,
-        series_id: None,
-        group_id: None,
-        favorite: false,
-        stream_id: None,
-    })
+pub fn share_restream(address: String, channel: Channel) -> Result<()> {
+    crate::share::share_custom_channel(
+        Channel {
+            id: Some(-1),
+            name: format!("RST | {}", channel.name).to_string(),
+            url: Some(address),
+            group: None,
+            image: channel.image,
+            media_type: crate::media_type::LIVESTREAM,
+            source_id: None,
+            series_id: None,
+            group_id: None,
+            favorite: false,
+            stream_id: None,
+        },
+        Some(format!("RST - {}", channel.id.context("no id")?)),
+    )
 }
 
 pub async fn get_network_info() -> Result<NetworkInfo> {

src-tauri/src/share.rs

@@ -3,6 +3,7 @@ use crate::types::ExportedGroup;
 use crate::types::ExportedSource;
 use crate::types::Group;
 use crate::types::Source;
+use crate::utils::sanitize;
 use crate::{sql, types::Channel};
 use anyhow::bail;
 use anyhow::Context;
@@ -14,20 +15,21 @@ const CHANNEL_SHARE_EXTENSION: &str = ".otv";
 const GROUP_SHARE_EXTENSION: &str = ".otvg";
 const PLAYLIST_SHARE_EXTENSION: &str = ".otvp";
 
-pub fn share_custom_channel(channel: Channel) -> Result<()> {
+pub fn share_custom_channel(channel: Channel, filename: Option<String>) -> Result<()> {
     let channel = get_custom_channel(channel)?;
     let path = get_download_path(
-        channel.data.id.context("No id on channel?")?,
+        filename.unwrap_or(channel.data.id.context("No id on channel?")?.to_string()),
         CHANNEL_SHARE_EXTENSION,
     )?;
     serialize_to_file(channel, path)
 }
 
-fn get_download_path(id: i64, extension: &str) -> Result<String> {
+fn get_download_path(filename: String, extension: &str) -> Result<String> {
     let path = UserDirs::new().context("No user dirs?")?;
     let path = path.download_dir().context("No downloads folder")?;
     let mut path = path.to_path_buf();
-    path.push(format!("{id}{extension}"));
+    let filename = sanitize(filename);
+    path.push(format!("{filename}{extension}"));
     Ok(path.to_string_lossy().to_string())
 }
 
@@ -54,7 +56,10 @@ pub fn share_custom_group(group: Channel) -> Result<()> {
         },
         channels: sql::get_custom_channels(group.id, group.source_id.context("no source id?")?)?,
     };
-    let path = get_download_path(group.id.context("No group id?")?, GROUP_SHARE_EXTENSION)?;
+    let path = get_download_path(
+        group.id.context("No group id?")?.to_string(),
+        GROUP_SHARE_EXTENSION,
+    )?;
     serialize_to_file(to_export, path)?;
     Ok(())
 }
@@ -67,7 +72,7 @@ pub fn share_custom_source(mut source: Source) -> Result<()> {
         groups: sql::get_custom_groups(id)?,
         channels: sql::get_custom_channels(None, id)?,
     };
-    let path = get_download_path(id, PLAYLIST_SHARE_EXTENSION)?;
+    let path = get_download_path(id.to_string(), PLAYLIST_SHARE_EXTENSION)?;
     serialize_to_file(to_export, path)?;
     Ok(())
 }

src-tauri/src/utils.rs

@@ -81,7 +81,7 @@ fn get_filename(channel_name: String, url: String) -> Result<String> {
     Ok(filename)
 }
 
-fn sanitize(str: String) -> String {
+pub fn sanitize(str: String) -> String {
     ILLEGAL_CHARS_REGEX.replace_all(&str, "").to_string()
 }
 

src/app/restream-modal/restream-modal.component.html

@@ -27,23 +27,22 @@ <h4 class="modal-title lbl">Re-streaming: {{ channel?.name }}</h4>
   <div *ngIf="started">
     <br />
     <p>
-      Press the share button (Share LAN or Share WAN) below to generate an .otv file for this
-      service. You will be able to share this file with your friends so they can import it in Open
-      TV and watch your re-streamed livestream
+      Select an IP and press the share button below to generate an .otv file. You will be able to
+      share this file with your friends so they can import it in Open TV and watch your re-streamed
+      content.
     </p>
     <br />
     <p>
-      Your re-streaming service is always availaible from your LAN. On the other hand, WAN access
-      will work if you open the appropriate port on your router (3000 by default)
+      You can import .otv files in Open TV by having or creating a custom source. Make sure to
+      select the right IP for the right context; sharing an .otv file with one of your local IPs
+      will not work for someone outside your LAN.
     </p>
     <br />
-    <p>To import an .otv file in Open TV:</p>
-    <ol>
-      <li>Create a new custom source (either from setup or settings)</li>
-      <li>Go in settings</li>
-      <li>Click on "import channel/group" button within the custom source</li>
-      <li>Select the .otv file</li>
-    </ol>
+    <label for="ip-select">Select IP to share</label>
+    <select [(ngModel)]="selectedIP" id="ip-select" class="form-control">
+      <option *ngFor="let local of networkInfo?.local_ips">{{ local }}</option>
+      <option>{{ networkInfo?.wan_ip }}</option>
+    </select>
   </div>
 </div>
 <div class="modal-footer">
@@ -79,60 +78,55 @@ <h4 class="modal-title lbl">Re-streaming: {{ channel?.name }}</h4>
     </svg>
   </button>
   <button
-    ngbTooltip="Sharing over LAN means sharing for your local network. The .otv file generated will
-    point to your local IP"
     class="btn btn-primary d-inline-flex align-items-center"
     (click)="share()"
     *ngIf="started"
   >
-    <span>Share LAN</span>
+    <span>Share</span>
     <svg
       class="icon ms-1"
       fill="currentColor"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24 24"
     >
       <path
-        d="M10,2C8.89,2 8,2.89 8,4V7C8,8.11 8.89,9 10,9H11V11H2V13H6V15H5C3.89,15 3,15.89 3,17V20C3,21.11 3.89,22 5,22H9C10.11,22 11,21.11 11,20V17C11,15.89 10.11,15 9,15H8V13H16V15H15C13.89,15 13,15.89 13,17V20C13,21.11 13.89,22 15,22H19C20.11,22 21,21.11 21,20V17C21,15.89 20.11,15 19,15H18V13H22V11H13V9H14C15.11,9 16,8.11 16,7V4C16,2.89 15.11,2 14,2H10M10,4H14V7H10V4M5,17H9V20H5V17M15,17H19V20H15V17Z"
+        d="M12,2A8,8 0 0,0 4,10C4,14.03 7,17.42 11,17.93V19H10A1,1 0 0,0 9,20H2V22H9A1,1 0 0,0 10,23H14A1,1 0 0,0 15,22H22V20H15A1,1 0 0,0 14,19H13V17.93C17,17.43 20,14.03 20,10A8,8 0 0,0 12,2M12,4C12,4 12.74,5.28 13.26,7H10.74C11.26,5.28 12,4 12,4M9.77,4.43C9.5,4.93 9.09,5.84 8.74,7H6.81C7.5,5.84 8.5,4.93 9.77,4.43M14.23,4.44C15.5,4.94 16.5,5.84 17.19,7H15.26C14.91,5.84 14.5,4.93 14.23,4.44M6.09,9H8.32C8.28,9.33 8.25,9.66 8.25,10C8.25,10.34 8.28,10.67 8.32,11H6.09C6.03,10.67 6,10.34 6,10C6,9.66 6.03,9.33 6.09,9M10.32,9H13.68C13.72,9.33 13.75,9.66 13.75,10C13.75,10.34 13.72,10.67 13.68,11H10.32C10.28,10.67 10.25,10.34 10.25,10C10.25,9.66 10.28,9.33 10.32,9M15.68,9H17.91C17.97,9.33 18,9.66 18,10C18,10.34 17.97,10.67 17.91,11H15.68C15.72,10.67 15.75,10.34 15.75,10C15.75,9.66 15.72,9.33 15.68,9M6.81,13H8.74C9.09,14.16 9.5,15.07 9.77,15.56C8.5,15.06 7.5,14.16 6.81,13M10.74,13H13.26C12.74,14.72 12,16 12,16C12,16 11.26,14.72 10.74,13M15.26,13H17.19C16.5,14.16 15.5,15.07 14.23,15.57C14.5,15.07 14.91,14.16 15.26,13Z"
       />
     </svg>
   </button>
   <button
-    ngbTooltip="Sharing over WAN means sharing for the internet. The .otv file generated will point
-    to your public IP"
-    class="btn btn-primary d-inline-flex align-items-center"
-    (click)="share()"
+    class="btn btn-danger d-inline-flex align-items-center"
     *ngIf="started"
+    [disabled]="loading"
+    (click)="stop()"
   >
-    <span>Share WAN</span>
+    <span>Stop</span>
     <svg
       class="icon ms-1"
       fill="currentColor"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24 24"
     >
       <path
-        d="M12,2A8,8 0 0,0 4,10C4,14.03 7,17.42 11,17.93V19H10A1,1 0 0,0 9,20H2V22H9A1,1 0 0,0 10,23H14A1,1 0 0,0 15,22H22V20H15A1,1 0 0,0 14,19H13V17.93C17,17.43 20,14.03 20,10A8,8 0 0,0 12,2M12,4C12,4 12.74,5.28 13.26,7H10.74C11.26,5.28 12,4 12,4M9.77,4.43C9.5,4.93 9.09,5.84 8.74,7H6.81C7.5,5.84 8.5,4.93 9.77,4.43M14.23,4.44C15.5,4.94 16.5,5.84 17.19,7H15.26C14.91,5.84 14.5,4.93 14.23,4.44M6.09,9H8.32C8.28,9.33 8.25,9.66 8.25,10C8.25,10.34 8.28,10.67 8.32,11H6.09C6.03,10.67 6,10.34 6,10C6,9.66 6.03,9.33 6.09,9M10.32,9H13.68C13.72,9.33 13.75,9.66 13.75,10C13.75,10.34 13.72,10.67 13.68,11H10.32C10.28,10.67 10.25,10.34 10.25,10C10.25,9.66 10.28,9.33 10.32,9M15.68,9H17.91C17.97,9.33 18,9.66 18,10C18,10.34 17.97,10.67 17.91,11H15.68C15.72,10.67 15.75,10.34 15.75,10C15.75,9.66 15.72,9.33 15.68,9M6.81,13H8.74C9.09,14.16 9.5,15.07 9.77,15.56C8.5,15.06 7.5,14.16 6.81,13M10.74,13H13.26C12.74,14.72 12,16 12,16C12,16 11.26,14.72 10.74,13M15.26,13H17.19C16.5,14.16 15.5,15.07 14.23,15.57C14.5,15.07 14.91,14.16 15.26,13Z"
+        d="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M9,9H15V15H9"
       />
     </svg>
   </button>
   <button
-    class="btn btn-danger d-inline-flex align-items-center"
-    *ngIf="started"
-    [disabled]="loading"
-    (click)="stop()"
+    (click)="activeModal.close('close')"
+    class="btn btn-secondary d-inline-flex align-items-center"
+    *ngIf="!started"
   >
-    <span>Stop</span>
+    <span>Close</span>
     <svg
       class="icon ms-1"
       fill="currentColor"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 24 24"
     >
       <path
-        d="M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M9,9H15V15H9"
+        d="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z"
       />
     </svg>
   </button>
-  <button class="btn btn-secondary d-inline-flex align-items-center" *ngIf="!started">Close</button>
 </div>

src/app/restream-modal/restream-modal.component.ts

@@ -3,6 +3,7 @@ import { Channel } from "../models/channel";
 import { invoke } from "@tauri-apps/api/core";
 import { ErrorService } from "../error.service";
 import { NetworkInfo } from "../models/networkInfo";
+import { NgbActiveModal } from "@ng-bootstrap/ng-bootstrap";
 
 @Component({
   selector: "app-restream-modal",
@@ -17,11 +18,17 @@ export class RestreamModalComponent implements OnInit {
   address = "http://192.168.2.10/stream.m3u8";
   wanAddress = "http://10.145.22.12/stream.m3u8";
   networkInfo?: NetworkInfo;
-  constructor(private error: ErrorService) {}
+  selectedIP?: string;
+
+  constructor(
+    private error: ErrorService,
+    public activeModal: NgbActiveModal,
+  ) {}
 
   ngOnInit(): void {
     invoke("get_network_info").then((network) => {
       this.networkInfo = network as NetworkInfo;
+      this.selectedIP = this.networkInfo.local_ips[0];
     });
   }
 
@@ -59,5 +66,14 @@ export class RestreamModalComponent implements OnInit {
     this.watching = false;
   }
 
-  share() {}
+  async share() {
+    try {
+      await invoke("share_restream", { address: this.selectedIP, channel: this.channel });
+      this.error.success(
+        `Successfully exported re-stream to Downloads/rst-${this.channel?.id}.otv`,
+      );
+    } catch (e) {
+      this.error.handleError(e);
+    }
+  }
 }