Merge pull request #1442 from otseng/main

Add webSiteTitle and scripts
eliranwong · Aug 30, 2024 · 89e2751 · 89e2751
2 parents 20baf07 + e50178d
commit 89e2751
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -119,3 +119,4 @@ log.txt
 google-cloud-key.json
 audio/*.onnx
 audio/*.json
+*.out
diff --git a/UniqueBibleAppVersion.txt b/UniqueBibleAppVersion.txt
@@ -1 +1 @@
-35.30
+35.31
diff --git a/api-server.sh b/api-server.sh
@@ -0,0 +1,3 @@
+nohup python uba.py api-server 7777 > nohup-api-server.out 2>&1 &
+echo "Started API Server"
+# tail -f nohup-api-server.out
diff --git a/docker_requirements.txt b/docker_requirements.txt
@@ -77,5 +77,5 @@ webencodings==0.5.1
 websocket-client==1.1.0
 websockets==10.1
 wrapt==1.13.3
-yt-dlp==2024.4.9
-zipp==3.7.0
+yt-dlp==2024.7.7
+zipp==3.19.1
diff --git a/http-server.sh b/http-server.sh
@@ -0,0 +1,2 @@
+nohup python uba.py http-server 8088 > nohup-http-server.out 2>&1 &
+
diff --git a/kill-api-server.sh b/kill-api-server.sh
@@ -0,0 +1,2 @@
+ps -ef | grep api-server |  grep -v grep | awk '{print $2}' | xargs kill
+ps -ef | grep api-server 
diff --git a/kill-http-server.sh b/kill-http-server.sh
@@ -0,0 +1,2 @@
+ps -ef | grep http-server |  grep -v grep | awk '{print $2}' | xargs kill
+ps -ef | grep http-server 
diff --git a/latest_changes.txt b/latest_changes.txt
@@ -1,3 +1,7 @@
+Changes in 35.31:
+* Add webSiteTitle to config
+* Add scripts to start/stop http and api server
+
 Changes in 35.30:
 * Support Piper TTS on Linux
 

diff --git a/patches.txt b/patches.txt
@@ -1337,7 +1337,6 @@
 (34.81, "file", "gui/SearchLauncher.py")
 (34.85, "file", "db/AGBTSData.py")
 (34.87, "file", "util/AGBsubheadings.py")
-(34.88, "file", "util/RemoteHttpHandler.py")
 (34.89, "file", "util/AGBparagraphs_expanded.py")
 (34.89, "file", "marvelData/AGBTS_data.sqlite")
 (34.98, "file", "plugins/chatGPT/integrate google searches.py")
@@ -1384,16 +1383,21 @@
 (35.26, "file", "util/terminal_mode_dialogs.py")
 (35.26, "file", "util/terminal_system_command_prompt.py")
 (35.27, "file", "db/BiblesSqlite.py")
-(35.28, "file", ".gitignore")
 (35.28, "file", "gui/MainWindow.py")
 (35.28, "file", "util/DatafileLocation.py")
-(35.29, "file", "util/RemoteApiHandler.py")
 (35.30, "file", "gui/ConfigFlagsWindow.py")
 (35.30, "file", "util/checkup.py")
-(35.30, "file", "util/ConfigUtil.py")
 (35.30, "file", "util/text_editor_checkup.py")
-(35.30, "file", "util/TextCommandParser.py")
 (35.30, "file", "util/TextEditorUtility.py")
-(35.30, "file", "latest_changes.txt")
-(35.30, "file", "UniqueBibleAppVersion.txt")
-(35.30, "file", "patches.txt")
+(35.31, "file", "api-server.sh")
+(35.31, "file", "http-server.sh")
+(35.31, "file", "kill-api-server.sh")
+(35.31, "file", "kill-http-server.sh")
+(35.31, "file", "util/ConfigUtil.py")
+(35.31, "file", "util/RemoteApiHandler.py")
+(35.31, "file", "util/RemoteHttpHandler.py")
+(35.31, "file", "util/TextCommandParser.py")
+(35.31, "file", ".gitignore")
+(35.31, "file", "UniqueBibleAppVersion.txt")
+(35.31, "file", "latest_changes.txt")
+(35.31, "file", "patches.txt")
diff --git a/util/ConfigUtil.py b/util/ConfigUtil.py
@@ -509,6 +509,9 @@ def getCurrentVenvDir():
         setConfig("webAdminPassword", """
          # Web admin password.""",
         "UBA123")
+        setConfig("webSiteTitle", """
+        # Site title for remote http server.""",
+        "UniqueBible.app")
         setConfig("referenceTranslation", """
         # Specify a translation as a reference for making other translations.  This option is created for development purpose.""",
         "en_US")

diff --git a/util/RemoteApiHandler.py b/util/RemoteApiHandler.py
@@ -109,6 +109,8 @@ def processRequest(self, request):
                 lang = query["lang"][0]
                 if os.path.exists('marvelData_' + lang):
                     config.marvelData = 'marvelData_' + lang
+        if request.startswith("/api"):
+            request = request[4:]
         cmd = request[1:].split("/")
         if len(cmd) > 0:
             command = cmd[0].lower()

diff --git a/util/RemoteHttpHandler.py b/util/RemoteHttpHandler.py
@@ -392,7 +392,7 @@ def addIpToBlackList(self, clientIP):
             file.close()
 
     def loadLastVerseHtml(self):
-        return """<!DOCTYPE html><html><head><link rel="icon" href="icons/{0}"><title>UniqueBible.app</title>
+        return """<!DOCTYPE html><html><head><link rel="icon" href="icons/{0}"><title>{4}</title>
                 <meta charset="UTF-8">
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
                 <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
@@ -405,7 +405,7 @@ def loadLastVerseHtml(self):
                 <script>
                 location.assign("{2}?cmd=.bible");
                 </script>
-                </body>""".format(config.webUBAIcon, config.thisTranslation["loading"], config.webHomePage, config.theme)
+                </body>""".format(config.webUBAIcon, config.thisTranslation["loading"], config.webHomePage, config.theme, config.webSiteTitle)
 
     def loadLastVerse(self):
         self.commonHeader()
@@ -566,7 +566,7 @@ def loadContent(self):
                 self.textCommandParser.parent.addHistoryRecord(view, self.command)
 
         if ('tab_title' in infoDict.keys() and infoDict['tab_title'] == "Map"):
-            content = content.replace("<title>Google Maps - gmplot</title>", """<title>UniqueBible.app</title>
+            content = content.replace("<title>Google Maps - gmplot</title>", """<title>{2}</title>
                 <script src='js/http_server.js?v=1.065'></script>
                 <script>
                 var target = document.querySelector('title');
@@ -579,7 +579,7 @@ def loadContent(self):
                     childList: true,
                 {1};
                 observer.observe(target, config);
-                </script>""".format("{", "}"))
+                </script>""".format("{", "}", config.webSiteTitle))
             #print(content)
         else:
             content = self.wrapHtml(content)
@@ -616,7 +616,7 @@ def indexPage(self):
             <html>
             <head>
                 <link rel="icon" href="icons/{20}">
-                <title>UniqueBible.app</title>
+                <title>{21}</title>
                 <meta charset="UTF-8">
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
                 <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
@@ -803,14 +803,14 @@ def indexPage(self):
                   <div class="modal2-content">
                     <div class="modal2-header">
                       <span class="close2">&times;</span>
-                      <span id="myMessageHeader"><h2>UniqueBible.app</h2></span>
+                      <span id="myMessageHeader"><h2>{21}</h2></span>
                     </div>
                     <div class="modal2-body">
-                      <span id="myMessage"><p>UniqueBible.app</p></span>
+                      <span id="myMessage"><p>{21}</p></span>
                     </div>
                 <!--
                     <div class="modal2-footer">
-                      <span id="myMessageFooter"><h3>UniqueBible.app</h3></span>
+                      <span id="myMessageFooter"><h3>{21}</h3></span>
                     </div>
                 -->
                   </div>
@@ -901,6 +901,7 @@ def indexPage(self):
             self.getBibleNavigationMenu(),
             config.webHomePage,
             config.webUBAIcon,
+            config.webSiteTitle
         )
         self.wfile.write(bytes(html, "utf8"))
 
@@ -1099,7 +1100,7 @@ def wrapHtml(self, content, view="", book=False):
                     fontSize = "{0}px".format(config.overwriteBookFontSize)
         bcv = (config.studyText, config.studyB, config.studyC, config.studyV) if view == "study" else (config.mainText, config.mainB, config.mainC, config.mainV)
         activeBCVsettings = "<script>var activeText = '{0}'; var activeB = {1}; var activeC = {2}; var activeV = {3};</script>".format(*bcv)
-        html = ("""<!DOCTYPE html><html><head><link rel="icon" href="icons/{9}"><title>UniqueBible.app</title>
+        html = ("""<!DOCTYPE html><html><head><link rel="icon" href="icons/{9}"><title>{12}</title>
                 <meta charset="UTF-8">
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
                 <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
@@ -1145,6 +1146,7 @@ def wrapHtml(self, content, view="", book=False):
                          config.webUBAIcon,
                          config.widgetBackgroundColor,
                          config.widgetForegroundColor,
+                         config.webSiteTitle
                          )
         return html
 
@@ -1376,10 +1378,10 @@ def displayMessage(self, message):
         <html>
             <head>
                 <link rel="icon" href="icons/{1}">
-                <title>UniqueBible.app</title>
+                <title>{2}</title>
                 <meta charset="UTF-8">
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        </head><body>{0}</body></html>""".format(message, config.webUBAIcon)
+        </head><body>{0}</body></html>""".format(message, config.webUBAIcon, config.webSiteTitle)
 
     def historyContent(self):
         view, content, *_ = self.textCommandParser.parser("_history:::main", "http")
@@ -1739,7 +1741,7 @@ def setVerseNoClickActionContent(self, double=False):
     def setWebUBAIconContent(self):
         files = glob.glob(os.path.join("htmlResources", "icons", "UniqueBibleApp*.png"))
         files = [file[20:] for file in files]
-        content = "<h2>Select UniqueBible.app Icon:</h2>"
+        content = "<h2>Select {0} Icon:</h2>".format(config.webSiteTitle)
         content += " ".join(["""<ref onclick ="document.title = '_setconfig:::webUBAIcon:::\\'{0}\\''"><img src="icons/{0}"></ref>""".format(file) for file in files])
         return content
 

diff --git a/util/TextCommandParser.py b/util/TextCommandParser.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 import glob, pprint, traceback, pydoc, threading, asyncio, shutil
-import os, re, webbrowser, platform, zipfile, subprocess, config
+import os, re, webbrowser, platform, zipfile, subprocess, config, logging
 from prompt_toolkit.input import create_input
 from prompt_toolkit.keys import Keys
 from datetime import date
@@ -63,6 +63,7 @@ class TextCommandParser:
 
     def __init__(self, parent):
         self.parent = parent
+        self.logger = logging.getLogger('uba')
         self.lastKeyword = None
         self.cliTtsProcess = None
         self.qtTtsEngine = None

diff --git a/util/UpdateUtil.py b/util/UpdateUtil.py
@@ -119,11 +119,12 @@ def updatePatchFileWithChanges(ver, sha1, sha2):
         f = open("patches.txt", "r")
         lines = f.readlines()
         for line in lines:
-            try:
-                ver, contentType, filePath = literal_eval(line)
-            except Exception as e:
-                print(f"{e} in '{line}'")
-            patches[filePath] = "{0}".format(ver)
+            if len(line) > 1:
+                try:
+                    ver, contentType, filePath = literal_eval(line)
+                except Exception as e:
+                    print(f"{e} in '{line}'")
+                patches[filePath] = "{0}".format(ver)
         f.close()
         lines = UpdateUtil.getFilesChanged(sha1, sha2)
         patch = open("patches.txt", "a")