0813 修正中文網址的問題

pulipulichen · Aug 12, 2019 · 583ad9a · 583ad9a
1 parent 6339453
commit 583ad9a
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 8 deletions.
diff --git a/app/helpers/URLHelper.js b/app/helpers/URLHelper.js
@@ -2,9 +2,9 @@ let URLHelper = {
   _pattern: new RegExp('^(https?:\\/\\/)?' + // protocol
           '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name
           '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address
-          '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path
-          '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string
-          '(\\#[-a-z\\d_]*)?$', 'i'), // fragment locator
+          '(\\:\\d+)?(\\/[-a-z\u4e00-\u9eff\\d%_.~+]*)*' + // port and path
+          '(\\?[;&a-z\u4e00-\u9eff\\d%_.~+=-]*)?' + // query string
+          '(\\#[-a-z\u4e00-\u9eff\\d_]*)?$', 'i'), // fragment locator
   isURL: function (url) {
     if (url.indexOf('#') > -1) {
       url = url.slice(0, url.indexOf('#'))

diff --git a/app/imgs/predefined-icons/google-contacts.png b/app/imgs/predefined-icons/google-contacts.png
diff --git a/app/libs/CrawlerIconURLManager.js b/app/libs/CrawlerIconURLManager.js
@@ -94,6 +94,16 @@ let CrawlerIconURLManager = {
         return result
       }
     },
+    {
+      match: function (url) {
+        return (url.startsWith("https://contacts.google.com/"))
+      },
+      process: function (url, $, callback) {
+        let result = `predefined-icons/google-contacts.png`
+        callback(result)
+        return result
+      }
+    },
   ],
   match: function (url, $, callback) {
     for (let i = 0; i < this.conf.length; i++) {

diff --git a/app/libs/CrawlerManager.js b/app/libs/CrawlerManager.js
@@ -21,7 +21,7 @@ let CrawlerManager = {
         body = bodyStr
       }
       body = this._decodeHTML(body)
-      console.log(body)
+      //console.log(body)
 
       let $ = cheerio.load(body)
       data.title = this._parseTitle($, urlObject.host)
@@ -46,9 +46,18 @@ let CrawlerManager = {
 
   },
   _requestBody: function (url, callback) {
+
+    let encoding = null
+
+    if (url.startsWith('https://webatm.post.gov.tw/')) {
+      encoding = 'binary'
+    }
+    //url = encodeURI(url)
+    //console.log(url)
     request({
       url: url,
-      encoding: 'binary',
+      //encoding: 'binary',
+      encoding: encoding,
       headers: { 'User-Agent': 'Mozilla/5.0' }
     }, function (error, response, body) {
       if (!error && response.statusCode === 200) {
@@ -87,12 +96,14 @@ let CrawlerManager = {
     return desc
   },
   _decodeHTML: function (body) {
+    //console.log(body)
     if (body.indexOf('content="text/html; charset=big5"') > -1
             || (body.indexOf('CONTENT="text/html; charset=big5"') > -1)) {
       //console.log(body)
       //console.log(iconv.decode(body, 'Big5').toString())
       //console.log(iconv.decode(body, 'UTF8').toString())
       body = iconv.decode(body, 'BIG5').toString()
+      //console.log('decode')
     }
     //console.log(body)
     return body.trim()

diff --git a/app/require.js b/app/require.js
@@ -11,7 +11,7 @@ const homedir = require('os').homedir()
 
 let ws = null // for module "windows-shortcut"
 if (process.platform === 'win32') {
-  ws = require('windows-shortcuts')
+  ws = require('@pulipuli.chen/windows-shortcuts')
 }
 let exec = require('child_process').exec
 

diff --git a/app/scripts.js b/app/scripts.js
@@ -16,7 +16,8 @@ let appConfig = {
     isNeedLoad: false,
     _enablePersist: true,
     _debugDemo: false,
-    _debugConsole: false
+    _debugConsole: false,
+    _urlWatchLock: undefined
   },
   watch: {
     url: function (newUrl) {
@@ -26,6 +27,19 @@ let appConfig = {
         newUrl = newUrl.slice(newUrl.lastIndexOf(' --app=') + 7)
         this.url = newUrl
       }
+
+      //console.log(this._urlWatchLock)
+
+      if (this._urlWatchLock === undefined && encodeURI(newUrl) !== newUrl) {
+        this._urlWatchLock = true
+        setTimeout(() => {
+          this.url = encodeURI(newUrl)
+          setTimeout(() => {
+            this._urlWatchLock = undefined
+          }, 100)
+        }, 100)
+      }
+
       //return 'http://blog.pulipuli.info'
 
     },
@@ -255,6 +269,8 @@ let appConfig = {
         desc: this.description
         //icon: 'D:/Desktop/Box Sync/[SOFTWARE]/[SavedIcons]/[ico]/Apps-Google-Drive-Slides-icon.ico',
       }
+
+      //console.log(options)
       ShortcutManager.create(saveToPath, options)
     },
     onFileDrop: function (dropFiles) {

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "request": "^2.87.0",
     "terminal-exec": "^0.0.2",
     "universalify": "^0.1.2",
-    "windows-shortcuts": "^0.1.6"
+    "@pulipuli.chen/windows-shortcuts": "^0.1.6"
   },
   "devDependencies": {
     "electron": "^6.0.1"