Merge pull request #61 from kiranshila/develop

Adding rootfolder selection

Author: kiranshila

.dropboxignore

@@ -0,0 +1,14 @@
+# ----
+# Automatically Generated .dropboxignore file at Sun Jan 30 22:58:11 PST 2022
+# ----
+.DS_Store
+pom.xml
+pom.xml.asc
+*.jar
+*.class
+.nrepl-port
+.cpcache/
+.lsp/
+.clj-kondo/
+target/
+# ----

src/doplarr/backends/radarr.clj

@@ -17,30 +17,39 @@
 (defn additional-options [_ _]
   (a/go
     (let [quality-profiles (a/<! (impl/quality-profiles))
+          rootfolders (a/<! (impl/rootfolders))
           {:keys [radarr/quality-profile]} @state/config
-          default-profile-id (utils/profile-name-id quality-profiles quality-profile)]
+          default-profile-id (utils/id-from-name quality-profiles quality-profile)]
       (when (and quality-profile (nil? default-profile-id))
         (warn "Default quality profile in config doesn't exist in backend, check spelling"))
       {:quality-profile-id
        (cond
          default-profile-id             default-profile-id
          (= 1 (count quality-profiles)) (:id (first quality-profiles))
-         :else quality-profiles)})))
+         :else quality-profiles)
+       :rootfolder-id
+       (cond
+         (= 1 (count rootfolders)) (:id (first rootfolders))
+         :else rootfolders)})))
 
