Merge branch 'easy-yt-subscription'

Tubefeeder · Oct 15, 2021 · b6991df · b6991df
2 parents d63bc90 + 68a4727
commit b6991df
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 65 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,11 +27,11 @@ env_logger = "0.9.0"
 
 image = "0.23.14"
 
-tf_core = { package = "tf_core", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
-tf_join = { package = "tf_join", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
-tf_filter = { package = "tf_filter", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
-tf_observer = { package = "tf_observer", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
-tf_playlist = { package = "tf_playlist", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
-tf_yt = { package = "tf_platform_youtube", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
-tf_pt = { package = "tf_platform_peertube", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
-tf_lbry = { package = "tf_platform_lbry", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "d18735f502fc8ff46ac8505df268fdd541d96902" }
+tf_core = { package = "tf_core", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
+tf_join = { package = "tf_join", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
+tf_filter = { package = "tf_filter", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
+tf_observer = { package = "tf_observer", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
+tf_playlist = { package = "tf_playlist", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
+tf_yt = { package = "tf_platform_youtube", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
+tf_pt = { package = "tf_platform_peertube", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
+tf_lbry = { package = "tf_platform_lbry", git = "https://github.com/Tubefeeder/tubefeeder-extractor.git", rev = "005777524e7018e194e859312d7517a187f18ef1" }
diff --git a/src/gui/subscriptions/subscription_adder.rs b/src/gui/subscriptions/subscription_adder.rs
@@ -24,9 +24,9 @@ use gtk::prelude::*;
 use relm::{Relm, Widget};
 use relm_derive::{widget, Msg};
 use tf_join::{AnySubscription, AnySubscriptionList, Platform};
+use tf_lbry::LbrySubscription;
 use tf_pt::PTSubscription;
 use tf_yt::YTSubscription;
-use tf_lbry::LbrySubscription;
 
 #[derive(Msg)]
 pub enum SubscriptionAdderMsg {
@@ -81,24 +81,26 @@ impl Widget for SubscriptionAdder {
         let platform = self.model.platform.clone();
 
         std::thread::spawn(move || {
-            let sub_res: Result<AnySubscription, tf_core::Error> =
+            let sub_res: Option<AnySubscription> =
                 tokio::runtime::Runtime::new().unwrap().block_on(async {
                     match platform {
-                        Platform::Youtube => YTSubscription::from_id_or_name(&channel_id_or_name)
+                        Platform::Youtube => YTSubscription::try_from_search(&channel_id_or_name)
                             .await
                             .map(|s| s.into()),
                         Platform::Peertube => {
-                            Ok(PTSubscription::new(&base_url, &channel_id_or_name).into())
-                        },
-                        Platform::Lbry => Ok(LbrySubscription::new(&channel_id_or_name).into()),
+                            Some(PTSubscription::new(&base_url, &channel_id_or_name).into())
+                        }
+                        Platform::Lbry => Some(LbrySubscription::new(&channel_id_or_name).into()),
                         // -- Add case here
-
                     }
                 });
 
             // TODO: Error handling
-            if let Ok(sub) = sub_res {
+            if let Some(sub) = sub_res {
+                log::debug!("New Channel {:#?}", sub);
                 sub_list.add(sub);
+            } else {
+                log::error!("Error");
             }
         });
     }