From 80ced49718e63e931794dc8343c036cd161eb39f Mon Sep 17 00:00:00 2001
From: niostack <niostack@gmail.com>
Date: Tue, 8 Oct 2024 14:15:16 +0800
Subject: [PATCH] add install task

---
 src-tauri/tauri.conf.json                     |   2 +-
 src/App.vue                                   |  15 +-
 src/api/index.js                              |   6 +-
 src/components/Sidebar.vue                    |  16 +-
 src/components/Tasks.vue                      |   5 +
 .../{followJob => jobs}/ManageFollowJobs.vue  |   0
 src/components/jobs/ManageInstallJobs.vue     | 199 ++++++++++++++++++
 .../ManageMessageJobs.vue                     |   0
 .../ManagePublishJobs.vue                     |   0
 .../{scrapeJob => jobs}/ManageScrapeJobs.vue  |   0
 .../{shareJob => jobs}/ManageShareJobs.vue    |   0
 .../{trainJob => jobs}/ManageTrainJobs.vue    |   0
 src/i18n.js                                   |   6 +-
 src/main.js                                   |  12 +-
 src/service/index.js                          |  44 +++-
 15 files changed, 289 insertions(+), 16 deletions(-)
 rename src/components/{followJob => jobs}/ManageFollowJobs.vue (100%)
 create mode 100644 src/components/jobs/ManageInstallJobs.vue
 rename src/components/{messageJob => jobs}/ManageMessageJobs.vue (100%)
 rename src/components/{publishJob => jobs}/ManagePublishJobs.vue (100%)
 rename src/components/{scrapeJob => jobs}/ManageScrapeJobs.vue (100%)
 rename src/components/{shareJob => jobs}/ManageShareJobs.vue (100%)
 rename src/components/{trainJob => jobs}/ManageTrainJobs.vue (100%)

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 3c04c93..bdcbb5f 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "TikMatrix",
-    "version": "1.7.6"
+    "version": "1.7.7"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/App.vue b/src/App.vue
index 8a55ff2..62ab3ab 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,6 +25,7 @@
       <ManageTrainJobs v-if="selectedItem.name === 'trainJobs' && $refs.page_dialog.open" />
       <ManageMessageJobs v-if="selectedItem.name === 'messageJobs' && $refs.page_dialog.open" />
       <ManageShareJobs v-if="selectedItem.name === 'shareJobs' && $refs.page_dialog.open" />
+      <ManageInstallJobs v-if="selectedItem.name === 'installJobs' && $refs.page_dialog.open" />
       <ManageFollowJobs v-if="selectedItem.name === 'followJobs' && $refs.page_dialog.open" />
       <ManageScrapeJobs v-if="selectedItem.name === 'scrapeFansJobs' && $refs.page_dialog.open" />
       <ManageDialog v-if="selectedItem.name === 'dialogWatcher' && $refs.page_dialog.open" />
@@ -79,13 +80,14 @@ import ManageDevices from './components/device/ManageDevices.vue'
 import ManageAccounts from './components/account/ManageAccounts.vue'
 import ManageAnalytics from './components/analytics/ManageAnalytics.vue'
 import ManageMaterials from './components/material/ManageMaterials.vue'
-import ManagePublishJobs from './components/publishJob/ManagePublishJobs.vue'
-import ManageMessageJobs from './components/messageJob/ManageMessageJobs.vue'
-import ManageShareJobs from './components/shareJob/ManageShareJobs.vue'
-import ManageFollowJobs from './components/followJob/ManageFollowJobs.vue'
-import ManageScrapeJobs from './components/scrapeJob/ManageScrapeJobs.vue'
+import ManagePublishJobs from './components/jobs/ManagePublishJobs.vue'
+import ManageMessageJobs from './components/jobs/ManageMessageJobs.vue'
+import ManageShareJobs from './components/jobs/ManageShareJobs.vue'
+import ManageFollowJobs from './components/jobs/ManageFollowJobs.vue'
+import ManageScrapeJobs from './components/jobs/ManageScrapeJobs.vue'
+import ManageInstallJobs from './components/jobs/ManageInstallJobs.vue'
 import ManageDialog from './components/dialog/ManageDialog.vue'
-import ManageTrainJobs from './components/trainJob/ManageTrainJobs.vue'
+import ManageTrainJobs from './components/jobs/ManageTrainJobs.vue'
 import ManageGroups from './components/group/ManageGroups.vue'
 import ManageMusics from './components/music/ManageMusics.vue'
 import RegisterSettings from './components/settings/RegisterSettings.vue'
