euzu/tuliprox
1
0
Fork 0
mirror of https://github.com/euzu/tuliprox.git synced 2026-10-29 18:22:38 +01:00
Code Issues Packages Projects Releases 5 Wiki Activity

resolve series wip

Browse Source
This commit is contained in:
euzu
2024-12-25 14:12:30 +01:00
parent 454e85e6d2
commit dfe6269866
4 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/processing/playlist_processor.rs
+12 -10
View File
@@ -11,7 +11,6 @@ use std::thread;
use actix_rt::System;
use log::{debug, error, info, log_enabled, trace, Level};
use std::time::Instant;
use unidecode::unidecode;
use crate::filter::{get_field_value, set_field_value, MockValueProcessor, ValueProvider};
@@ -531,19 +530,22 @@ fn process_watch(target: &ConfigTarget, cfg: &Config, new_playlist: &Vec<Playlis
}
pub async fn exec_processing(cfg: Arc<Config>, targets: Arc<ProcessTargets>) {
let start_time = Instant::now();
let (stats, errors) = process_sources(cfg.clone(), targets.clone()).await;
// log errors
for err in &errors {
error!("{}", err.message);
errors.iter().for_each(|err| error!("{}", err.message));
if let Ok(stats_msg) = serde_json::to_string(&serde_json::Value::Object(serde_json::map::Map::from_iter([("stats".to_string(), serde_json::to_value(stats).unwrap())]))) {
// print stats
info!("{}", stats_msg);
// send stats
send_message(&MsgKind::Stats, cfg.messaging.as_ref(), stats_msg.as_str());
}
let stats_msg = format!("{{\"stats\": {}}}", stats.iter().map(std::string::ToString::to_string).collect::<Vec<String>>().join("\n"));
// print stats
info!("{}", stats_msg);
// send stats
send_message(&MsgKind::Stats, cfg.messaging.as_ref(), stats_msg.as_str());
// send errors
if let Some(message) = get_errors_notify_message!(errors, 255) {
let error_msg = format!("{{\"errors\": \"{}\"}}", message.as_str());
send_message(&MsgKind::Error, cfg.messaging.as_ref(), error_msg.as_str());
if let Ok(error_msg) = serde_json::to_string(&serde_json::Value::Object(serde_json::map::Map::from_iter([("errors".to_string(), serde_json::Value::String(message))]))) {
send_message(&MsgKind::Error, cfg.messaging.as_ref(), error_msg.as_str());
}
}
let elapsed = start_time.elapsed().as_secs();
info!("Update process finished! Took {elapsed} secs.");
}
src/processing/xtream_processor.rs
+16 -26
View File
@@ -7,7 +7,7 @@ use crate::{info_err, notify_err};
use serde::{Deserialize, Serialize};
use serde_json::Value;
use std::collections::HashMap;
use std::fs::{File};
use std::fs::File;
use std::io::{BufWriter, Error, ErrorKind, Write};
use std::path::PathBuf;
@@ -130,32 +130,22 @@ pub(in crate::processing) fn create_resolve_info_wal_files(cfg: &Config, input:
}
}
pub(in crate::processing) fn has_different_ts(ts: u64, pli: &PlaylistItem, field: &str) -> bool {
pli.header
.borrow()
.additional_properties
.as_ref()
.map_or(false, |v| match v {
Value::Object(map) => {
if let Some(updated) = map.get(field) {
if let Some(update_ts) = get_u64_from_serde_value(updated) {
return update_ts != ts;
}
}
true
}
_ => true,
})
}
pub(in crate::processing) fn should_update_info(pli: &PlaylistItem, processed_provider_ids: &HashMap<u32, u64>, field: &str) -> (bool, u32, u64) {
if let Some(provider_id) = pli.header.borrow_mut().get_provider_id() {
let timestamp = processed_provider_ids.get(&provider_id);
(timestamp.is_none() || has_different_ts(*timestamp.unwrap(), pli, field), provider_id, *timestamp.unwrap_or(&0))
} else {
(false, 0, 0)
}
let Some(provider_id) = pli.header.borrow_mut().get_provider_id() else { return (false, 0, 0) };
let last_modified = pli.header.borrow().additional_properties.as_ref().map_or(None, |v| match v {
Value::Object(map) => {
if let Some(updated) = map.get(field) {
get_u64_from_serde_value(updated)
} else {
None
}
}
_ => None,
});
let old_timestamp = processed_provider_ids.get(&provider_id);
(old_timestamp.is_none()
|| last_modified.is_none()
|| *old_timestamp.unwrap() != last_modified.unwrap(), provider_id, last_modified.unwrap_or(0))
}
pub(in crate::processing) async fn read_processed_info_ids<V, F>(cfg: &Config, errors: &mut Vec<M3uFilterError>, fpl: &FetchedPlaylist<'_>,
test/http-client.env.json
+2 -3
View File
@@ -1,7 +1,6 @@
{
"dev": {
"local": "localhost:8901",
"silver": "10.41.41.41:8901",
"xt_credentials": "username=xt&password=xt"
"local": "http://localhost:8901",
"silver": "http://10.41.41.41:8901",
}
}
test/rest-api.http
+20 -20
View File
@@ -1,6 +1,6 @@
### playlist request
POST http://{{local}}/api/v1/playlist
POST {{local}}/api/v1/playlist
Content-Type: application/json
{
@@ -8,63 +8,63 @@ Content-Type: application/json
}
### config request
GET http://{{local}}/api/v1/config
GET {{local}}/api/v1/config
Content-Type: application/json
### auth
POST http://{{local}}/auth/token
POST {{local}}/auth/token
Content-Type: application/json
{"username": "test", "password": "test"}
### m3u playlist
GET http://{{local}}/m3u?{{xt_credentials}}
GET {{local}}/m3u?username=xt&password=xt
### m3u playlist - form auth
POST http://{{local}}/m3u
POST {{local}}/m3u
Content-Type: application/x-www-form-urlencoded
{{xt_credentials}}
username=xt&password=xt
### m3u playlist reverse
GET http://{{local}}/m3u?username=xtream&password=xtream.secret
GET {{local}}/m3u?username=xtream&password=xtream.secret
### xtream login
GET http://{{local}}/player_api.php?{{xt_credentials}}
GET {{local}}/player_api.php?username=xt&password=xt
### xtream live_categories
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_live_categories
GET {{local}}/player_api.php?username=xt&password=xt&action=get_live_categories
### xtream live_streams
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_live_streams&category_id=102
GET {{local}}/player_api.php?username=xt&password=xt&action=get_live_streams&category_id=102
### xtream vod_categories
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_vod_categories
GET {{local}}/player_api.php?username=xt&password=xt&action=get_vod_categories
### xtream vod info
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_vod_streams&category_id=44
GET {{local}}/player_api.php?username=xt&password=xt&action=get_vod_streams&category_id=44
### xtream vod info
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_vod_info&vod_id=8051
GET {{local}}/player_api.php?username=xt&password=xt&action=get_vod_info&vod_id=8051
### xtream series_categories
GET http://{{silver}}/player_api.php?{{xt_credentials}}&action=get_series_categories
GET {{local}}/player_api.php?username=xt&password=xt&action=get_series_categories
### xtream series
GET http://{{silver}}/player_api.php?{{xt_credentials}}&action=get_series
GET {{local}}/player_api.php?username=xt&password=xt&action=get_series
### xtream series for category
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_series&category_id=56
GET {{local}}/player_api.php?username=xt&password=xt&action=get_series&category_id=56
### xtream series for category
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_series&category_id=56
GET {{local}}/player_api.php?username=xt&password=xt&action=get_series&category_id=56
### xtream series info
GET http://{{local}}/player_api.php?{{xt_credentials}}&action=get_series_info&series_id=13923
GET {{local}}/player_api.php?username=xt&password=xt&action=get_series_info&series_id=13923
### xtream series stream
GET http://{{local}}/series/xt/xt/18137
GET {{local}}/series/xt/xt/18137
### get stream
http://{{local}}/m3u-stream/live/xt/xt/667
{{local}}/m3u-stream/live/xt/xt/667