Merge branch 'noasync' into 'master'

getting async in a reasonnable way

See merge request veretcle/scootaloo!12

src/lib.rs

@@ -334,7 +334,7 @@ pub async fn run(config: Config) {
     let token = get_oauth2_token(&config);
 
     // get Mastodon instance
-    let mastodon = Arc::new(Mutex::new(get_mastodon_token(&config.mastodon)));
+    let mastodon = get_mastodon_token(&config.mastodon);
 
     // get user timeline feed (Vec<tweet>)
     let mut feed = get_user_timeline(&config, token, last_tweet_id)
@@ -377,23 +377,23 @@ pub async fn run(config: Config) {
        // reupload the attachments if any
         if let Some(m) = &tweet.extended_entities {
             for media in &m.media {
-                let local_tweet_media_path = match get_tweet_media(&media, &config.scootaloo.cache_path) {
+                let local_tweet_media_path = match get_tweet_media(&media, &config.scootaloo.cache_path).await {
                     Ok(m) => m,
                     Err(e) => {
-                        println!("Cannot get tweet media for {}: {}", &media.url, e);
+                        error!("Cannot get tweet media for {}: {}", &media.url, e);
                         continue;
                     },
                 };
 
                 let mastodon_media_ids = match mastodon.media(Cow::from(String::from(&local_tweet_media_path))) {
                     Ok(m) => {
-                        remove_file(&local_tweet_media_path).unwrap_or_else(|e|
-                            println!("Attachment for {} has been upload, but I’m unable to remove the existing file: {}", &local_tweet_media_path, e)
+                        remove_file(&local_tweet_media_path).await.unwrap_or_else(|e|
+                            warn!("Attachment for {} has been uploaded, but I’m unable to remove the existing file: {}", &local_tweet_media_path, e)
                         );
                         m.id
                     },
                     Err(e) => {
-                        println!("Cannot attach media {} to Mastodon Instance: {}", &local_tweet_media_path, e);
+                        error!("Attachment {} cannot be uploaded to Mastodon Instance: {}", &local_tweet_media_path, e);
                         continue;
                     }
                 };
@@ -415,7 +415,7 @@ pub async fn run(config: Config) {
 
         // publish status
         // again unwrap is safe here as we are in the main thread
-        mastodon.lock().unwrap().new_status(status).unwrap();
+        mastodon.new_status(status).unwrap();
         // this will panic if it cannot publish the status, which is a good thing, it allows the
         // last_tweet gathered not to be written