Merge branch 'refs/heads/qb' into electron

# Conflicts:
#	openRenamerBackend/index.ts
#	openRenamerBackend/package.json
#	openRenamerBackend/pnpm-lock.yaml
#	openRenamerFront/pnpm-lock.yaml
#	openRenamerFront/src/App.vue

openRenamerBackend/api/QbServiceApi.ts

@@ -10,5 +10,19 @@ router["POST /qb/saveQbInfo"] = async function (ctx: Context) {
     ctx.body = await service.saveAddress(ctx.request.body);
 };
 
+/**
+ * 获取qb配置
+ */
+router["GET /qb/config"] = async function (ctx: Context) {
+    ctx.body = await service.getConfig();
+};
+
+/**
+ * 获取qb配置
+ */
+router["GET /qb/bt/list"] = async function (ctx: Context) {
+    ctx.body = await service.getBtList();
+};
+
 
 export default router;

openRenamerBackend/entity/dto/BtListItemDto.ts

@@ -0,0 +1,28 @@
+export default interface BtListItemDto {
+    hash: string;
+    /**
+     * 添加时间
+     */
+    added_on: number;
+    /**
+     * left bytes num
+     */
+    amount_left: number;
+    /**
+     *   Percentage of file pieces currently available
+     */
+    availability: number;
+    category: string;
+    /**
+     * Amount of transfer data completed (bytes)
+     */
+    completed: number;
+    /**
+     * Time (Unix Epoch) when the torrent completed
+     */
+    completion_on: number;
+    /**
+     * Absolute path of torrent content (root path for multifile torrents, absolute file path for singlefile torrents)
+     */
+    content_path: string;
+}

openRenamerBackend/entity/dto/QbAddressDto.ts

@@ -1,5 +0,0 @@
-export default interface QbAddressDto {
-	address: string;
-	username: string;
-	password: string;
-}

openRenamerBackend/entity/dto/QbConfigDto.ts

@@ -0,0 +1,22 @@
+export default interface QbConfigDto {
+    address: string;
+    username: string;
+    password: string;
+    valid: boolean;
+    /**
+     * qb version,null if config is error
+     */
+    version: string;
+    /**
+     * Qbittorrent's download
+     */
+    qbDownloadPath: string;
+    /**
+     * Qbittorrent's download path corresponds to current system path
+     */
+    renameQbDownloadPath: string;
+    /**
+     * config path to select convenient
+     */
+    configPaths: Array<string>;
+}

openRenamerBackend/index.ts

@@ -9,9 +9,8 @@ import handleError from "./middleware/handleError";
 import init from "./middleware/init";
 import SqliteUtil from './util/SqliteHelper';
 import log from './util/LogUtil';
-import {updateQbInfo} from './util/QbApiUtil';
+import QbService from './service/QbService';
-import TimeUtil from "./util/TimeUtil";
+import qbService from "./service/QbService";
-
 
 console.log(config);
 
@@ -33,7 +32,7 @@ app.use(handleError);
 app.use(RouterMW(router, path.join(config.rootPath, "dist/api")));
 (async () => {
     await SqliteUtil.createPool();
-    await updateQbInfo(null, null);
+    await qbService.init();
     app.listen(config.port);
     log.info(`server listened `, config.port);
 })();

openRenamerBackend/service/QbService.ts

@@ -1,16 +1,51 @@
-import QbAddressDto from "../entity/dto/QbAddressDto";
+import QbConfigDto from "../entity/dto/QbConfigDto";
-import { tryLogin, updateQbInfo } from '../util/QbApiUtil';
+import {tryLogin, get, post, updateQbInfo, getQbInfo} from '../util/QbApiUtil';
 import GlobalConfigService from "./GlobalConfigService";
 import GlobalConfig from "../entity/po/GlobalConfig";
