Jellyseerr count options (#648)

* Jellyseerr count options * Lint tabs * Update Jellyseerr.php * Update Jellyseerr.php --------- Co-authored-by: Martijn <martijn.niji@gmail.com>
linuxserver · Jan 26, 2024 · 7516e22 · 7516e22
1 parent be7c48e
commit 7516e22
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 31 deletions.
diff --git a/Jellyseerr/Jellyseerr.php b/Jellyseerr/Jellyseerr.php
@@ -13,49 +13,59 @@ function __construct() {
 
     public function test()
     {
-        $this->attrs["headers"] = [
-			"accept" => "application/json",
-			"X-Api-Key" => $this->config->apikey,
-		];
+        $attrs = $this->getRequestAttrs();
+        $test = parent::appTest($this->url("auth/me"), $attrs);
 
-		$test = parent::appTest($this->url("auth/me"), $this->attrs);
-
-		echo $test->status;
+        echo $test->status;
     }
 
     public function livestats()
     {
-		$status = "inactive";
-		$data = [];
-		$this->attrs["headers"] = [
-			"accept" => "application/json",
-			"X-Api-Key" => $this->config->apikey,
-		];
-
-        $pendingRequestsCount = json_decode(
-			parent::execute($this->url("request/count"), $this->attrs)->getBody()
-		);
-
-		$pendingIssueCount = json_decode(
-			parent::execute($this->url("issue/count"), $this->attrs)->getBody()
-		);
-
-        if ($pendingRequestsCount || $pendingIssueCount) 
+        $status = "inactive";
+        $data = [];
+        $attrs = $this->getRequestAttrs();
+        $requestsType = $this->getConfigValue("requests", "pending");
+        $requestsCount = json_decode(
+            parent::execute($this->url("request/count"), $attrs)->getBody()
+        );
+        $issuesType = $this->getConfigValue("issues", "open");
+        $issuesCount = json_decode(
+            parent::execute($this->url("issue/count"), $attrs)->getBody()
+        );
+
+        if ($requestsCount || $issuesCount)
         {
-			$data["requests"] = $pendingRequestsCount->pending ?? 0;
-			$data["issues"] = $pendingIssueCount->open ?? 0;
-		}
+            $data["requests"] = $requestsCount->$requestsType ?? 0;
+            $data["issues"] = $issuesCount->$issuesType ?? 0;
+        }
 
         return parent::getLiveStats($status, $data);
     }
 
     public function url($endpoint)
     {
         $api_url =
-			parent::normaliseurl($this->config->url) .
-			"api/v1/" .
-			$endpoint;
+            parent::normaliseurl($this->config->url) .
+            "api/v1/" .
+            $endpoint;
 
-		return $api_url;
+        return $api_url;
+    }
+
+    public function getRequestAttrs()
+    {
+        $attrs["headers"] = [
+            "accept" => "application/json",
+            "X-Api-Key" => $this->config->apikey,
+        ];
+
+        return $attrs;
+    }
+
+    public function getConfigValue($key, $default = null)
+    {
+        return isset($this->config) && isset($this->config->$key)
+            ? $this->config->$key
+            : $default;
     }
 }
diff --git a/Jellyseerr/config.blade.php b/Jellyseerr/config.blade.php
@@ -1,5 +1,5 @@
 <h2>{{ __('app.apps.config') }} ({{ __('app.optional') }}) @include('items.enable')</h2>
-<div class="items">
+<div class="items" style="flex-wrap: wrap;">
     <div class="input">
         <label>{{ strtoupper(__('app.url')) }}</label>
         {!! Form::text('config[override_url]', isset($item) ? $item->getconfig()->override_url : null, ['placeholder' => __('app.apps.override'), 'id' => 'override_url', 'class' => 'form-control']) !!}
@@ -11,4 +11,18 @@
     <div class="input">
         <button style="margin-top: 32px;" class="btn test" id="test_config">Test</button>
     </div>
+    <div class="input">
+        <label>Requests count</label>
+        {!! Form::select('config[requests]', ['pending' => 'Pending', 'approved' => 'Approved', 'declined' => 'Declined', 'processing' => 'Processing', 'available' => 'Available', 'movie' => 'Movie', 'tv' => 'TV', 'total' => 'Total'], isset($item) && isset($item->getconfig()->requests) ? $item->getconfig()->requests : null, [
+            'id' => 'requests',
+            'class' => 'form-control config-item',
+        ]) !!}
+    </div>
+    <div class="input">
+        <label>Issues count</label>
+        {!! Form::select('config[issues]', ['open' => 'Open', 'closed' => 'Closed', 'video' => 'Video', 'audio' => 'Audio', 'subtitles' => 'Subtitles', 'others' => 'Others', 'total' => 'Total'], isset($item) && isset($item->getconfig()->issues) ? $item->getconfig()->issues : null, [
+            'id' => 'issues',
+            'class' => 'form-control config-item',
+        ]) !!}
+    </div>
 </div>