Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/components/services/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
18 changes: 18 additions & 0 deletions app/main/modals/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions app/main/modals/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
2 changes: 2 additions & 0 deletions node/i18n/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions node/i18n/ja-JP.js
Original file line number Diff line number Diff line change
Expand Up @@ -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': "ローカルログファイル",
Expand Down
2 changes: 2 additions & 0 deletions node/i18n/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -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': "本地日志文件",
Expand Down
23 changes: 22 additions & 1 deletion node/ossstore/lib/upload-job.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -328,6 +328,27 @@ UploadJob.prototype.uploadSingle = function () {
self.emit('complete');
console.log('upload: '+self.from.path+' %celapse','background:green;color:white',self.endTime-self.startTime,'ms')

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);
}

}
});
}
Expand Down
7 changes: 6 additions & 1 deletion node/ossstore/lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ module.exports = {
getBigFileMd5: getBigFileMd5,
checkFileHash: checkFileHash,
printPartTimeLine: printPartTimeLine,
getRetryTimes: getRetryTimes
getRetryTimes: getRetryTimes,
isAutoCopyURL: isAutoCopyURL
};

function printPartTimeLine(opt){
Expand Down Expand Up @@ -174,3 +175,7 @@ function parseOssPath(osspath) {
function getRetryTimes() {
return localStorage.getItem('uploadAndDownloadRetryTimes') || 10
}

function isAutoCopyURL() {
return parseInt(localStorage.getItem('autoCopyURL') || 0);
}