-(defn request-embed [{:keys [title quality-profile-id tmdb-id]} _]
+(defn request-embed [{:keys [title quality-profile-id tmdb-id rootfolder-id]} _]
   (a/go
-    (let [quality-profiles (a/<! (impl/quality-profiles))
+    (let [rootfolders (a/<! (impl/rootfolders))
+          quality-profiles (a/<! (impl/quality-profiles))
           details (a/<! (impl/get-from-tmdb tmdb-id))]
       {:title title
        :overview (:overview details)
        :poster (:remote-poster details)
        :media-type :movie
        :request-formats [""]
-       :quality-profile (utils/profile-id-name quality-profiles quality-profile-id)})))
+       :rootfolder (utils/name-from-id rootfolders rootfolder-id)
+       :quality-profile (utils/name-from-id quality-profiles quality-profile-id)})))
 
 (defn request [payload _]
   (a/go
-    (let [status (impl/status (a/<! (impl/get-from-tmdb (:tmdb-id payload))))]
+    (let [status (impl/status (a/<! (impl/get-from-tmdb (:tmdb-id payload))))
+          rfs (a/<! (impl/rootfolders))
+          payload (assoc payload :root-folder-path (utils/name-from-id rfs (:rootfolder-id payload)))]
       (if status
         status
         (->> (a/<! (impl/POST "/movie" {:form-params (utils/to-camel (impl/request-payload payload))

src/doplarr/backends/radarr/impl.clj

@@ -1,6 +1,5 @@
 (ns doplarr.backends.radarr.impl
   (:require
-   [clojure.core.async :as a]
    [doplarr.state :as state]
    [doplarr.utils :as utils]))
 
@@ -13,14 +12,24 @@
 (defn POST [endpoint & [params]]
   (utils/http-request :post (str @base-url endpoint) @api-key params))
 
-(def rootfolder (delay (a/<!! (utils/request-and-process-body GET #(get (first %) "path") "/rootfolder"))))
-
 (defn quality-profiles []
   (utils/request-and-process-body
    GET
    #(map utils/process-profile %)
    "/qualityProfile"))
 
+(defn rootfolders []
+  (utils/request-and-process-body
+   GET
+   utils/process-rootfolders
+   "/rootfolder"))
+
+(defn tags []
+  (utils/request-and-process-body
+   GET
+   utils/process-tags
+   "/tag"))
+
 (defn get-from-tmdb [tmdb-id]
   (utils/request-and-process-body
    GET
@@ -40,7 +49,6 @@
 
 (defn request-payload [payload]
   (-> payload
-      (select-keys [:title :tmdb-id :quality-profile-id])
+      (select-keys [:title :tmdb-id :quality-profile-id :root-folder-path])
       (assoc :monitored true
-             :root-folder-path @rootfolder
              :add-options {:search-for-movie true})))

src/doplarr/backends/sonarr.clj

@@ -18,6 +18,7 @@
   (a/go
     (let [quality-profiles (a/<! (impl/quality-profiles))
           language-profiles (a/<! (impl/language-profiles))
+          rootfolders (a/<! (impl/rootfolders))
           details (a/<! (impl/get-from-tvdb (:tvdb-id result)))
           seasons (->> (:seasons details)
                        (filter #(pos? (:season-number %)))
@@ -26,8 +27,8 @@
           {:keys [sonarr/language-profile
                   sonarr/quality-profile
                   partial-seasons]} @state/config
-          default-profile-id (utils/profile-name-id quality-profiles quality-profile)
-          default-language-id (utils/profile-name-id language-profiles language-profile)]
+          default-profile-id (utils/id-from-name quality-profiles quality-profile)
+          default-language-id (utils/id-from-name language-profiles language-profile)]
       (when (and quality-profile (nil? default-profile-id))
         (warn "Default quality profile in config doesn't exist in backend, check spelling"))
       (when (and language-profile (nil? default-language-id))
@@ -43,11 +44,15 @@
        :language-profile-id (cond
                               language-profile default-language-id
                               (= 1 (count language-profiles)) (:id (first language-profiles))
-                              :else language-profiles)})))
+                              :else language-profiles)
+       :rootfolder-id (cond
+                        (= 1 (count rootfolders)) (:id (first rootfolders))
+                        :else rootfolders)})))
 
-(defn request-embed [{:keys [title quality-profile-id language-profile-id tvdb-id season]} _]
+(defn request-embed [{:keys [title quality-profile-id language-profile-id tvdb-id season rootfolder-id]} _]
   (a/go
-    (let [quality-profiles (a/<! (impl/quality-profiles))
+    (let [rootfolders (a/<! (impl/rootfolders))
+          quality-profiles (a/<! (impl/quality-profiles))
           language-profiles (a/<! (impl/language-profiles))
           details (a/<! (impl/get-from-tvdb tvdb-id))]
       {:title title
@@ -57,13 +62,16 @@
        :season season
        :request-formats [""]
        :quality-profile (:name (first (filter #(= quality-profile-id (:id %)) quality-profiles)))
-       :language-profile (:name (first (filter #(= language-profile-id (:id %)) language-profiles)))})))
+       :language-profile (:name (first (filter #(= language-profile-id (:id %)) language-profiles)))
+       :rootfolder (utils/name-from-id rootfolders rootfolder-id)})))
 
 (defn request [payload _]
   (a/go (let [details  (a/<! (if-let [id (:id payload)]
                                (impl/get-from-id id)
                                (impl/get-from-tvdb (:tvdb-id payload))))
               status (impl/status details (:season payload))
+              rfs (a/<! (impl/rootfolders))
+              payload (assoc payload :root-folder-path (utils/name-from-id rfs (:rootfolder-id payload)))
               request-payload (impl/request-payload payload details)]
           (if status
             status

src/doplarr/backends/sonarr/impl.clj

@@ -17,8 +17,6 @@
 (defn PUT [endpoint & [params]]
   (utils/http-request :put (str @base-url endpoint) @api-key params))
 
-(def rootfolder (delay (a/<!! (utils/request-and-process-body GET #(get (first %) "path") "/rootfolder"))))
-
 (defn quality-profiles []
   (utils/request-and-process-body
    GET
@@ -31,6 +29,12 @@
    #(map utils/process-profile %)
    "/languageProfile"))
 
+(defn rootfolders []
+  (utils/request-and-process-body
+   GET
+   utils/process-rootfolders
+   "/rootfolder"))
+
 (defn get-from-tvdb [tvdb-id]
   (utils/request-and-process-body
    GET
@@ -102,7 +106,6 @@
       (-> payload
           (assoc :monitored true
                  :seasons seasons
-                 :root-folder-path @rootfolder
                  :add-options {:ignore-episodes-with-files true
                                :search-for-missing-episodes true})
           (dissoc :season

src/doplarr/core.clj

@@ -68,9 +68,12 @@
            (m/stop-connection! messaging-ch)
            (a/close!           event-ch)))))
 
-(defn startup! []
+(defn setup-config! []
   (reset! state/config (config/valid-config (load-env)))
-  (timbre/merge-config! {:min-level [[#{"*"} (:log-level @state/config :info)]]})
+  (timbre/merge-config! {:min-level [[#{"*"} (:log-level @state/config :info)]]}))
+
+(defn startup! []
+  (setup-config!)
   (start-bot!))
 
 ; Program Entry Point

src/doplarr/discord.clj

@@ -113,7 +113,7 @@
 (defn dropdown-result [interaction]
   (Integer/parseInt (s/select-one [:payload :values 0] interaction)))
 
-(defn request-embed [{:keys [media-type title overview poster season quality-profile language-profile]}]
+(defn request-embed [{:keys [media-type title overview poster season quality-profile language-profile rootfolder tag]}]
   {:title title
    :description overview
    :image {:url poster}
@@ -129,7 +129,10 @@
                 :value language-profile})
              (when season
                {:name "Season"
-                :value (if (= season -1) "All" season)})])})
+                :value (if (= season -1) "All" season)})
+             (when rootfolder
+               {:name "Root Folder"
+                :value rootfolder})])})
 
 (defn request [embed-data uuid]
   {:content (str "Request this " (name (:media-type embed-data)) " ?")

src/doplarr/utils.clj

@@ -8,7 +8,8 @@
    [doplarr.state :as state]
    [fmnoise.flow :as flow :refer [else then]]
    [hato.client :as hc]
-   [taoensso.timbre :refer [fatal trace]]))
+   [taoensso.timbre :refer [fatal trace]]
+   [clojure.set :as set]))
 
 (defn deep-merge [a & maps]
   (if (map? a)
@@ -47,21 +48,30 @@
   (->> (select-keys profile ["id" "name"])
        from-camel))
 
-(defn profile-name-id [profiles name]
+(defn id-from-name [profiles name]
   (->> profiles
        (filter #(= name (:name %)))
        first
        :id))
 
-(defn profile-id-name [profiles id]
+(defn name-from-id [profiles id]
   (->> profiles
        (filter #(= id (:id %)))
        first
        :name))
 
+(defmacro log-on-error [expr msg]
+  `(try
+     ~expr
+     (catch Exception e#
+       (fatal e# ~msg)
+       (throw e#))))
+
 (defn request-and-process-body [request-fn process-fn & request-args]
   (a/go
-    (->> (a/<! (apply request-fn request-args))
+    (->> (log-on-error
+          (a/<! (apply request-fn request-args))
+          "Exception from HTTP request")
          (then #(process-fn (:body %)))
          (else #(fatal %)))))
 
@@ -79,9 +89,12 @@
    (symbol (str "doplarr.backends." (name (config/available-backend-for-media media @state/config)))
            f)))
 
-(defmacro log-on-error [expr msg]
-  `(try
-     ~expr
-     (catch Exception e#
-       (fatal e# ~msg)
-       (throw e#))))
+(defn process-rootfolders [resp]
+  (->> (from-camel resp)
+       (map #(select-keys % #{:path :id}))
+       (map #(set/rename-keys % {:path :name}))))
+
+(defn process-tags [resp]
+  (->> (from-camel resp)
+       (map #(set/rename-keys % {:label :name}))
+       (#(conj % {:name "No Tag" :id -1}))))