+import BtListItemDto from "../entity/dto/BtListItemDto";
 
 class QbService {
 
-	static async saveAddress(body: QbAddressDto) {
+    /**
-		await tryLogin(body.address, body.username, body.password, false);
+     * 保存地址
-		await GlobalConfigService.insertOrReplace(new GlobalConfig("qbAddress", body.address, "qbAdress"));
+     * @param body
-		await GlobalConfigService.insertOrReplace(new GlobalConfig("qbUsername", body.username, ""));
+     */
-		await GlobalConfigService.insertOrReplace(new GlobalConfig("qbPassword", body.password, ""));
+    static async saveAddress(body: QbConfigDto): Promise<QbConfigDto> {
-		await updateQbInfo(body, true);
+        if (body.address.endsWith("/")) {
+            body.address = body.address.substring(0, body.address.length - 1);
+        }
+        await GlobalConfigService.insertOrReplace(new GlobalConfig("qbConfig", JSON.stringify(body), "qb config"));
+        updateQbInfo(body);
+        body.valid = await tryLogin();
+        body.version = body ? (await get("/app/version", null)) : null;
+        return body;
+    }
+a
+    /**
+     * 获取当前配置
+     */
+    static async getConfig(): Promise<QbConfigDto> {
+        return getQbInfo();
+    }
+
+    /**
+     * get torrents list from qb
+     */
+    static async getBtList(): Promise<Array<BtListItemDto>> {
+        let res = await get("/api/v2/torrents/info?category=&sort=added_on", null);
+        return res;
+    }
+
+    /**
+     * 初始化
+     */
+    static async init() {
+        let config = await GlobalConfigService.getVal("qbConfig");
+        let qbInfo: QbConfigDto = config == null ? {} : JSON.parse(config);
+        updateQbInfo(qbInfo);
+        qbInfo.valid = await tryLogin();
+        qbInfo.version = qbInfo.valid ? (await get("/app/version", null)) : null;
+        return qbInfo;
     }
 }
 

openRenamerBackend/util/QbApiUtil.ts

@@ -1,48 +1,30 @@
 import {Method} from "axios";
 import axios from "axios";
-import QbAddressDto from "../entity/dto/QbAddressDto";
+import querystring from "querystring";
+import QbConfigDto from "../entity/dto/QbConfigDto";
 import GlobalService from '../service/GlobalConfigService';
-import { setUncaughtExceptionCaptureCallback } from "process";
 
-//qb状态，true正常，false:无法访问
+let qbInfo: QbConfigDto = null;
-let qbStatus = true;
+let cookie: any = null;
-let qbInfo: QbAddressDto = null;
-let cookie: string = null;
 
-export function getQbStatus() {
+export function updateQbInfo(info: QbConfigDto) {
-	return qbStatus;
-}
-
-export async function updateQbInfo(info: QbAddressDto, status: boolean) {
-	if (!info) {
-		let obj = await GlobalService.getMultVal(["qbAddress", "qbUsername", "qbPassword"]);
-		if (!obj.qbAddress) {
-			qbStatus = false;
-			return;
-		}
-		qbInfo.address = obj.qbAddress;
-		qbInfo.username = obj.qbUsername;
-		qbInfo.password = obj.qbPassword;
-	} else {
     qbInfo = info;
 }
-	if (status) {
+
-		qbStatus = status;
+export function getQbInfo() {
+    return qbInfo;
 }
 
-	axios.defaults.baseURL = qbInfo.address;
+export async function get(url: string, data: object) {
+    return await request("get", url, data, null, false);
 }
 
-export function get() {
+export async function post(url: string, data: object, isForm = false) {
-
+    return await request("post", url, null, data, isForm);
-}
-
-export function post() {
-
 }
 
 async function request(method: Method, url: string, query: any, body: any, isForm = false) {
-	if (!qbStatus) {
+    if (!qbInfo.valid) {
         throw new Error("qbittorrent无法连接，请检查配置");
     }
     let isTryLogin = false;
@@ -55,7 +37,7 @@ async function request(method: Method, url: string, query: any, body: any, isFor
         }
         let res = await axios.request({
             baseURL: qbInfo.address,
-			url: url,
+            url: "/api/v2" + url,
             method,
             params: query,
             data: body,
@@ -63,11 +45,12 @@ async function request(method: Method, url: string, query: any, body: any, isFor
         });
         if (res.status == 200) {
             return res.data;
-		} if (res.status == 403) {
+        }
+        if (res.status == 403) {
             if (isTryLogin) {
                 throw new Error("qb用户名密码设置有误");
             } else {
-				await tryLogin(qbInfo.address, qbInfo.username, qbInfo.password, true);
+                await tryLogin();
                 isTryLogin = true;
             }
         } else {
@@ -77,26 +60,24 @@ async function request(method: Method, url: string, query: any, body: any, isFor
 
 }
 
-export async function tryLogin(address: string, username: string, password: string, updateStatus: boolean): Promise<void> {
+export async function tryLogin(): Promise<boolean> {
-	let body = { username, password };
+    if (qbInfo == null || qbInfo.address == null || qbInfo.address == "") {
+        return false;
+    }
+    let body = {username: qbInfo.username, password: qbInfo.password};
     try {
-		let res = await axios.post(address + "/api/v2/auth/login", body, {
+        let res = await axios.post(qbInfo.address + `/api/v2/auth/login`, querystring.stringify(body), {
-			headers: { "Content-Type": "multipart/form-data;boundary=--------------------------125002698093981740970152" }
+            headers: {"Content-Type": "application/x-www-form-urlencoded"}
         });
-		let success = res.data.toLocaleLowerCase().contains('ok');
+        let success = res.data.toLocaleLowerCase().indexOf('ok') > -1;
-		if (updateStatus) {
+        if (success) {
-			qbStatus = success;
+            cookie = res.headers['set-cookie'];
-		}
-		if (!success) {
-			throw new Error("登录失败");
-		} else {
-			cookie = res.headers['Cookie'];
         }
+        qbInfo.valid = success;
+        return success;
     } catch (error) {
         console.error("登录报错：", error);
-		if (updateStatus) {
+        return false;
-			qbStatus = false;
+
-		}
-		throw new Error("登录出错");
     }
 }

openRenamerFront/src/App.vue

@@ -49,17 +49,6 @@ export default {
     };
   },
   async beforeCreate() {
-    console.log("beforeCreate");
-    let queryMap = {};
-    location.search.substring(1).split("&").forEach(item => {
-      let arr = item.split("=");
-      queryMap[arr[0]] = arr[1];
-    })
-    if (queryMap.port) {
-      window.baseUrl = "http://localhost:" + queryMap.port;
-    } else {
-      window.baseUrl = "";
-    }
     window.token = localStorage.getItem("token");
     window.isWindows = await httpUtil.get("/file/isWindows");
   },

openRenamerFront/src/views/download/config/index.vue

@@ -1,13 +1,24 @@
 <template>
   <div>配置qb</div>
-  <div class="item">
+  <el-form :model="data.qbConfig" label-width="8em">
-    <div class="left">qb信息</div>
+    <el-form-item label="qb版本">
-    <div class="right">{{ qbInfo }}<el-button @click="editInfo = true">编辑</el-button></div>
+      {{ data.qbConfig.version ? data.qbConfig.version : "配置错误，无法访问" }}
-  </div>
+    </el-form-item>
-  <el-form v-if="editInfo" :model="qbBody" label-width="4em">
+    <el-form-item label="访问地址">
-    <el-form-item label="qb地址"><el-input type="text" v-model="qbBody.address" placeholder="例如:http://192.168.1.4:8080" /></el-form-item>
+      <el-input type="text" v-model="data.qbConfig.address" placeholder="例如:http://localhost:8080(仅支持v4.1及以上)"/>
-    <el-form-item label="用户名"><el-input type="text" v-model="qbBody.username" placeholder="qb访问用户名" /></el-form-item>
+    </el-form-item>
-    <el-form-item label="密码"><el-input type="password" v-model="qbBody.password" placeholder="qb访问密码" /></el-form-item>
+    <el-form-item label="用户名">
+      <el-input type="text" v-model="data.qbConfig.username" placeholder="qb访问用户名"/>
+    </el-form-item>
+    <el-form-item label="密码">
+      <el-input type="password" v-model="data.qbConfig.password" placeholder="qb访问密码"/>
+    </el-form-item>
+    <el-form-item label="qb下载路径">
+      <el-input type="text" v-model="data.qbConfig.qbDownloadPath" placeholder="qb下载路径(qb中选择的下载路径)"/>
+    </el-form-item>
+    <el-form-item label="对应本系统路径">
+      <el-input type="text" v-model="data.qbConfig.renameQbDownloadPath" placeholder="qb下载路径对应到本软件中的路径"/>
+    </el-form-item>
     <div style="text-align: center">
       <el-button type="" @click="editInfo = false">取消</el-button>
       <el-button type="primary" @click="submitQb">提交</el-button>
@@ -19,31 +30,18 @@
 import {ref, reactive, onMounted, computed} from "vue";
 import http from "@/utils/HttpUtil";
 //表单
-const qbBody = reactive({
+const data = reactive({
-  address: "",
+  qbConfig: {},
-  username: "",
-  password: "",
 });
-//配置中心数据
-let downloadConfig = reactive({});
 //qb是否可访问
-let qbReach = ref(true);
 let editInfo = ref(false);
 
-const qbInfo = computed(() => {
-  if (downloadConfig.qbAddress) {
-    return downloadConfig.qbAddress + " 用户名：" + downloadConfig.qbUsername;
-  } else {
-    return "尚未配置";
-  }
-});
-
 onMounted(async () => {
-  downloadConfig = reactive(await http.post("/config/multCode", null, ["qbAddress", "qbUsername", "qbPassword"]));
+  data.qbConfig = await http.get("/qb/config");
 });
 
 async function submitQb() {
-  let res = await http.post("");
+  data.qbConfig = await http.post("/qb/saveQbInfo", null, data.qbConfig);
 }
 </script>
 
@@ -52,10 +50,12 @@ async function submitQb() {
   display: flex;
   text-align: left;
   padding-bottom: 0.5em;
+
   .left {
     width: 6em;
     font-weight: 600;
   }
+
   .right {
     flex: 1;
   }