Merge pull request #86 from kiranshila/develop

Merge in develop

Author: kiranshila

config.edn

@@ -12,6 +12,7 @@
  ; :radarr/rootfolder ""
  ; :sonarrr/language-profile ""
  ; :sonarr/rootfolder ""
+ ; :sonarr/season-folders true
  ; :discord/max-results 10
  ; :overseerr/default-id 1
  ; :log-level :trace

docs/configuration.md

@@ -38,13 +38,14 @@ web interface to Overseerr if you need more features.
 ## Optional Settings
 
 | Environment Variable (Docker)  | Config File Keyword            | Type    | Default Value | Description                                                                                                                                 |
-| ------------------------------ | ------------------------------ | ------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
+|--------------------------------|--------------------------------|---------|---------------|---------------------------------------------------------------------------------------------------------------------------------------------|
 | `DISCORD__MAX_RESULTS`         | `:discord/max-results`         | Integer | `25`          | Sets the maximum size of the search results selection                                                                                       |
 | `DISCORD__REQUESTED_MSG_STYLE` | `:discord/requested-msg-style` | Keyword | `:plain`      | Sets the style of the request alert message. One of `:plain :embed :none`                                                                   |
 | `SONARR__QUALITY_PROFILE`      | `:sonarr/quality-profile`      | String  | N/A           | The name of the quality profile to use by default for Sonarr                                                                                |
 | `RADARR__QUALITY_PROFILE`      | `:radarr/quality-profile`      | String  | N/A           | The name of the quality profile to use by default for Radarr                                                                                |
 | `SONARR__ROOTFOLDER`           | `:sonarr/rootfolder`           | String  | N/A           | The root folder to use by default for Sonarr                                                                                                |
 | `RADARR__ROOTFOLDER`           | `:radarr/rootfolder`           | String  | N/A           | The root folder to use by default for Radarr                                                                                                |
+| `SONARR__SEASON_FOLDERS`       | `:sonarr/season-folders`       | Boolean | `false`       | Sets whether you're using season folders in Sonarr                                                                                                                                            |
 | `SONARR__LANGUAGE_PROFILE`     | `:sonarr/language-profile`     | String  | N/A           | The name of the language profile to use by default for Sonarr                                                                               |
 | `OVERSEERR__DEFAULT_ID`        | `:overseerr/default-id`        | Integer | N/A           | The Overseerr user id to use by default if there is no associated discord account for the requester                                         |
 | `PARTIAL_SEASONS`              | `:partial-seasons`             | Boolean | `true`        | Sets whether users can request partial seasons.                                                                                             |

src/doplarr/backends/sonarr.clj

@@ -26,10 +26,9 @@
                                (hash-map :id ssn :name (str ssn)))))
           {:keys [sonarr/language-profile
                   sonarr/quality-profile
+                  sonarr/season-folders
                   partial-seasons
-                  sonarr/rootfolder
-                  ]} @state/config
-
+                  sonarr/rootfolder]} @state/config
           default-profile-id (utils/id-from-name quality-profiles quality-profile)
           default-language-id (utils/id-from-name language-profiles language-profile)
           default-root-folder (utils/id-from-name rootfolders rootfolder)]
@@ -39,7 +38,8 @@
         (warn "Default language profile in config doesn't exist in backend, check spelling"))
       (when (and rootfolder (nil? default-root-folder))
         (warn "Default root folder in config doesn't exist in backend, check spelling"))
-      {:season (cond
+      {:season-folder (if (nil? season-folders) false season-folders)
+       :season (cond
                  (= 1 (count seasons)) (:id (first seasons))
                  (false? partial-seasons) -1
                  :else (conj seasons {:name "All Seasons" :id -1}))

src/doplarr/config.clj

@@ -14,6 +14,7 @@
     :sonarr/quality-profile
     :sonarr/language-profile
     :sonarr/rootfolder
+    :sonarr/season-folders
     ; Radarr
     :radarr/url
     :radarr/api

src/doplarr/config/specs.clj

@@ -28,6 +28,7 @@
 (spec/def :sonarr/quality-profile string?)
 (spec/def :sonarr/language-profile string?)
 (spec/def :sonarr/rootfolder string?)
+(spec/def :sonarr/season-folders boolean?)
 
 ; Overseerr optionals
 (spec/def :overseerr/default-id pos-int?)
@@ -56,6 +57,7 @@ If you have configured one, make sure to check spelling. A valid configuration c
                                      :radarr/quality-profile
                                      :sonarr/quality-profile
                                      :sonarr/language-profile
+                                     :sonarr/season-folders
                                      :overseerr/default-id
                                      :sonarr/rootfolder
                                      :radarr/rootfolder]

src/doplarr/core.clj

@@ -67,7 +67,8 @@
 
 (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)]]
+                         :output-fn (partial timbre/default-output-fn {:stacktrace-fonts {}})}))
 
 (defn startup! []
   (setup-config!)

src/doplarr/discord.clj

@@ -4,7 +4,6 @@
    [clojure.string :as str]
    [com.rpl.specter :as s]
    [discljord.messaging :as m]
-   [doplarr.state :as state]
    [doplarr.utils :as utils]
    [fmnoise.flow :as flow :refer [else]]
    [taoensso.timbre :refer [fatal]]))
@@ -72,7 +71,7 @@
    :style 1
    :custom_id (str "option-page:" uuid ":" option "-" page)
    :disabled false
-   :label label})
+   :label (apply str (take MAX-CHARACTERS label))})
 
 (defn select-menu-option [index result]
   {:label (apply str (take MAX-CHARACTERS (or (:title result) (:name result))))
@@ -112,7 +111,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 rootfolder tag]}]
+(defn request-embed [{:keys [media-type title overview poster season quality-profile language-profile rootfolder]}]
   {:title title
    :description overview
    :image {:url poster}

src/doplarr/utils.clj

@@ -18,7 +18,9 @@
 
 (defn http-request [method url key & [params]]
   (let [chan (a/promise-chan)
-        put (partial a/put! chan)]
+        put (fn [v]
+              (trace "HTTP Response " v)
+              (a/put! chan v))]
     (trace "Performing HTTP request" method url params)
     (hc/request
      (deep-merge
@@ -27,7 +29,6 @@
        :as :json-string-keys
        :coerce :always
        :async? true
-       :http-client {:redirect-policy :normal}
        :headers {"X-API-Key" key}}
       params)
      put