From b32971a55f4fa6ee4c1b8b683bed317396bad739 Mon Sep 17 00:00:00 2001
From: benson <freefallbenson@gmail.com>
Date: Mon, 1 May 2023 13:53:38 +0800
Subject: [PATCH] added section for displaying aria2 and yt-dlp version info

---
 lib/Aria2/Aria2.php       |  4 +++
 lib/Settings/Personal.php |  2 ++
 lib/Tools/Helper.php      | 13 +++++++
 lib/Ytdl/Ytdl.php         | 10 ++++++
 src/personalSettings.vue  | 72 +++++++++++++++++++++++++--------------
 5 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/lib/Aria2/Aria2.php b/lib/Aria2/Aria2.php
index 9b7849c..4624ac5 100644
--- a/lib/Aria2/Aria2.php
+++ b/lib/Aria2/Aria2.php
@@ -412,4 +412,8 @@ class Aria2
     {
         return $this->bin;
     }
+    public function version(){
+        $resp = $this->getVersion();
+        return $resp['result']['version'] ?? null;
+    }
 }
diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
index 51686cd..1ff13ed 100644
--- a/lib/Settings/Personal.php
+++ b/lib/Settings/Personal.php
@@ -49,6 +49,8 @@ class Personal implements ISettings
 				"path" => '/apps/ncdownloader/personal/save',
 				"disallow_aria2_settings" => Helper::getAdminSettings("disallow_aria2_settings"),
 				"is_admin" => \OC_User::isAdminUser($this->uid),
+				"aria2_version" => Helper::getAria2Version(),
+				"ytdl_version" => Helper::getYtdlVersion(),
 			]
 		];
 
diff --git a/lib/Tools/Helper.php b/lib/Tools/Helper.php
index 907ec53..06fda5c 100644
--- a/lib/Tools/Helper.php
+++ b/lib/Tools/Helper.php
@@ -10,6 +10,8 @@ use OCP\IUser;
 use OC\Files\Filesystem;
 use OC_Util;
 use Psr\Log\LoggerInterface;
+use OCA\NCDownloader\Aria2\Aria2;
+use OCA\NCDownloader\Ytdl\Ytdl;
 
 class Helper
 {
@@ -537,4 +539,15 @@ class Helper
     {
         return Helper::getSettings("ncd_admin_settings", [], Settings::TYPE["SYSTEM"]);
     }
+    public static function getAria2Version(): ?string
+    {
+        //get aria2 instance 
+        $aria2 = self::query(Aria2::class);
+        return $aria2->version();
+    }
+    public static function getYtdlVersion(): ?string
+    {
+        $ytdl = self::query(Ytdl::class);
+        return $ytdl->version();
+    }
 }
diff --git a/lib/Ytdl/Ytdl.php b/lib/Ytdl/Ytdl.php
index 9385055..f142a87 100644
--- a/lib/Ytdl/Ytdl.php
+++ b/lib/Ytdl/Ytdl.php
@@ -265,4 +265,14 @@ class Ytdl
     {
         return "https://github.com/shiningw/ncdownloader-bin/raw/master/yt-dlp";
     }
+
+    public function version()
+    {
+        $process = new Process([$this->bin, '--version']);
+        $process->run();
+        if ($process->isSuccessful()) {
+            return $process->getOutput();
+        }
+        return false;
+    }
 }
diff --git a/src/personalSettings.vue b/src/personalSettings.vue
index 4eb298a..ec607a1 100644
--- a/src/personalSettings.vue
+++ b/src/personalSettings.vue
@@ -1,36 +1,30 @@
 <template>
   <div class="section ncdownloader-general-settings">
     <h3>General Settings</h3>
-    <settingsRow
-      v-for="(option, key) in optionRows"
-      v-bind:key="key"
-      :value="option.value"
-      :id="option.id"
-      :label="option.label"
-      :placeholder="option.placeholder"
-      :path="option.path"
-      :useBtn="true"
-    />
+    <settingsRow v-for="(option, key) in optionRows" v-bind:key="key" :value="option.value" :id="option.id"
+      :label="option.label" :placeholder="option.placeholder" :path="option.path" :useBtn="true" />
   </div>
-  <customOptions
-    v-if="!disallowAria2Settings || isAdmin"
-    name="custom-aria2-settings"
-    title="Personal Aria2 Settings"
-    @mounted="renderAria2"
-    path="/apps/ncdownloader/personal/aria2/save"
-    :validOptions="aria2Options"
-  >
+  <customOptions v-if="!disallowAria2Settings || isAdmin" name="custom-aria2-settings" title="Personal Aria2 Settings"
+    @mounted="renderAria2" path="/apps/ncdownloader/personal/aria2/save" :validOptions="aria2Options">
     <template #save>Save Aria2 Settings</template>
   </customOptions>
-  <customOptions
-    name="custom-ytdl-settings"
-    title="Personal Youtbue-dl Settings"
-    @mounted="renderYtdl"
-    path="/apps/ncdownloader/personal/ytdl/save"
-    :validOptions="ytdlOptions"
-  >
+  <customOptions name="custom-ytdl-settings" title="Personal Youtbue-dl Settings" @mounted="renderYtdl"
+    path="/apps/ncdownloader/personal/ytdl/save" :validOptions="ytdlOptions">
     <template #save>Save Youtube-dl Settings</template>
   </customOptions>
+  <div class="system-info-wrapper section">
+    <h2 class="section-title">System Info</h2>
+    <div class="system-info">
+      <div class="system-info-item">
+        <div class="system-info-item-label">Aria2 Version: </div>
+        <div class="system-info-item-value">{{ aria2Version }}</div>
+      </div>
+      <div class="system-info-item">
+        <div class="system-info-item-label">yt-dlp Version: </div>
+        <div class="system-info-item-value">{{ ytdVersion }}</div>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 import customOptions from "./components/customOptions";
@@ -48,6 +42,9 @@ export default {
       ytdlOptions: ytdlOptions,
       disallowAria2Settings: false,
       isAdmin: false,
+      aria2Version: "",
+      ytdVersion: "",
+
     };
   },
   components: {
@@ -104,6 +101,8 @@ export default {
       let path = "/apps/ncdownloader/personal/save";
       this.disallowAria2Settings = helper.str2Boolean(data["disallow_aria2_settings"]);
       this.isAdmin = data["is_admin"];
+      this.aria2Version = data["aria2_version"];
+      this.ytdVersion = data["ytdl_version"];
       this.options = [
         {
           label: "Downloads Folder ",
@@ -126,3 +125,26 @@ export default {
   },
 };
 </script>
+<style scoped>
+
+.system-info {
+  display: flex;
+  flex-direction: column;
+  margin-top: 10px;
+}
+
+.system-info-item {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+}
+
+.system-info-item-label {
+  font-weight: bold;
+  margin-right: 10px;
+}
+
+.system-info-item-value {
+  font-weight: normal;
+}
+</style>
\ No newline at end of file