feat: Support multiple versions(支持多版本操作)

.eslintrc.json

@@ -8,7 +8,8 @@
     }
   },
   "rules": {
-    "semi": 2
+    "semi": 0,
+    "quotes": 0
   },
   "extends": ["eslint:recommended", "plugin:prettier/recommended"],
   "ignorePatterns": ["static/", "vendor/", "dist/", "node_modules/", "test/"],

app/components/services/auto-upgrade.js

@@ -1,6 +1,6 @@
 angular.module("web").factory("autoUpgradeSvs", [
   "settingsSvs",
-  function (settingsSvs) {
+  function () {
     var util = require("./node/ossstore/lib/util");
     var NAME = "oss-browser";
 
@@ -219,8 +219,6 @@ angular.module("web").factory("autoUpgradeSvs", [
             //暂时只支持1个文件更新
             data.file = data.files.length > 0 ? data.files[0] : null;
 
-            var jobs = [];
-
             //var fileName = NAME + '-' + process.platform + '-' + process.arch + '.zip';
 
             var pkgLink =
@@ -238,8 +236,6 @@ angular.module("web").factory("autoUpgradeSvs", [
             upgradeOpt.upgradeJob.progress = 0;
             upgradeOpt.upgradeJob.pkgLink = pkgLink;
 
-            var jobsFinishedCount = 0;
-
             var to = path.join(__dirname, "..", lastVersion + "-" + data.file);
 
             job = new FlatDownloadJob(data.file, pkgLink, to);
@@ -292,7 +288,7 @@ angular.module("web").factory("autoUpgradeSvs", [
             Range: "bytes=30-210",
           },
         }).then(
-          function (data) {
+          function () {
             var t2 = Date.now();
             t.push({ time: t2 - t1, linkPre: linkPre });
 

app/components/services/oss-download-manager.js

@@ -73,7 +73,7 @@ angular.module("web").factory("ossDownloadManager", [
       //save
       saveProg();
 
-      job.on("partcomplete", function (prog) {
+      job.on("partcomplete", function () {
         safeApply($scope);
         //save
         saveProg($scope);
@@ -140,10 +140,19 @@ angular.module("web").factory("ossDownloadManager", [
       //console.log('--------downloadFilesHandler', fromOssInfos, toLocalPath);
       var authInfo = AuthInfo.get();
       var dirPath = path.dirname(fromOssInfos[0].path);
+      // 多版本下可能会下载同一文件不同历史版本，自动重命名文件
+      const fileVersionCount = {};
+      fromOssInfos.forEach((info) => {
+        if (!fileVersionCount[info.path]) {
+          fileVersionCount[info.path] = 1;
+        } else {
+          fileVersionCount[info.path] += 1;
+        }
+      });
 
       loop(
         fromOssInfos,
-        function (jobs) {},
+        function () {},
         function () {
           if (jobsAddedFn) jobsAddedFn();
         }
@@ -202,11 +211,18 @@ angular.module("web").factory("ossDownloadManager", [
           return;
         }
 
-        var fileName = path.basename(ossInfo.path);
-        var filePath = path.join(
-          toLocalPath,
-          path.relative(dirPath, ossInfo.path)
-        );
+        let fileName;
+        if (fileVersionCount[ossInfo.path] > 1) {
+          fileName =
+            path.basename(ossInfo.path, path.extname(ossInfo.path)) +
+            "(" +
+            moment(ossInfo.lastModified).format("YYYY_MM_DD_HH_mm_ss") +
+            ")" +
+            path.extname(ossInfo.path);
+        } else {
+          fileName = path.basename(ossInfo.path);
+        }
+        var filePath = path.join(toLocalPath, path.relative(dirPath, fileName));
 
         if (ossInfo.isFolder) {
           //目录
@@ -249,7 +265,7 @@ angular.module("web").factory("ossDownloadManager", [
           //文件
           if (process.platform == "win32") {
             //修复window下，文件名含非法字符需要转义
-            if (/[\/\\\:\<\>\?\*\"\|]/.test(fileName)) {
+            if (/[/\\:<>?*"|]/.test(fileName)) {
               fileName = encodeURIComponent(fileName);
               filePath = path.join(
                 path.dirname(filePath),
@@ -274,6 +290,7 @@ angular.module("web").factory("ossDownloadManager", [
             from: {
               bucket: ossInfo.bucket,
               key: truePath,
+              versionId: ossInfo.versionId,
             },
             to: {
               name: fileName,
@@ -302,9 +319,10 @@ angular.module("web").factory("ossDownloadManager", [
       var cname = AuthInfo.get().cname || false;
 
       var endpointname = cname ? auth.eptplcname : auth.eptpl;
+      let store;
       //stsToken
       if (auth.stoken && auth.id.indexOf("STS.") == 0) {
-        var store = new OssStore({
+        store = new OssStore({
           stsToken: {
             Credentials: {
               AccessKeyId: auth.id,
@@ -320,7 +338,7 @@ angular.module("web").factory("ossDownloadManager", [
           cname: cname,
         });
       } else {
-        var store = new OssStore({
+        store = new OssStore({
           aliyunCredential: {
             accessKeyId: auth.id,
             secretAccessKey: auth.secret,
@@ -373,7 +391,9 @@ angular.module("web").factory("ossDownloadManager", [
       try {
         var data = fs.readFileSync(getDownProgFilePath());
         return JSON.parse(data ? data.toString() : "[]");
-      } catch (e) {}
+      } catch (e) {
+        //
+      }
       return [];
     }