Merge branch 'master' into feature/config_reload

backend/src/api/model/streams/provider_stream_factory.rs

@@ -6,7 +6,7 @@ use crate::api::model::streams::buffered_stream::BufferedStream;
 use crate::api::model::streams::client_stream::ClientStream;
 use crate::api::model::streams::provider_stream::{create_channel_unavailable_stream, get_header_filter_for_item_type};
 use crate::api::model::streams::timed_client_stream::TimedClientStream;
-use shared::model::{PlaylistItemType, DEFAULT_USER_AGENT};
+use shared::model::{PlaylistItemType};
 use crate::model::{AppConfig};
 use crate::tools::atomic_once_flag::AtomicOnceFlag;
 use crate::utils::request::{classify_content_type, get_request_headers, MimeCategory};

backend/src/utils/network/request.rs

@@ -53,6 +53,8 @@ pub fn classify_content_type(headers: &[(String, String)]) -> MimeCategory {
         })
 }
 
+pub const DEFAULT_USER_AGENT: &str = "VLC/3.0.16 LibVLC/3.0.16";
+
 pub async fn get_input_epg_content_as_file(client: Arc<reqwest::Client>, input: &ConfigInput, working_dir: &str, url_str: &str, persist_filepath: Option<PathBuf>) -> Result<PathBuf, TuliproxError> {
     debug_if_enabled!("getting input epg content working_dir: {}, url: {}", working_dir, sanitize_sensitive_info(url_str));
     if url_str.parse::<url::Url>().is_ok() {

shared/src/model/config/base.rs

@@ -2,6 +2,7 @@ use crate::error::{TuliproxError, TuliproxErrorKind};
 use crate::model::{WebUiConfigDto, MessagingConfigDto, IpCheckConfigDto, HdHomeRunConfigDto, VideoConfigDto, ScheduleConfigDto, LogConfigDto, ReverseProxyConfigDto, ProxyConfigDto, ConfigApiDto};
 use crate::utils::{default_connect_timeout_secs};
 
+pub const DEFAULT_USER_AGENT: &str = "VLC/3.0.16 LibVLC/3.0.16";
 
 #[allow(clippy::struct_excessive_bools)]
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Default)]

shared/src/model/config/video_download.rs

@@ -2,9 +2,7 @@ use std::collections::HashMap;
 use std::borrow::BorrowMut;
 use crate::create_tuliprox_error_result;
 use crate::error::{TuliproxError, TuliproxErrorKind};
-
-
-pub const DEFAULT_USER_AGENT: &str = "VLC/3.0.16 LibVLC/3.0.16";
+use crate::model::DEFAULT_USER_AGENT;
 
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Default)]
 #[serde(deny_unknown_fields)]