euzu/tuliprox
1
0
Fork 0
mirror of https://github.com/euzu/tuliprox.git synced 2026-10-20 23:02:34 +02:00
Code Issues Packages Projects Releases 5 Wiki Activity

Merge remote-tracking branch 'dark-breakpoint/async-file-copy' into feature/async_playlist_persistence

Browse Source
This commit is contained in:
euzu
2025-11-14 16:32:24 +01:00
parent 800ae6107e c65e9181e4
commit 66bba7b96b
11 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/utils/file/csv_input_reader.rs
+4 -4
View File
@@ -1,5 +1,4 @@
use shared::error::{str_to_io_error, to_io_error};
use crate::utils::request::{get_local_file_content};
use crate::utils::EnvResolvingReader;
use crate::utils::{file_reader, resolve_relative_path};
use log::error;
@@ -9,6 +8,7 @@ use std::path::PathBuf;
use url::Url;
use shared::model::{ConfigInputAliasDto, InputType};
use shared::utils::{get_credentials_from_url, trim_last_slash};
use crate::utils::request::get_local_file_content;
const CSV_SEPARATOR: char = ';';
const HEADER_PREFIX: char = '#';
@@ -150,9 +150,9 @@ pub fn csv_read_inputs_from_reader(batch_input_type: InputType, reader: impl Buf
}
pub fn csv_read_inputs(input_type: InputType, file_uri: &str) -> Result<(PathBuf, Vec<ConfigInputAliasDto>), Error> {
pub async fn csv_read_inputs(input_type: InputType, file_uri: &str) -> Result<(PathBuf, Vec<ConfigInputAliasDto>), Error> {
let file_path = get_csv_file_path(file_uri)?;
match get_local_file_content(&file_path) {
match get_local_file_content(&file_path).await {
Ok(content) => {
Ok((file_path, csv_read_inputs_from_reader(input_type, EnvResolvingReader::new(file_reader(Cursor::new(content))))?))
}
@@ -251,4 +251,4 @@ input_2;de566567;de2345f43g5;http://provider_2.tv:8080;1
let resolved = resolve_env_var("${env:HOME}");
assert_eq!(resolved, std::env::var("HOME").unwrap());
}
}
}