Fixed: Chinese filename can't upload & add setting-info button

2026-05-10 17:42:45 +08:00 · 2018-01-10 11:31:07 +08:00
parent ca6e72d4fc
commit c6f2e16b80
7 changed files with 123 additions and 29 deletions
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -3,6 +3,7 @@
  <head>
    <meta charset="utf-8">
    <meta name="referrer" content="never">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
    <title>PicGo</title>
    <% if (htmlWebpackPlugin.options.nodeModules) { %>
      <!-- Add `node_modules/` to global paths so `require` works properly in development -->
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -1,10 +1,11 @@
 'use strict'

 import uploader from './utils/uploader.js'
-import { app, BrowserWindow, Tray, Menu, Notification, clipboard, ipcMain, globalShortcut } from 'electron'
+import { app, BrowserWindow, Tray, Menu, Notification, clipboard, ipcMain, globalShortcut, dialog } from 'electron'
 import db from '../datastore'
 import pasteTemplate from './utils/pasteTemplate'
 import updateChecker from './utils/updateChecker'
+import pkg from '../../package.json'
 /**
 * Set `__static` path to static files in production
 * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html
@@ -35,6 +36,16 @@ const uploadFailed = () => {
 function createTray () {
  tray = new Tray(`${__static}/menubar.png`)
  const contextMenu = Menu.buildFromTemplate([
+    {
+      label: '关于',
+      click () {
+        dialog.showMessageBox({
+          title: 'PicGo',
+          message: 'PicGo',
+          detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo`
+        })
+      }
+    },
    {
      label: '打开详细窗口',
      click () {
@@ -173,6 +184,7 @@ const createWindow = () => {
  })

  createSettingWindow()
+  createMenu()
 }

 const createSettingWindow = () => {
@@ -201,27 +213,29 @@ const createSettingWindow = () => {
 }

 const createMenu = () => {
-  const template = [{
-    label: 'Edit',
-    submenu: [
-      { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
-      { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
-      { type: 'separator' },
-      { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
-      { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
-      { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
-      { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' },
-      {
-        label: 'Quit',
-        accelerator: 'CmdOrCtrl+Q',
-        click () {
-          app.quit()
+  if (process.env.NODE_ENV !== 'development') {
+    const template = [{
+      label: 'Edit',
+      submenu: [
+        { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
+        { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' },
+        { type: 'separator' },
+        { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' },
+        { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
+        { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
+        { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' },
+        {
+          label: 'Quit',
+          accelerator: 'CmdOrCtrl+Q',
+          click () {
+            app.quit()
+          }
        }
-      }
-    ]
-  }]
-  menu = Menu.buildFromTemplate(template)
-  Menu.setApplicationMenu(menu)
+      ]
+    }]
+    menu = Menu.buildFromTemplate(template)
+    Menu.setApplicationMenu(menu)
+  }
 }

 const getWindowPosition = () => {
@@ -323,14 +337,26 @@ ipcMain.on('uploadChoosedFiles', async (evt, files) => {
  }
 })

+const isSecondInstance = app.makeSingleInstance(() => {
+  if (settingWindow) {
+    if (settingWindow.isMinimized()) {
+      settingWindow.restore()
+    }
+    settingWindow.focus()
+  }
+})
+
+if (isSecondInstance) {
+  console.log('is 2')
+  app.quit()
+}
+
 app.on('ready', () => {
  createWindow()
  createTray()
-  createMenu()
  updateChecker()

  globalShortcut.register('CommandOrControl+Shift+P', () => {
-    console.log(1)
    uploadClipboardFiles()
  })
 })
@@ -344,8 +370,6 @@ app.on('window-all-closed', () => {
 app.on('activate', () => {
  if (window === null || settingWindow === null) {
    createWindow()
-    createTray()
-    createMenu()
  }
 })

--- a/src/main/utils/qiniuUpload.js
+++ b/src/main/utils/qiniuUpload.js
@@ -6,7 +6,7 @@ import { Notification } from 'electron'

 function postOptions (fileName, token, imgBase64) {
  const area = selectArea(db.read().get('picBed.qiniu.area').value() || 'z0')
-  const base64FileName = Buffer.from(fileName).toString('base64')
+  const base64FileName = Buffer.from(fileName, 'utf-8').toString('base64').replace(/\+/g, '-').replace(/\//g, '_')
  return {
    method: 'POST',
    url: `http://upload${area}.qiniu.com/putb64/-1/key/${base64FileName}`,
--- a/src/main/utils/upYunUpload.js
+++ b/src/main/utils/upYunUpload.js
@@ -13,7 +13,7 @@ const generateSignature = (fileName) => {
  const password = options.password
  const md5Password = MD5(password)
  const date = new Date().toGMTString()
-  const uri = `/${options.bucket}/${fileName}`
+  const uri = `/${options.bucket}/${encodeURI(fileName)}`
  const value = `PUT&${uri}&${date}`
  const sign = crypto.createHmac('sha1', md5Password).update(value).digest('base64')
  return `UPYUN ${operator}:${sign}`
@@ -24,7 +24,7 @@ const postOptions = (fileName, signature, imgBase64) => {
  const bucket = options.bucket
  return {
    method: 'PUT',
-    url: `https://v0.api.upyun.com/${bucket}/${fileName}`,
+    url: `https://v0.api.upyun.com/${bucket}/${encodeURI(fileName)}`,
    headers: {
      Authorization: signature,
      Date: new Date().toGMTString()
--- a/src/renderer/components/SettingPage.vue
+++ b/src/renderer/components/SettingPage.vue
@@ -34,29 +34,80 @@
            <i class="el-icon-ui-upyun"></i>
            <span slot="title">又拍云设置</span>
          </el-menu-item>
+          <i class="el-icon-setting" @click="openDialog"></i>
        </el-menu>
      </el-col>
      <el-col :span="19" :offset="5">
        <router-view></router-view>
      </el-col>
    </el-row> 
+    <el-dialog
+      title="赞助PicGo"
+      :visible.sync="visible"
+      width="70%"
+      top="10vh"
+    >
+      PicGo是免费开源的软件，如果你喜欢它，对你有帮助，不妨请我喝杯咖啡？
+      <el-row class="support">
+        <el-col :span="12">
+          <img src="https://user-images.githubusercontent.com/12621342/34188165-e7cdf372-e56f-11e7-8732-1338c88b9bb7.jpg" alt="支付宝">
+          <div class="support-title">支付宝</div>
+        </el-col>
+        <el-col :span="12">
+          <img src="https://user-images.githubusercontent.com/12621342/34188201-212cda84-e570-11e7-9b7a-abb298699d85.jpg" alt="支付宝">
+          <div class="support-title">微信</div>
+        </el-col>
+      </el-row>
+    </el-dialog>
  </div>
 </template>
 <script>
 import pkg from '../../../package.json'
+import { remote } from 'electron'
+const { Menu, dialog } = remote
 export default {
  name: 'setting-page',
  data () {
    return {
      version: pkg.version,
-      defaultActive: 'upload'
+      defaultActive: 'upload',
+      menu: null,
+      visible: false
    }
  },
+  created () {
+    this.buildMenu()
+  },
  methods: {
    handleSelect (index) {
      this.$router.push({
        name: index
      })
+    },
+    buildMenu () {
+      const _this = this
+      const template = [
+        {
+          label: '关于',
+          click () {
+            dialog.showMessageBox({
+              title: 'PicGo',
+              message: 'PicGo',
+              detail: `Version: ${pkg.version}\nAuthor: Molunerfinn\nGithub: https://github.com/Molunerfinn/PicGo`
+            })
+          }
+        },
+        {
+          label: '赞助PicGo',
+          click () {
+            _this.visible = true
+          }
+        }
+      ]
+      this.menu = Menu.buildFromTemplate(template)
+    },
+    openDialog () {
+      this.menu.popup(remote.getCurrentWindow)
    }
  },
  beforeRouteEnter: (to, from, next) => {
@@ -83,6 +134,15 @@ export default {
    border-right none
    background transparent
    position fixed
+    .el-icon-setting
+      position absolute
+      bottom 4px
+      left 4px
+      cursor pointer
+      color #878d99
+      transition .2s all ease-in-out
+      &:hover
+        color #409EFF
    &-item
      color #eee
      position relative
@@ -100,4 +160,9 @@ export default {
          right 0
          top 18px
          background active-color
+  .support
+    text-align center
+    &-title
+      text-align center
+      color #878d99
 </style>
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -6,9 +6,13 @@ import App from './App'
 import router from './router'
 import store from './store'
 import db from '../datastore/index'
+import { webFrame } from 'electron'
 import './assets/fonts/iconfont.css'
 Vue.use(ElementUI)

+webFrame.setVisualZoomLevelLimits(1, 1)
+webFrame.setLayoutZoomLevelLimits(0, 0)
+
 if (!process.env.IS_WEB) Vue.use(require('vue-electron'))
 Vue.http = Vue.prototype.$http = axios
 Vue.prototype.$db = db
--- a/static/hexo-theme-melody-logo.png
+++ b/static/hexo-theme-melody-logo.png