From b10230bb6054b7db323220046442de2be92ad038 Mon Sep 17 00:00:00 2001
From: jahentao <tzhltjh@163.com>
Date: Sat, 19 Jan 2019 14:08:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=95=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=A4=8D=E5=88=B6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=88=B0=E5=89=AA=E8=B4=B4=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index.html                  |  2 +-
 node/ossstore/lib/upload-job.js | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/index.html b/app/index.html
index d6e83ef1..265f6d35 100644
--- a/app/index.html
+++ b/app/index.html
@@ -58,7 +58,7 @@
     <script src="aliyun-sdk-oss.js"></script>
     <script src="templates.js"></script>
     <script>
-      const {ipcRenderer,shell} = require('electron');
+      const {ipcRenderer,shell,clipboard} = require('electron');
       var isDev = process.env.NODE_ENV=='development';
 
       ipcRenderer.on('asynchronous-reply', (event, data) => {
diff --git a/node/ossstore/lib/upload-job.js b/node/ossstore/lib/upload-job.js
index 814f15e5..3d3bc6da 100644
--- a/node/ossstore/lib/upload-job.js
+++ b/node/ossstore/lib/upload-job.js
@@ -328,6 +328,17 @@ UploadJob.prototype.uploadSingle = function () {
                self.emit('complete');
                console.log('upload: '+self.from.path+' %celapse','background:green;color:white',self.endTime-self.startTime,'ms')
 
+               // 拼凑图片URL
+               var eptpl = self.oss.config.endpoint;
+               var protocol = eptpl.indexOf('https:') === 0 ? 'https:' : "http:";
+               var endpoint = eptpl.substr(8); // https://
+               var link = protocol + '//' + self.to.bucket + '.' + endpoint + '/' + encodeURI(self.to.key);
+               console.log(link);
+
+               // 自动复制到剪贴板
+               console.log('路径复制到剪贴板');
+               clipboard.writeText(link);
+
              }
           });
         }

From 3e78e29ae30889fc7801e30030f382f05abb3d59 Mon Sep 17 00:00:00 2001
From: jahentao <tzhltjh@163.com>
Date: Tue, 22 Jan 2019 11:40:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=9C=A8=E8=AE=BE=E7=BD=AE=E4=B8=AD=E6=B7=BB=E5=8A=A0=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/components/services/settings.js |  8 ++++++++
 app/index.html                      |  2 +-
 app/main/modals/settings.html       | 18 ++++++++++++++++
 app/main/modals/settings.js         |  1 +
 node/i18n/en-US.js                  |  2 ++
 node/i18n/ja-JP.js                  |  2 ++
 node/i18n/zh-CN.js                  |  2 ++
 node/ossstore/lib/upload-job.js     | 32 +++++++++++++++++++----------
 node/ossstore/lib/util.js           |  7 ++++++-
 9 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/app/components/services/settings.js b/app/components/services/settings.js
index 429b782a..4a3ac3d9 100644
--- a/app/components/services/settings.js
+++ b/app/components/services/settings.js
@@ -10,6 +10,14 @@ angular.module('web')
           return localStorage.setItem('autoUpgrade', v);
         }
       },