@@ -131,6 +133,7 @@ export default {
     ManagePublishJobs,
     ManageMessageJobs,
     ManageShareJobs,
+    ManageInstallJobs,
     ManageFollowJobs,
     ManageScrapeJobs,
     ManageDialog,
diff --git a/src/api/index.js b/src/api/index.js
index 992b7c1..4872ea7 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -82,7 +82,11 @@ const api = {
   capture_video: '/api/video/capture_video',
   fission_video: '/api/video/fission_video',
   reset_all_index: '/api/device/reset_all_index',
-  edit_title: '/api/material/update_title'
+  edit_title: '/api/material/update_title',
+  install_now: '/api/install_now',
+  install_job: '/api/install_job',
+  retry_all_failed_install_job: '/api/install_job/retry_all',
+  delete_all_install_jobs: '/api/install_job/delete_all'
 
 
 }
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index b865421..9713ff2 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -432,6 +432,10 @@ export default {
         })
     },
     async selectApkFile() {
+      if (this.selection.length == 0) {
+        this.$emitter.emit('showToast', this.$t('noDevicesSelected'))
+        return
+      }
       const filePath = await open({
         multiple: false, // 是否允许多选文件
         directory: false, // 是否选择目录
@@ -442,16 +446,13 @@ export default {
 
       console.log('Selected file path:', filePath);
       this.$service
-        .install({
-          file: filePath,
+        .install_now({
+          apk_path: filePath,
           serials: this.selection
         })
         .then(res => {
           console.log(res)
         })
-        .catch(err => {
-          console.log(err)
-        })
     },
     adb_command(args) {
       this.$service
@@ -834,6 +835,11 @@ export default {
     document.addEventListener('paste', () => {
       this.pasteToPhone()
     });
+    this.$emitter.on('reload_sidebar', () => {
+      this.get_menus()
+      this.get_settings()
+      this.get_groups()
+    });
     this.get_menus()
     this.get_settings()
     this.get_groups()
diff --git a/src/components/Tasks.vue b/src/components/Tasks.vue
index 25f2571..1bc2841 100644
--- a/src/components/Tasks.vue
+++ b/src/components/Tasks.vue
@@ -29,6 +29,11 @@
         @click="$emitter.emit('menuSelected', { name: 'scrapeFansJobs' })">
         <font-awesome-icon icon="fas fa-spider" class="h-3 w-3" />{{ $t('scrapeFansJobs') }}
     </button>
+    <button
+        class="btn btn-sm bg-green-500 hover:bg-green-300 border-0 text-white text-xs block font-normal ml-1 mb-1 min-w-max"
+        @click="$emitter.emit('menuSelected', { name: 'installJobs' })">
+        <font-awesome-icon icon="fa fa-download" class="h-3 w-3" />{{ $t('installJobs') }}
+    </button>
     <button
         class="btn btn-sm bg-green-500 hover:bg-green-300 border-0 text-white text-xs block font-normal ml-1 mb-1 min-w-max"
         @click="$emitter.emit('stop_task')">
diff --git a/src/components/followJob/ManageFollowJobs.vue b/src/components/jobs/ManageFollowJobs.vue
similarity index 100%
rename from src/components/followJob/ManageFollowJobs.vue
rename to src/components/jobs/ManageFollowJobs.vue
diff --git a/src/components/jobs/ManageInstallJobs.vue b/src/components/jobs/ManageInstallJobs.vue
new file mode 100644
index 0000000..0c28e22
--- /dev/null
+++ b/src/components/jobs/ManageInstallJobs.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="w-full">
+    <Pagination :items="filter_jobs" :searchKeys="['device', 'id', 'device_index']" @refresh="get_install_jobs">
+      <template v-slot:buttons>
+        <MyButton @click="retry_all_failed" label="retryAllFaied" />
+        <MyButton @click="clearAll" label="clearAll" />
+        <select v-model="searchStatus" class="select select-sm select-bordered max-w-xs ml-2">
+          <option value="">{{ $t('allStatus') }}</option>
+          <option value="0">{{ $t('waiting') }}</option>
+          <option value="1">{{ $t('execing') }}</option>
+          <option value="2">{{ $t('success') }}</option>
+          <option value="3">{{ $t('failed') }}</option>
+        </select>
+      </template>
+      <template v-slot:default="slotProps">
+        <div class="overflow-x-auto">
+          <table class="table table-sm">
+            <thead>
+              <tr>
+                <th>{{ $t('id') }}</th>
+                <th>{{ $t('startTime') }}</th>
+                <th>{{ $t('status') }}</th>
+                <!-- <th>{{ $t('remark') }}</th> -->
+                <th>{{ $t('apkPath') }}</th>
+                <th>{{ $t('device') }}</th>
+                <th>{{ $t('actions') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(share_job, index) in slotProps.items" :key="index">
+                <td>{{ share_job.id }}</td>
+                <td>{{ share_job.start_time }}</td>
+                <td>
+                  <div class="badge badge-neutral" v-if="share_job.status == '0'">{{ $t('waiting') }}</div>
+                  <div class="badge badge-primary" v-else-if="share_job.status == '1'">{{ $t('execing') }}</div>
+                  <div class="badge badge-success" v-else-if="share_job.status == '2'">{{ $t('success') }}</div>
+                  <div class="badge badge-error" v-else-if="share_job.status == '3'">{{ $t('failed') }}</div>
+                </td>
+                <!-- <td>{{ share_job.remark }}</td> -->
+                <td>
+                  {{ share_job.apk_path }}
+                </td>
+
+                <td>
+                  <a class="cursor-pointer underline text-blue-500" @click="show_device(share_job.serial)"
+                    v-if="share_job.device_index">{{
+                      share_job.device_index }}</a>
+                  <span v-else class="text text-red-500">{{ $t('offline') }}</span>
+                </td>
+                <td>
+                  <div class="space-x-4">
+                    <button class="btn-sm bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded"
+                      @click="retry(share_job)">{{ $t('retry') }}</button>
+                    <button class="btn-sm bg-red-500 hover:bg-red-700 text-white font-bold py-2 px-4 rounded"
+                      @click="deleteJob(share_job)">
+                      {{ $t('delete') }}
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </template>
+    </Pagination>
+
+
+  </div>
+</template>
+<script>
+import Modal from '../Modal.vue'
+import MyButton from '../Button.vue'
+import Pagination from '../Pagination.vue'
+import { inject } from 'vue'
+import { ask } from '@tauri-apps/api/dialog';
+export default {
+  name: 'app',
+  components: {
+    MyButton,
+    Modal,
+    Pagination
+  },
+  setup() {
+    const devices = inject('devices')
+    return { devices: devices.list }
+  },
+  data() {
+    return {
+      jobs: [],
+      groups: [],
+      searchStatus: '',
+    }
+  },
+  computed: {
+    filter_jobs() {
+      return this.jobs.filter(job => {
+        if (this.searchStatus) {
+          return job.status == this.searchStatus
+        }
+        return true
+      })
+    }
+  },
+  methods: {
+    async clearAll() {
+      const yes = await ask(this.$t('confirmClearAll'), this.$t('confirm'));
+      if (yes) {
+        this.$service
+          .delete_all_share_jobs()
+          .then(() => {
+            this.get_share_jobs()
+          })
+          .catch(err => {
+            console.log(err)
+          })
+      }
+
+
+    },
+
+    show_device(serial) {
+      let mydevice = this.devices.find(d => d.serial === serial)
+      this.$emitter.emit('openDevice', mydevice)
+    },
+    get_install_jobs() {
+      this.currentJob = null
+      this.$service
+        .get_install_jobs()
+        .then(res => {
+          this.jobs = res.data
+          this.jobs.forEach(job => {
+            job.device_index = this.devices.find(device => device.serial === job.serial)?.index
+          })
+          this.get_groups()
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+
+    retry(install_job) {
+      this.$service
+        .update_install_job({
+          id: install_job.id,
+          status: 0,
+        })
+        .then(() => {
+          this.get_install_jobs()
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    deleteJob(install_job) {
+      this.$service
+        .delete_install_job({
+          id: install_job.id
+        })
+        .then(res => {
+          console.log(res)
+          this.get_install_jobs()
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    get_groups() {
+      this.$service
+        .get_groups()
+        .then(res => {
+          this.groups = res.data
+          this.jobs.forEach(install_job => {
+            if (install_job.group_id === 0) {
+              install_job.group_name = this.$t('defaultGroup')
+              return
+            }
+            install_job.group_name = this.groups.find(group => group.id === install_job.group_id).name
+          })
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    retry_all_failed() {
+      this.$service
+        .retry_all_failed_install_job()
+        .then(() => {
+          this.get_install_jobs()
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    }
+  },
+  mounted() {
+    this.get_install_jobs()
+  }
+}
+</script>
diff --git a/src/components/messageJob/ManageMessageJobs.vue b/src/components/jobs/ManageMessageJobs.vue
similarity index 100%
rename from src/components/messageJob/ManageMessageJobs.vue
rename to src/components/jobs/ManageMessageJobs.vue
diff --git a/src/components/publishJob/ManagePublishJobs.vue b/src/components/jobs/ManagePublishJobs.vue
similarity index 100%
rename from src/components/publishJob/ManagePublishJobs.vue
rename to src/components/jobs/ManagePublishJobs.vue
diff --git a/src/components/scrapeJob/ManageScrapeJobs.vue b/src/components/jobs/ManageScrapeJobs.vue
similarity index 100%
rename from src/components/scrapeJob/ManageScrapeJobs.vue
rename to src/components/jobs/ManageScrapeJobs.vue
diff --git a/src/components/shareJob/ManageShareJobs.vue b/src/components/jobs/ManageShareJobs.vue
similarity index 100%
rename from src/components/shareJob/ManageShareJobs.vue
rename to src/components/jobs/ManageShareJobs.vue
diff --git a/src/components/trainJob/ManageTrainJobs.vue b/src/components/jobs/ManageTrainJobs.vue
similarity index 100%
rename from src/components/trainJob/ManageTrainJobs.vue
rename to src/components/jobs/ManageTrainJobs.vue
diff --git a/src/i18n.js b/src/i18n.js
index 219c314..c103fa5 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -431,9 +431,13 @@ export const i18n = createI18n({
       left_days: 'Left Days',
       unlicensed: 'Unlicensed',
       updateService: 'Update Service',
-      updateServiceSuccess: 'Update Service Success'
+      updateServiceSuccess: 'Update Service Success',
+      installJobs: 'Install Jobs',
+      apkPath: 'APK Path'
     },
     'zh-CN': {
+      apkPath: 'APK 路径',
+      installJobs: '安装任务',
       updateServiceSuccess: '更新服务成功',
       updateService: '更新服务',
       unlicensed: '未授权',
diff --git a/src/main.js b/src/main.js
index c767d21..f376b2c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -48,11 +48,21 @@ let config = {
 }
 
 async function updatePorts() {
+  const oldPort = localStorage.getItem('port');
+  const oldWsPort = localStorage.getItem('wsPort');
+
   const port = await readTextFile('port.txt', { dir: BaseDirectory.AppData });
   const wsPort = await readTextFile('wsport.txt', { dir: BaseDirectory.AppData });
+
+  if (port !== oldPort || wsPort !== oldWsPort) {
+    console.log('Ports have changed:', { oldPort, oldWsPort, newPort: port, newWsPort: wsPort });
+    emitter.emit('updateService')
+    emitter.emit('reload_sidebar')
+  }
+
   localStorage.setItem('port', port);
   localStorage.setItem('wsPort', wsPort);
-  console.log(port, wsPort)
+  console.log(port, wsPort);
   config.wsUrl = 'ws://127.0.0.1:' + wsPort;
   config.apiUrl = 'http://127.0.0.1:' + port;
 }
diff --git a/src/service/index.js b/src/service/index.js
index 3675179..997b9ff 100644
--- a/src/service/index.js
+++ b/src/service/index.js
@@ -798,4 +798,46 @@ export function edit_title(data) {
     data,
     url: api.edit_title
   })
-}
\ No newline at end of file
+}
+export function install_now(data) {
+  return request({
+    method: 'post',
+    data,
+    url: api.install_now
+  })
+}
+export function get_install_jobs() {
+  return request({
+    method: 'get',
+    url: api.install_job
+  })
+}
+export function delete_install_job({ id }) {
+  return request({
+    method: 'delete',
+    params: { id },
+    url: api.install_job
+  })
+}
+export function update_install_job(data) {
+  return request({
+    method: 'put',
+    data,
+    url: api.install_job
+  })
+}
+export function retry_all_failed_install_job() {
+  return request({
+    method: 'get',
+    url: api.retry_all_failed_install_job
+  })
+}
+export function delete_all_install_jobs() {
+  return request({
+    method: 'delete',
+    url: api.delete_all_install_jobs
+  })
+}
+
+
+