From 8fd8212eeeead827d3db6041d2581656fa127630 Mon Sep 17 00:00:00 2001 From: OMGeeky Date: Tue, 4 Apr 2023 17:15:57 +0200 Subject: [PATCH] non-lowercase user_login problems solved --- Dockerfile | 2 ++ src/data/mod.rs | 2 +- src/lib.rs | 17 ++++++++--------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0202b15..6946c90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,8 @@ COPY ./build/ /bin/ RUN chmod +x /bin/downloader # add libgcc to the container (it needs it for some reason) RUN apk add libgcc +# add ffmpeg to the container (needed for video splitting) +RUN apk add ffmpeg # set the start cmd CMD ["/bin/downloader"] diff --git a/src/data/mod.rs b/src/data/mod.rs index f21c9b5..3f77006 100644 --- a/src/data/mod.rs +++ b/src/data/mod.rs @@ -189,7 +189,7 @@ impl<'a> VideoData<'a> { title: Some(video.title.clone()), description: Some(video.description.clone()), bool_test: Some(true), - user_login: Some(video.user_login.to_string()), + user_login: Some(video.user_login.to_lowercase()), created_at: Some(video.created_at.clone()), url: Some(video.url.clone()), viewable: Some(video.viewable.clone()), diff --git a/src/lib.rs b/src/lib.rs index 71329ff..ee73078 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -144,15 +144,14 @@ async fn get_not_downloaded_videos_from_db( i + 1, amount ); - let streamer = data::Streamers::load_from_pk(client, video.user_login.clone().unwrap()) - .await? - .expect( - format!( - "Streamer with login not found: {}", - video.user_login.clone().unwrap() - ) - .as_str(), - ); + let user_login = video.user_login.clone().unwrap().to_lowercase(); + let streamer = data::Streamers::load_from_pk(client, user_login.clone()).await?; + if streamer.is_none() { + // .expect(format!("Streamer with login not found: {}", user_login).as_str()); + warn!("Streamer with login not found: {}", user_login); + continue; + } + let streamer = streamer.unwrap(); res.push(VideoData { video,