From 7990d178497f0221951e25493ee29b6cc6489e07 Mon Sep 17 00:00:00 2001
From: James Feng Cao <jamesfengcao@torapp.info>
Date: Wed, 19 Jun 2024 06:36:48 +0800
Subject: [PATCH 1/2] ebrowser v1.0.23

---
 ebrowser.md                  |  7 +++++++
 en/ebrowserreadme/index.html |  6 +++++-
 en/index.xml                 |  2 +-
 en/sitemap.xml               |  6 +++---
 misc/ebrowser/package.json   |  2 +-
 misc/ebrowser/webview.js     | 38 +++++++++++++++++++++---------------
 sitemap.xml                  |  2 +-
 7 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/ebrowser.md b/ebrowser.md
index 7d43624..2d215e8 100644
--- a/ebrowser.md
+++ b/ebrowser.md
@@ -25,6 +25,13 @@ Run ebrowser
 
 Later on, you can run "npm install electron" to update electron/chromium or "npm install ebrowser" to update ebrowser independently.
 
+##### Update app quickly without updating chromium
+Pressing "Alt" to show the menu bar and choose "Check for updates" under "Help". OR
+
+Type ":update" in the address bar and press "enter" key to update.
+
+Mirror urls could be used like ":update https://uwebzh.netlify.app/misc/ebrowser". All the mirrors listed in [uweb browser](https://uwebzh.netlify.app/en/readme/index.html) could be used. The update url needs to be changed accordingly to to be the folder "misc/ebrowser" under the mirror site root url.
+
 #### Key shortcuts
 - F1: Help
 - CTRL+C: stop loading
diff --git a/en/ebrowserreadme/index.html b/en/ebrowserreadme/index.html
index ce9e4ae..8124bdc 100644
--- a/en/ebrowserreadme/index.html
+++ b/en/ebrowserreadme/index.html
@@ -65,6 +65,10 @@ npm install ebrowser
 <pre><code>electron ~/node_modules/ebrowser
 </code></pre>
 <p>Later on, you can run &quot;npm install electron&quot; to update electron/chromium or &quot;npm install ebrowser&quot; to update ebrowser independently.</p>
+<h5 id="update-app-quickly-without-updating-chromium">Update app quickly without updating chromium</h5>
+<p>Pressing &quot;Alt&quot; to show the menu bar and choose &quot;Check for updates&quot; under &quot;Help&quot;. OR</p>
+<p>Type &quot;:update&quot; in the address bar and press &quot;enter&quot; key to update.</p>
+<p>Mirror urls could be used like &quot;:update https://uwebzh.netlify.app/misc/ebrowser&quot;. All the mirrors listed in <a href="https://uwebzh.netlify.app/en/readme/index.html">uweb browser</a> could be used. The update url needs to be changed accordingly to to be the folder &quot;misc/ebrowser&quot; under the mirror site root url.</p>
 <h4 id="key-shortcuts">Key shortcuts</h4>
 <ul>
 <li>F1: Help</li>
@@ -162,7 +166,7 @@ npm install ebrowser
 <p>You can copy or modify the code/program under the terms of the GPL3.0 or later versions.</p>
 
 </div>
-<p>Last Modified: 18 June 2024<br>
+<p>Last Modified: 19 June 2024<br>
 <br>
 <pre></pre>
 </p>
diff --git a/en/index.xml b/en/index.xml
index 622efc5..2387b6d 100644
--- a/en/index.xml
+++ b/en/index.xml
@@ -6,7 +6,7 @@
     <description>Recent content on uweb browser: unlimited power</description>
     <generator>Hugo</generator>
     <language>en</language>
-    <lastBuildDate>Tue, 18 Jun 2024 23:24:23 +0800</lastBuildDate>
+    <lastBuildDate>Wed, 19 Jun 2024 06:32:19 +0800</lastBuildDate>
     <atom:link href="/en/index.xml" rel="self" type="application/rss+xml" />
     <item>
       <title>Text selection/processing</title>
diff --git a/en/sitemap.xml b/en/sitemap.xml
index 6b44d0c..3c7e9ef 100644
--- a/en/sitemap.xml
+++ b/en/sitemap.xml
@@ -71,7 +71,7 @@
                 />
   </url><url>
     <loc>/en/</loc>
-    <lastmod>2024-06-18T23:24:23+08:00</lastmod>
+    <lastmod>2024-06-19T06:32:19+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -508,7 +508,7 @@
                 />
   </url><url>
     <loc>/en/ebrowserreadme/</loc>
-    <lastmod>2024-06-18T23:24:23+08:00</lastmod>
+    <lastmod>2024-06-19T06:32:19+08:00</lastmod>
   </url><url>
     <loc>/en/mirrors/</loc>
     <lastmod>2024-06-18T23:17:17+08:00</lastmod>
@@ -539,7 +539,7 @@
                 />
   </url><url>
     <loc>/en/unlist/</loc>
-    <lastmod>2024-06-18T23:24:23+08:00</lastmod>
+    <lastmod>2024-06-19T06:32:19+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
diff --git a/misc/ebrowser/package.json b/misc/ebrowser/package.json
index 194e206..dad7ea2 100644
--- a/misc/ebrowser/package.json
+++ b/misc/ebrowser/package.json
@@ -1,4 +1,4 @@
-{"version":"1.0.21",
+{"version":"1.0.23",
   "name": "ebrowser",
   "description": "The keyboard-friendly minimal suckless web browser",
   "main": "webview.js",
diff --git a/misc/ebrowser/webview.js b/misc/ebrowser/webview.js
index c6ed67b..97714d4 100644
--- a/misc/ebrowser/webview.js
+++ b/misc/ebrowser/webview.js
@@ -359,8 +359,11 @@ function onContextMenu(event, params){
 function topMenu(){
   const menuTemplate = [
     {
-      label: '',
+      label: '&Help',
       submenu: [
+        { label: 'Check for updates', click: ()=>{
+          addrCommand(":update");
+        }},
         { label: 'Help', accelerator: 'F1', click: ()=>{
           let js="tabs.children[iTab].src='file://'+__dirname+'/README.md'";
           win.webContents.executeJavaScript(js,false)
@@ -524,9 +527,7 @@ async function updateApp(url){//url must ending with "/"
     try {
       let res = await fetch(url+"package.json");
       let packageS = await res.text();
-      let nLatestVer;
-      //the last part of version string is the version number, must keep increasing
-      {
+      {//the last part of version string is the version number, must keep increasing
         let head = packageS.slice(2,40);
         let iV = head.indexOf("version");
         if(iV<0) {
@@ -536,23 +537,28 @@ async function updateApp(url){//url must ending with "/"
         iV = iV + 11;
         let iE = head.indexOf('"',iV+4);
         let iS = head.lastIndexOf('.',iE-1);
-        nLatestVer = parseInt(head.substring(iS+1,iE));
-      }
-      let nVer;
-      {
+        let nLatestVer = parseInt(head.substring(iS+1,iE));
+
         let ver = app.getVersion();
-        let iS = ver.lastIndexOf('.');
-        nVer = parseInt(ver.substring(iS+1));
-      }
-      if(nVer>=nLatestVer){
-        msg = "Already up to date";
-        break;
+        iS = ver.lastIndexOf('.');
+        let nVer = parseInt(ver.substring(iS+1));
+        if(nVer>=nLatestVer){
+          msg = `Current version ${ver} is already up to date`;
+          break;
+        }
+        const choice = dialog.showMessageBoxSync(null,  {
+          type: 'warning',
+          title: `Update from ${url}`,
+          message: `Proceed to update from ${ver} to ${head.substring(iV,iE)}?`,
+          buttons: ['YES','NO']
+        });
+        if(1===choice) return;
       }
+
       writeFile("package.json", packageS);
 
       fetch2file(url,"webview.js");
       fetch2file(url,"index.html");
-      
       msg = "Update completed";
     }catch(e){
       msg = "Fail to update"
@@ -560,7 +566,7 @@ async function updateApp(url){//url must ending with "/"
   }while(false);
   dialog.showMessageBoxSync(null,  {
     type: 'info',
-    title: msg,
+    title: `Update from ${url}`,
     message: msg,
     buttons: ['OK']
   })
diff --git a/sitemap.xml b/sitemap.xml
index e357888..f49d5ea 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,7 +4,7 @@
   <sitemap>
     <loc>/en/sitemap.xml</loc>
     
-      <lastmod>2024-06-18T23:24:23+08:00</lastmod>
+      <lastmod>2024-06-19T06:32:19+08:00</lastmod>
     
   </sitemap>
   

From e29bf0538d47908a64ad204638a9d68654aa816c Mon Sep 17 00:00:00 2001
From: James Feng Cao <jamesfengcao@torapp.info>
Date: Wed, 19 Jun 2024 07:00:19 +0800
Subject: [PATCH 2/2] fix typos

---
 ebrowser.md                  | 4 ++--
 en/ebrowserreadme/index.html | 4 ++--
 en/index.xml                 | 2 +-
 en/sitemap.xml               | 6 +++---
 misc/ebrowser/package.json   | 2 +-
 sitemap.xml                  | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ebrowser.md b/ebrowser.md
index 2d215e8..4b8ece1 100644
--- a/ebrowser.md
+++ b/ebrowser.md
@@ -30,10 +30,9 @@ Pressing "Alt" to show the menu bar and choose "Check for updates" under "Help".
 
 Type ":update" in the address bar and press "enter" key to update.
 
-Mirror urls could be used like ":update https://uwebzh.netlify.app/misc/ebrowser". All the mirrors listed in [uweb browser](https://uwebzh.netlify.app/en/readme/index.html) could be used. The update url needs to be changed accordingly to to be the folder "misc/ebrowser" under the mirror site root url.
+Mirror urls could be used like ":update https://uwebzh.netlify.app/misc/ebrowser". All the mirrors listed on [uweb browser](https://uwebzh.netlify.app/en/readme/index.html) could be used. The update url needs to be changed accordingly to be the folder "misc/ebrowser" under the mirror site root url.
 
 #### Key shortcuts
-- F1: Help
 - CTRL+C: stop loading
 - CTRL+G: address bar to show page url
 - CTRL+L: focus to address bar
@@ -47,6 +46,7 @@ Mirror urls could be used like ":update https://uwebzh.netlify.app/misc/ebrowser
 - CTRL+SHIFT+R: enable global redirection ("gredirect.json")
 - CTRL+R: disable global redirection
 - ESC: remove focus. similar to vi normal mode.
+- F1: Help
 - F5: page refresh/reload
 - F12: devtools
 
diff --git a/en/ebrowserreadme/index.html b/en/ebrowserreadme/index.html
index 8124bdc..64ed5dc 100644
--- a/en/ebrowserreadme/index.html
+++ b/en/ebrowserreadme/index.html
@@ -68,10 +68,9 @@ npm install ebrowser
 <h5 id="update-app-quickly-without-updating-chromium">Update app quickly without updating chromium</h5>
 <p>Pressing &quot;Alt&quot; to show the menu bar and choose &quot;Check for updates&quot; under &quot;Help&quot;. OR</p>
 <p>Type &quot;:update&quot; in the address bar and press &quot;enter&quot; key to update.</p>
-<p>Mirror urls could be used like &quot;:update https://uwebzh.netlify.app/misc/ebrowser&quot;. All the mirrors listed in <a href="https://uwebzh.netlify.app/en/readme/index.html">uweb browser</a> could be used. The update url needs to be changed accordingly to to be the folder &quot;misc/ebrowser&quot; under the mirror site root url.</p>
+<p>Mirror urls could be used like &quot;:update https://uwebzh.netlify.app/misc/ebrowser&quot;. All the mirrors listed on <a href="https://uwebzh.netlify.app/en/readme/index.html">uweb browser</a> could be used. The update url needs to be changed accordingly to be the folder &quot;misc/ebrowser&quot; under the mirror site root url.</p>
 <h4 id="key-shortcuts">Key shortcuts</h4>
 <ul>
-<li>F1: Help</li>
 <li>CTRL+C: stop loading</li>
 <li>CTRL+G: address bar to show page url</li>
 <li>CTRL+L: focus to address bar</li>
@@ -85,6 +84,7 @@ npm install ebrowser
 <li>CTRL+SHIFT+R: enable global redirection (&quot;gredirect.json&quot;)</li>
 <li>CTRL+R: disable global redirection</li>
 <li>ESC: remove focus. similar to vi normal mode.</li>
+<li>F1: Help</li>
 <li>F5: page refresh/reload</li>
 <li>F12: devtools</li>
 </ul>
diff --git a/en/index.xml b/en/index.xml
index 2387b6d..e76dc69 100644
--- a/en/index.xml
+++ b/en/index.xml
@@ -6,7 +6,7 @@
     <description>Recent content on uweb browser: unlimited power</description>
     <generator>Hugo</generator>
     <language>en</language>
-    <lastBuildDate>Wed, 19 Jun 2024 06:32:19 +0800</lastBuildDate>
+    <lastBuildDate>Wed, 19 Jun 2024 06:57:59 +0800</lastBuildDate>
     <atom:link href="/en/index.xml" rel="self" type="application/rss+xml" />
     <item>
       <title>Text selection/processing</title>
diff --git a/en/sitemap.xml b/en/sitemap.xml
index 3c7e9ef..ab321b5 100644
--- a/en/sitemap.xml
+++ b/en/sitemap.xml
@@ -71,7 +71,7 @@
                 />
   </url><url>
     <loc>/en/</loc>
-    <lastmod>2024-06-19T06:32:19+08:00</lastmod>
+    <lastmod>2024-06-19T06:57:59+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
@@ -508,7 +508,7 @@
                 />
   </url><url>
     <loc>/en/ebrowserreadme/</loc>
-    <lastmod>2024-06-19T06:32:19+08:00</lastmod>
+    <lastmod>2024-06-19T06:57:59+08:00</lastmod>
   </url><url>
     <loc>/en/mirrors/</loc>
     <lastmod>2024-06-18T23:17:17+08:00</lastmod>
@@ -539,7 +539,7 @@
                 />
   </url><url>
     <loc>/en/unlist/</loc>
-    <lastmod>2024-06-19T06:32:19+08:00</lastmod>
+    <lastmod>2024-06-19T06:57:59+08:00</lastmod>
     <xhtml:link
                 rel="alternate"
                 hreflang="zh"
diff --git a/misc/ebrowser/package.json b/misc/ebrowser/package.json
index dad7ea2..b022574 100644
--- a/misc/ebrowser/package.json
+++ b/misc/ebrowser/package.json
@@ -1,4 +1,4 @@
-{"version":"1.0.23",
+{"version":"1.0.24",
   "name": "ebrowser",
   "description": "The keyboard-friendly minimal suckless web browser",
   "main": "webview.js",
diff --git a/sitemap.xml b/sitemap.xml
index f49d5ea..77dccce 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,7 +4,7 @@
   <sitemap>
     <loc>/en/sitemap.xml</loc>
     
-      <lastmod>2024-06-19T06:32:19+08:00</lastmod>
+      <lastmod>2024-06-19T06:57:59+08:00</lastmod>
     
   </sitemap>