fix bugs
This commit is contained in:
parent
cd861c82fd
commit
36c9d0f0e5
@ -1,4 +1,4 @@
|
||||
FROM rust:slim-bullseye AS builder
|
||||
FROM harbor.front.kjuulh.io/docker-proxy/library/rust:slim-bullseye AS builder
|
||||
|
||||
COPY . /app/builder/
|
||||
|
||||
@ -6,11 +6,11 @@ WORKDIR /app/builder/
|
||||
|
||||
RUN cargo build --release
|
||||
|
||||
FROM debian:bullseye-slim
|
||||
FROM harbor.front.kjuulh.io/docker-proxy/library/debian:bullseye-slim
|
||||
|
||||
COPY --from=builder /app/builder/target/release/ /app/
|
||||
WORKDIR /app/
|
||||
|
||||
ENV RUST_LOG info
|
||||
|
||||
CMD ["./twatch"]
|
||||
CMD ["./twatch"]
|
||||
|
@ -1,19 +1,22 @@
|
||||
use log::info;
|
||||
use std::env;
|
||||
use std::env::VarError;
|
||||
use std::time::Duration;
|
||||
use log::info;
|
||||
use twatch_core::App;
|
||||
use tokio::time::sleep;
|
||||
use twatch_core::App;
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<(), VarError> {
|
||||
env_logger::init();
|
||||
dotenv::dotenv();
|
||||
dotenv::dotenv().expect("to load .env");
|
||||
|
||||
let url = env::var("T_URL")?;
|
||||
let user = env::var("T_USER")?;
|
||||
let password = env::var("T_PASSWORD")?;
|
||||
let cycle_seconds = env::var("T_CYCLE").unwrap_or("30".to_string()).parse::<u64>().unwrap_or(30);
|
||||
let cycle_seconds = env::var("T_CYCLE")
|
||||
.unwrap_or("30".to_string())
|
||||
.parse::<u64>()
|
||||
.unwrap_or(30);
|
||||
|
||||
loop {
|
||||
info!("running clean up cycle");
|
||||
|
@ -1,6 +1,6 @@
|
||||
use log::info;
|
||||
use transmission_rpc::types::{BasicAuth, Id, Result, Torrent, Torrents};
|
||||
use transmission_rpc::TransClient;
|
||||
use transmission_rpc::types::{Result, BasicAuth, Torrent, Torrents, Id};
|
||||
use log::{info};
|
||||
|
||||
pub struct App {
|
||||
client: TransClient,
|
||||
@ -8,29 +8,36 @@ pub struct App {
|
||||
|
||||
impl App {
|
||||
pub fn new(url: &String, username: &String, password: &String) -> Self {
|
||||
let auth = BasicAuth { user: username.clone(), password: password.clone() };
|
||||
let auth = BasicAuth {
|
||||
user: username.clone(),
|
||||
password: password.clone(),
|
||||
};
|
||||
let client = TransClient::with_auth(url.as_str(), auth);
|
||||
Self {
|
||||
client
|
||||
}
|
||||
Self { client }
|
||||
}
|
||||
|
||||
pub async fn run(&self) -> Result<()> {
|
||||
pub async fn run(mut self) -> Result<()> {
|
||||
let response = self.client.torrent_get(None, None).await;
|
||||
match response {
|
||||
Ok(res) => self.scan_files(res.arguments).await.unwrap(),
|
||||
Err(e) => println!("{}", e.to_string())
|
||||
Err(e) => println!("{}", e.to_string()),
|
||||
}
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
async fn scan_files(&self, torrents: Torrents<Torrent>) -> Result<()> {
|
||||
async fn scan_files(self, torrents: Torrents<Torrent>) -> Result<()> {
|
||||
let mut torrents_to_remove = Vec::new();
|
||||
|
||||
for torrent in torrents.torrents {
|
||||
match (torrent.id, torrent.is_stalled) {
|
||||
(Some(id), Some(true)) => {
|
||||
info!("processing: (id: {}, name: {})", id, torrent.name.unwrap_or("name could not be found from torrent".to_string()));
|
||||
info!(
|
||||
"processing: (id: {}, name: {})",
|
||||
id,
|
||||
torrent
|
||||
.name
|
||||
.unwrap_or("name could not be found from torrent".to_string())
|
||||
);
|
||||
torrents_to_remove.push(id);
|
||||
}
|
||||
_ => {
|
||||
@ -49,7 +56,11 @@ impl App {
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
async fn clean_up_torrents(&self, torrent_ids: Vec<i64>) {
|
||||
self.client.torrent_remove(torrent_ids.iter().map(|ti| { Id::Id(*ti) }).collect(), true).await;
|
||||
async fn clean_up_torrents(mut self, torrent_ids: Vec<i64>) {
|
||||
self.client
|
||||
.torrent_remove(torrent_ids.iter().map(|ti| Id::Id(*ti)).collect(), true)
|
||||
.await
|
||||
.expect("to remove torrent");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user