From 29fd0c3646ff5e7b55122bbe9ae9cc262d281c26 Mon Sep 17 00:00:00 2001
From: SinTan1729 <sayantan.santra689@gmail.com>
Date: Fri, 9 Dec 2022 14:48:52 -0600
Subject: [PATCH] Visual changes

---
 src/functions.rs |  6 +++---
 src/main.rs      |  7 ++++---
 src/structs.rs   | 51 +++++++++++++++++++++++++++++-------------------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/functions.rs b/src/functions.rs
index 332f46f..e40616c 100644
--- a/src/functions.rs
+++ b/src/functions.rs
@@ -79,7 +79,7 @@ pub fn process_file(
 
     // Choose from the possible entries
     let choice = Select::new(
-        format!("Possible choices for {}", file_base).as_str(),
+        format!("Possible choices for {}:", file_base).as_str(),
         movie_list,
     )
     .prompt()
@@ -112,9 +112,9 @@ pub fn process_file(
 
     // Process the renaming
     if *filename == new_name {
-        println!("[file] {} already has correct name.", filename);
+        println!("[file] '{}' already has correct name.", file_base);
     } else {
-        println!("[file] {} -> {}", file_base, new_name_with_ext);
+        println!("[file] '{}' -> '{}'", file_base, new_name_with_ext);
         // Only do the rename of --dry-run isn't passed
         if dry_run == false {
             fs::rename(filename, new_name.as_str()).expect("Unable to rename file!");
diff --git a/src/main.rs b/src/main.rs
index 7ac648c..7717880 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -76,10 +76,11 @@ fn main() {
                         continue;
                     }
                     if movie_count == 1 {
-                        if entry == movie_name {
-                            println!("[directory] {} already has correct name.", entry);
+                        let entry_clean = entry.trim_end_matches("/");
+                        if entry_clean == movie_name {
+                            println!("[directory] '{}' already has correct name.", entry_clean);
                         } else {
-                            println!("[directory] {} -> {}", entry, movie_name);
+                            println!("[directory] '{}' -> '{}'", entry_clean, movie_name);
                             if settings["dry_run"] == false {
                                 fs::rename(entry, movie_name).expect("Unable to rename directory!");
                             }
diff --git a/src/structs.rs b/src/structs.rs
index e2d07fb..5f89646 100644
--- a/src/structs.rs
+++ b/src/structs.rs
@@ -8,7 +8,6 @@ pub struct MovieEntry {
     pub director: String,
     pub year: String,
     pub language: String,
-    pub overview: String,
 }
 
 impl MovieEntry {
@@ -19,8 +18,7 @@ impl MovieEntry {
             id: movie.id,
             director: String::from("N/A"),
             year: String::from(movie.release_date.split('-').next().unwrap_or("N/A")),
-            language: movie.original_language,
-            overview: movie.overview.unwrap_or(String::from("N/A")),
+            language: get_long_lang(movie.original_language.as_str()),
         }
     }
 
@@ -44,7 +42,14 @@ impl MovieEntry {
 // Implement display trait for movie entries
 impl fmt::Display for MovieEntry {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{} ({})", self.title, self.year)
+        let mut buffer = String::new();
+        buffer.push_str(&format!("{} ", self.title));
+        buffer.push_str(&format!("({}), ", self.year));
+        buffer.push_str(&format!("Language: {}, ", self.language));
+        buffer.push_str(&format!("Directed by: {}, ", self.director));
+        buffer.push_str(&format!("TMDb ID: {}", self.id));
+        // buffer.push_str(&format!("Synopsis: {}", self.overview));
+        write!(f, "{}", buffer)
     }
 }
 
@@ -54,25 +59,15 @@ pub struct Language {
 }
 
 impl Language {
-    // Create Language entries from &str pairs
-    fn from(short: &str, long: &str) -> Language {
-        Language {
-            short: short.to_string(),
-            long: long.to_string(),
-        }
-    }
-
     // Generate a vector of Language entries of all supported languages
     pub fn generate_list() -> Vec<Language> {
         let mut list = Vec::new();
-        list.push(Language::from("en", "English"));
-        list.push(Language::from("hi", "Hindi"));
-        list.push(Language::from("bn", "Bengali"));
-        list.push(Language::from("fr", "French"));
-        list.push(Language::from("ja", "Japanese"));
-        list.push(Language::from("de", "German"));
-        list.push(Language::from("sp", "Spanish"));
-        list.push(Language::from("none", "None"));
+        for lang in ["en", "hi", "bn", "fr", "ja", "de", "sp", "none"] {
+            list.push(Language {
+                short: lang.to_string(),
+                long: get_long_lang(lang),
+            });
+        }
         list
     }
 }
@@ -83,3 +78,19 @@ impl fmt::Display for Language {
         write!(f, "{}", self.long)
     }
 }
+
+// Get long name of a language
+fn get_long_lang(short: &str) -> String {
+    let long = match short {
+        "en" => "English",
+        "hi" => "Hindi",
+        "bn" => "Bengali",
+        "fr" => "French",
+        "ja" => "Japanese",
+        "de" => "German",
+        "sp" => "Spanish",
+        "none" => "None",
+        other => other,
+    };
+    long.to_string()
+}