From e543ef72ede07b26f6bbb49b9109db8f3bec6c6b Mon Sep 17 00:00:00 2001
From: JasonLG1979 <jasonlevigray3@gmail.com>
Date: Wed, 27 Oct 2021 10:14:40 -0500
Subject: [PATCH] Clean up cache logic in main

---
 src/main.rs | 40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index c60b2887..ae3258a1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -561,31 +561,25 @@ fn get_setup(args: &[String]) -> Setup {
     };
 
     let cache = {
-        let audio_dir;
-        let cred_dir;
-        let volume_dir;
-        if matches.opt_present(DISABLE_AUDIO_CACHE) {
-            audio_dir = None;
-            volume_dir = matches
-                .opt_str(SYSTEM_CACHE)
-                .or_else(|| matches.opt_str(CACHE))
-                .map(|p| p.into());
-        } else {
-            let cache_dir = matches.opt_str(CACHE);
-            audio_dir = cache_dir
-                .as_ref()
-                .map(|p| AsRef::<Path>::as_ref(p).join("files"));
-            volume_dir = matches
-                .opt_str(SYSTEM_CACHE)
-                .or(cache_dir)
-                .map(|p| p.into());
-        }
+        let volume_dir = matches
+            .opt_str(SYSTEM_CACHE)
+            .or_else(|| matches.opt_str(CACHE))
+            .map(|p| p.into());
 
-        if matches.opt_present(DISABLE_CREDENTIAL_CACHE) {
-            cred_dir = None;
+        let cred_dir = if matches.opt_present(DISABLE_CREDENTIAL_CACHE) {
+            None
         } else {
-            cred_dir = volume_dir.clone();
-        }
+            volume_dir.clone()
+        };
+
+        let audio_dir = if matches.opt_present(DISABLE_AUDIO_CACHE) {
+            None
+        } else {
+            matches
+                .opt_str(CACHE)
+                .as_ref()
+                .map(|p| AsRef::<Path>::as_ref(p).join("files"))
+        };
 
         let limit = if audio_dir.is_some() {
             matches