api_proxy refactored

This commit is contained in:
euzu
2025-06-19 17:20:36 +02:00
parent c0f293c99a
commit 3cf00a809f
23 changed files with 287 additions and 49 deletions
@@ -1,6 +1,6 @@
use crate::model::{Config, ConfigInput, ConfigTarget, InputType, TargetType};
use crate::model::{Config, ConfigInput, ConfigTarget, InputType};
use crate::model::{M3uPlaylistItem, PlaylistGroup};
use shared::model::{PlaylistItemType, XtreamCluster};
use shared::model::{PlaylistItemType, TargetType, XtreamCluster};
use crate::repository::{m3u_repository, xtream_repository};
use crate::utils::{m3u, xtream};
use axum::response::IntoResponse;
+3 -3
View File
@@ -1,9 +1,9 @@
use crate::api::model::app_state::HdHomerunAppState;
use crate::auth::AuthBasic;
use crate::model::ProxyUserCredentials;
use crate::model::{Config, ConfigTarget, TargetType};
use crate::model::{ConfigTarget, ProxyUserCredentials};
use crate::model::{Config};
use crate::model::{M3uPlaylistItem, XtreamPlaylistItem};
use shared::model::{PlaylistItemType, XtreamCluster};
use shared::model::{PlaylistItemType, TargetType, XtreamCluster};
use crate::processing::parser::xtream::get_xtream_url;
use crate::repository::m3u_playlist_iterator::M3uPlaylistIterator;
use crate::repository::xtream_playlist_iterator::XtreamPlaylistIterator;
+2 -2
View File
@@ -2,9 +2,9 @@ use crate::api::api_utils::{force_provider_stream_response, get_stream_alternati
use crate::api::api_utils::{try_option_bad_request};
use crate::api::model::app_state::AppState;
use crate::api::model::streams::provider_stream::{create_custom_video_stream_response, CustomVideoStreamType};
use crate::model::{ProxyUserCredentials, UserConnectionPermission};
use crate::model::{ProxyUserCredentials};
use crate::model::ConfigInput;
use shared::model::{PlaylistItemType, XtreamCluster};
use shared::model::{PlaylistItemType, UserConnectionPermission, XtreamCluster};
use crate::processing::parser::hls::{get_hls_session_token_and_url_from_token, rewrite_hls, RewriteHlsProps};
use shared::utils::HLS_EXT;
use crate::utils::request;
+1 -3
View File
@@ -4,9 +4,7 @@ use crate::api::endpoints::xtream_api::{ApiStreamContext, ApiStreamRequest};
use crate::api::model::app_state::AppState;
use crate::api::model::request::UserApiRequest;
use crate::api::model::streams::provider_stream::{create_custom_video_stream_response, CustomVideoStreamType};
use crate::model::TargetType;
use crate::model::UserConnectionPermission;
use shared::model::{FieldGetAccessor, PlaylistEntry, PlaylistItemType, XtreamCluster};
use shared::model::{FieldGetAccessor, PlaylistEntry, PlaylistItemType, TargetType, UserConnectionPermission, XtreamCluster};
use crate::repository::m3u_repository::{m3u_get_item_for_stream_id, m3u_load_rewrite_playlist};
use crate::repository::storage_const;
use crate::utils::request::{extract_extension_from_url, sanitize_sensitive_info};
+2 -2
View File
@@ -1,8 +1,8 @@
use crate::api::api_utils::{get_user_target_by_username, get_username_from_auth_header};
use crate::api::model::app_state::AppState;
use crate::auth::validator_user;
use crate::model::{Config, ConfigTarget, TargetType};
use shared::model::XtreamCluster;
use crate::model::{Config, ConfigTarget};
use shared::model::{TargetType, XtreamCluster};
use crate::model::PlaylistBouquetDto;
use crate::model::PlaylistXtreamCategory;
use crate::repository::user_repository::{load_user_bouquet_as_json, save_user_bouquet};
+2 -2
View File
@@ -7,9 +7,9 @@ use crate::api::model::request::{PlaylistRequest, PlaylistRequestType};
use crate::auth::create_access_token;
use crate::auth::validator_admin;
use shared::error::TuliproxError;
use crate::model::StatusCheck;
use crate::model::{ConfigTarget, StatusCheck};
use crate::model::XtreamPlaylistItem;
use crate::model::{Config, ConfigDto, ConfigInput, ConfigInputOptions, ConfigSource, ConfigTarget, InputType};
use crate::model::{Config, ConfigDto, ConfigInput, ConfigInputOptions, ConfigSource, InputType};
use crate::model::{ApiProxyConfig, ApiProxyServerInfo, ProxyUserCredentials, TargetUser};
use crate::processing::processor::playlist;
use crate::repository::user_repository::store_api_user;
+2 -2
View File
@@ -12,8 +12,8 @@ use std::sync::Arc;
use crate::api::api_utils::{get_user_target, serve_file};
use crate::api::model::app_state::AppState;
use crate::api::model::request::UserApiRequest;
use crate::model::ProxyUserCredentials;
use crate::model::{Config, ConfigTarget, TargetOutput};
use crate::model::{ConfigTarget, ProxyUserCredentials, TargetOutput};
use crate::model::{Config};
use crate::repository::m3u_repository::m3u_get_epg_file_path;
use crate::repository::storage::get_target_storage_path;
use crate::repository::xtream_repository::{xtream_get_epg_file_path, xtream_get_storage_path};
+4 -5
View File
@@ -9,10 +9,9 @@ use crate::api::model::app_state::AppState;
use crate::api::model::request::UserApiRequest;
use crate::api::model::streams::provider_stream::{create_custom_video_stream_response, CustomVideoStreamType};
use crate::api::model::xtream::XtreamAuthorizationResponse;
use crate::model::TargetType;
use crate::model::{get_backdrop_path_value, XtreamPlaylistItem};
use crate::model::{Config, ConfigInput, ConfigTarget};
use crate::model::{ProxyType, ProxyUserCredentials, UserConnectionPermission};
use crate::model::{get_backdrop_path_value, ConfigTarget, XtreamPlaylistItem};
use crate::model::{Config, ConfigInput};
use crate::model::{ProxyUserCredentials};
use crate::repository::playlist_repository::get_target_id_mapping;
use crate::repository::storage::{get_target_storage_path};
use crate::repository::{storage_const, user_repository, xtream_repository};
@@ -41,7 +40,7 @@ use std::fmt::{Display, Formatter};
use std::path::Path;
use std::str::FromStr;
use std::sync::Arc;
use shared::model::{PlaylistItemType, XtreamCluster, FieldGetAccessor, PlaylistEntry};
use shared::model::{PlaylistItemType, XtreamCluster, FieldGetAccessor, PlaylistEntry, TargetType, UserConnectionPermission, ProxyType};
#[derive(Serialize, Deserialize, Debug, Copy, Clone, Eq, PartialEq)]
pub enum ApiStreamContext {