+      autoCopyURL: {
+        get: function () {
+          return parseInt(localStorage.getItem('autoCopyURL') || 0);
+        },
+        set: function (v) {
+          return localStorage.setItem('autoCopyURL', v);
+        }
+      },
       isCame: {
         get: function () {
           return parseInt(localStorage.getItem('isCame') || 0);
diff --git a/app/index.html b/app/index.html
index 265f6d35..d6e83ef1 100644
--- a/app/index.html
+++ b/app/index.html
@@ -58,7 +58,7 @@
     <script src="aliyun-sdk-oss.js"></script>
     <script src="templates.js"></script>
     <script>
-      const {ipcRenderer,shell,clipboard} = require('electron');
+      const {ipcRenderer,shell} = require('electron');
       var isDev = process.env.NODE_ENV=='development';
 
       ipcRenderer.on('asynchronous-reply', (event, data) => {
diff --git a/app/main/modals/settings.html b/app/main/modals/settings.html
index 87a76666..06179ad6 100644
--- a/app/main/modals/settings.html
+++ b/app/main/modals/settings.html
@@ -122,6 +122,24 @@ <h4 class="modal-title">
         </div>
       </div>
 
+      <div class="form-group">
+        <label class="col-sm-4 control-label">
+          <!-- 自动复制文件上传URL到剪贴板: -->
+          {{'settings.autoCopyURL'|translate}}:
+        </label>
+        <div class="col-sm-7">
+          <div class="checkbox">
+            <label>
+              <input type="checkbox" name="autoCopyURL"
+                     ng-model="set.autoCopyURL"
+                     ng-change="setChange(form1,'autoCopyURL')"
+                     ng-true-value="1" ng-false-value="0" />
+              <!-- (自动下载更新包) -->
+              ({{'settings.autoCopyURL.msg'|translate}})
+            </label>
+          </div>
+        </div>
+      </div>
     </fieldset>
 
     <fieldset>
diff --git a/app/main/modals/settings.js b/app/main/modals/settings.js
index a4e0eea0..9eb9cbd6 100644
--- a/app/main/modals/settings.js
+++ b/app/main/modals/settings.js
@@ -8,6 +8,7 @@ angular.module('web')
       showTab: 3,
       set: {
         autoUpgrade: settingsSvs.autoUpgrade.get(),
+        autoCopyURL: settingsSvs.autoCopyURL.get(),
         maxUploadJobCount: settingsSvs.maxUploadJobCount.get(),
         maxDownloadJobCount: settingsSvs.maxDownloadJobCount.get(),
         showImageSnapshot: settingsSvs.showImageSnapshot.get(),
diff --git a/node/i18n/en-US.js b/node/i18n/en-US.js
index eb0b231a..c84d14ff 100644
--- a/node/i18n/en-US.js
+++ b/node/i18n/en-US.js
@@ -197,6 +197,8 @@ module.exports = {
   'settings.success': 'Saved successfully',
   'settings.autoUpgrade': 'Auto update',
   'settings.autoUpgrade.msg': 'Download update package automatically',
+  'settings.autoCopyURL': 'Clipboard',
+  'settings.autoCopyURL.msg': 'Automatically copy file uploaded URL to clipboard',
 
   //bookmark
   'bookmarks.title': 'Bookmarks',
diff --git a/node/i18n/ja-JP.js b/node/i18n/ja-JP.js
index cf26ec98..5374113d 100644
--- a/node/i18n/ja-JP.js
+++ b/node/i18n/ja-JP.js
@@ -187,6 +187,8 @@ module.exports = {
   'settings.success': '保存を完了しました',
   'settings.autoUpgrade': '自動更新',
   'settings.autoUpgrade.msg': 'アップデートパッケージを自動的にダウンロードします',
+  'settings.autoCopyURL': 'クリップボード',
+  'settings.autoCopyURL.msg': 'ファイルのアップロードURLを自動的にクリップボードにコピーする',
   'settings.console': '試用パネル',
   'settings.console.msg': '調査を開く',
   'settings.file': "ローカルログファイル",
diff --git a/node/i18n/zh-CN.js b/node/i18n/zh-CN.js
index d95335c2..b8f3988c 100644
--- a/node/i18n/zh-CN.js
+++ b/node/i18n/zh-CN.js
@@ -188,6 +188,8 @@ module.exports = {
   'settings.success': '已经保存设置',
   'settings.autoUpgrade': '自动更新',
   'settings.autoUpgrade.msg': '自动下载更新包',
+  'settings.autoCopyURL': '剪贴板',
+  'settings.autoCopyURL.msg': '自动复制文件上传URL到剪贴板',
   'settings.console': '调试面板',
   'settings.console.msg': '开启调试',
   'settings.file': "本地日志文件",
diff --git a/node/ossstore/lib/upload-job.js b/node/ossstore/lib/upload-job.js
index 3d3bc6da..8f24bd58 100644
--- a/node/ossstore/lib/upload-job.js
+++ b/node/ossstore/lib/upload-job.js
@@ -15,7 +15,7 @@ var isLogInfo = localStorage.getItem('logFileInfo')|| 0;
 //本地日志收集模块
 var log = require('electron-log');
 
-var { ipcRenderer} = require('electron');
+var { ipcRenderer, clipboard} = require('electron');
 
 class UploadJob extends Base {
 
@@ -328,16 +328,26 @@ UploadJob.prototype.uploadSingle = function () {
                self.emit('complete');
                console.log('upload: '+self.from.path+' %celapse','background:green;color:white',self.endTime-self.startTime,'ms')
 
-               // 拼凑图片URL
-               var eptpl = self.oss.config.endpoint;
-               var protocol = eptpl.indexOf('https:') === 0 ? 'https:' : "http:";
-               var endpoint = eptpl.substr(8); // https://
-               var link = protocol + '//' + self.to.bucket + '.' + endpoint + '/' + encodeURI(self.to.key);
-               console.log(link);
-
-               // 自动复制到剪贴板
-               console.log('路径复制到剪贴板');
-               clipboard.writeText(link);
+               if (commonUtil.isAutoCopyURL() === 1) {
+                 // 拼凑图片URL
+                 var eptpl = self.oss.config.endpoint;
+                 var idx = 8;
+                 var protocol = 'https:';
+                 if (eptpl.indexOf('https:') === 0) {
+                   protocol = 'https:';
+                   idx = 8;
+                 } else {
+                   protocol = 'http:';
+                   idx = 7;
+                 }
+                 var endpoint = eptpl.substr(idx); // https:// 8    http:// 7
+                 var link = protocol + '//' + self.to.bucket + '.' + endpoint + '/' + encodeURI(self.to.key);
+                 console.log(link);
+
+                 // 自动复制到剪贴板
+                 // console.log('路径已复制到剪贴板');
+                 clipboard.writeText(link);
+               }
 
              }
           });
diff --git a/node/ossstore/lib/util.js b/node/ossstore/lib/util.js
index b695214b..9eb9bcca 100644
--- a/node/ossstore/lib/util.js
+++ b/node/ossstore/lib/util.js
@@ -17,7 +17,8 @@ module.exports = {
   getBigFileMd5: getBigFileMd5,
   checkFileHash: checkFileHash,
   printPartTimeLine: printPartTimeLine,
-  getRetryTimes: getRetryTimes
+  getRetryTimes: getRetryTimes,
+  isAutoCopyURL: isAutoCopyURL
 };
 
 function printPartTimeLine(opt){
@@ -174,3 +175,7 @@ function parseOssPath(osspath) {
 function getRetryTimes() {
   return localStorage.getItem('uploadAndDownloadRetryTimes') || 10
 }
+
+function isAutoCopyURL() {
+  return parseInt(localStorage.getItem('autoCopyURL') || 0);
+}
\ No newline at end of file