refactor(portal): move media support modules

Dami committed Jul 228c5a03f

commit: 8c5a03f1778b05c1d5fd11e193ee5ad1dafc12bb
parent: 78cce98bb09542f3a8758a8e2c9e779d4029a5b7
author: Dami <dami.etoile@gmail.com>

6 files changed, +15 -14wrap lines

M	src-tauri/src/commands/mod.rs	2	--
M	src-tauri/src/commands/network.rs	12	++++++------
M	src-tauri/src/main.rs	1	+
A	src-tauri/src/media/mod.rs	2	++
R	src-tauri/src/commands/moq_catalog.rs → src-tauri/src/media/moq_catalog.rs	12	++++++------
R	src-tauri/src/commands/network_diagnostics.rs → src-tauri/src/media/network_diagnostics.rs	0

M src-tauri/src/commands/mod.rs +0 -2

@@ -1,8 +1,6 @@
11 pub mod auth;22 pub mod enrollment;3-mod moq_catalog;43 pub mod network;5-mod network_diagnostics;64 pub mod state;75 86 pub use state::AppState;

M src-tauri/src/commands/network.rs +6 -6

@@ -1,16 +1,16 @@
11 use super::auth::derive_iroh_secret_from_key;22 use super::enrollment::{connection_enrollment, mark_invitation_redeemed};3-use super::moq_catalog::subscribe_goq_video_track;4-#[cfg(test)]5-use super::network_diagnostics::PathMode;6-use super::network_diagnostics::{7-    NetworkDiagnosticsSnapshot, NetworkLeg, NetworkSessionDiagnostics,8-};93 use super::state::{104     AUDIO_DELIVERY_CAPACITY, AccumulatedMediaFeedback, AppState, AudioDeliveryState,115     CLIENT_INPUT_QUEUE_CAPACITY, FRAME_ALPN, INPUT_ALPN, MediaFeedbackSender,126     development_direct_node_available,137 };8+use crate::media::moq_catalog::subscribe_goq_video_track;9+#[cfg(test)]10+use crate::media::network_diagnostics::PathMode;11+use crate::media::network_diagnostics::{12+    NetworkDiagnosticsSnapshot, NetworkLeg, NetworkSessionDiagnostics,13+};1414 use base64::Engine;1515 use iroh::{Endpoint, SecretKey, endpoint::presets};1616 use iroh_moq::{Moq, MoqSession};

M src-tauri/src/main.rs +1 -0

@@ -2,6 +2,7 @@
22 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]33 44 mod commands;5+mod media;56 67 use commands::AppState;78 

A src-tauri/src/media/mod.rs +2 -0

@@ -0,0 +1,2 @@

1+pub(crate) mod moq_catalog;2+pub(crate) mod network_diagnostics;

R src-tauri/src/commands/moq_catalog.rs → src-tauri/src/media/moq_catalog.rs +6 -6

@@ -35,13 +35,13 @@ impl GoqCatalogDocument {
}3636 3737 #[derive(Clone, Copy, Debug, PartialEq, Eq)]38-pub(super) enum MoqCatalogMode {38+pub(crate) enum MoqCatalogMode {3939     GoqV1,4040     AbsentStaticTrackCompat,4141 }4242 4343 impl MoqCatalogMode {44-    pub(super) const fn label(self) -> &'static str {44+    pub(crate) const fn label(self) -> &'static str {4545         match self {4646             Self::GoqV1 => "goq-v1",4747             Self::AbsentStaticTrackCompat => "absent-static-track-compat",@@ -49,9 +49,9 @@ impl MoqCatalogMode {
   }5050 }5151 52-pub(super) struct MoqCatalogSelection {53-    pub(super) track: TrackConsumer,54-    pub(super) mode: MoqCatalogMode,52+pub(crate) struct MoqCatalogSelection {53+    pub(crate) track: TrackConsumer,54+    pub(crate) mode: MoqCatalogMode,5555 }5656 5757 fn is_track_not_found(error: &MoqError) -> bool {@@ -73,7 +73,7 @@ fn subscribe_static_video_track(
   })7474 }7575 76-pub(super) async fn subscribe_goq_video_track(76+pub(crate) async fn subscribe_goq_video_track(7777     broadcast: &BroadcastConsumer,7878     timeout: Duration,7979 ) -> Result<MoqCatalogSelection, String> {

R src-tauri/src/commands/network_diagnostics.rs → src-tauri/src/media/network_diagnostics.rs +0 -0

No content changes.