README.md

@@ -1,4 +1,4 @@
-# Navpoint Desktop v0.11dev
+# Navpoint Desktop
 
 [Navpoint](https://git.kj7rrv.com/kj7rrv/navpoint) makes the user's current
 location available in KML format over a local HTTP server (listening on
@@ -20,7 +20,7 @@ recommended where possible, is from a USB GPS receiver that supports the [NMEA
 0183](https://en.wikipedia.org/wiki/NMEA_0183) protocol. (A handheld GPS
 receiver connected to a computer may or may not work; it does not work with my
 Garmin GPSMAP 64st. Any common USB GPS dongle, such as [this one available from
-Amazon](https://www.amazon.com/VK-162-G-Mouse-External-Navigation-Raspberry/dp/B01EROIUEW/),
+Amazon](https://www.amazon.com/VK-162-G-Mouse-External-Navigation-Raspberry/dp/B01EROIUEW/)
 should work, although, of course, I cannot guarantee that any particular device
 will be compatible with Navpoint. On Windows, USB mode should work
 out-of-the-box with a compatible GPS receiver; on Linux, your user account

build-linux.sh

@@ -1,27 +1,18 @@
 #!/bin/sh
 
 arch=$(uname -m)
-version=$(head -n 1 README.md | awk '{print $4}')
-distName=navpoint-$version-linux-$arch
+distName=navpoint-linux-$arch
 
-rm -rf dist/$distName-*
+rm -rf dist/$distName-bundle
 mkdir -p dist/$distName-bundle
 
-pyinstaller --windowed --onefile \
-    --hidden-import tornado.web \
-    --add-data README.md:files \
-    --add-data GPL-3.0.txt:files \
-    --add-data CC-BY-SA-4.0.txt:files \
-    main.py
+pyinstaller -w -F --hidden-import tornado.web --add-data README.md:files --add-data GPL-3.0.txt:files --add-data CC-BY-SA-4.0.txt:files main.py
 
 cp dist/main dist/$distName-standalone
 mv dist/main dist/$distName-bundle/navpoint
 cp icon.png dist/$distName-bundle/navpoint.png
-
 cp GPL-3.0.txt CC-BY-SA-4.0.txt dist/$distName-bundle/
-pandoc -s --metadata "title=Navpoint Desktop" README.md |
-    grep -v 'h1 id="navpoint-desktop"' \
-    > dist/$distName-bundle/README.html
+pandoc -s --metadata "title=Navpoint Desktop" README.md | grep -v 'h1 id="navpoint-desktop"' > dist/$distName-bundle/README.html
 
 cat > dist/$distName-bundle/navpoint.desktop << HERE
 [Desktop Entry]

build-windows.bat

@@ -0,0 +1,4 @@
+pyinstaller -i=icon.ico --windowed --onefile --hidden-import tornado.web --add-data icon.ico:files --add-data README.md:files --add-data GPL-3.0.txt:files --add-data CC-BY-SA-4.0.txt:files --name=navpoint.exe main.py
+"C:\Program Files (x86)\NSIS\makensis.exe" .\windows_installer.nsi
+move "dist\navpoint.exe" "dist\navpoint-windows-%PROCESSOR_ARCHITECTURE%-portable.exe"
+move "dist\NavpointInstaller.exe" "dist\navpoint-windows-%PROCESSOR_ARCHITECTURE%-installer.exe"

build-windows.ps1

@@ -1,12 +0,0 @@
-$version = (Get-Content -Path README.md -TotalCount 1).Split()[3]
-$distName = "navpoint-$version-windows-$env:PROCESSOR_ARCHITECTURE"
-
-Remove-Item -Path "dist\$distName-*"
-
-pyinstaller --icon "icon.ico" --windowed --onefile --hidden-import "tornado.web" --add-data "icon.ico:files" --add-data "README.md:files" --add-data "GPL-3.0.txt:files" --add-data "CC-BY-SA-4.0.txt:files" --name "navpoint.exe" "main.py"
-
-(Get-Content ".\windows_installer.nsi" -Raw).Replace("<<version>>", "$version").Replace("<<distName>>", "$distName") | Out-File ".\temp_installer.nsi"
-& "C:\Program Files (x86)\NSIS\makensis.exe" ".\temp_installer.nsi"
-Remove-Item -Path ".\temp_installer.nsi"
-
-Move-Item -Path "dist\navpoint.exe" -Destination "dist\$distName-portable.exe"

navpoint/about.py

@@ -1,28 +1,30 @@
 import webbrowser
-import threading
-import asyncio
+import tempfile
+import time
+import os
 import markdown
-import tornado.web
 import navpoint.fix_path
 
-class AboutHandler(tornado.web.RequestHandler):
-    def get(self):
-        with open(navpoint.fix_path.fix_path("README.md")) as f:
-            readme = markdown.markdown(
-                f.read()
-                .replace("https://www.gnu.org/licenses/gpl-3.0.en.html", "#gpl")
-                .replace(
-                    "https://creativecommons.org/licenses/by-sa/4.0/", "#cc"
-                )
-            )
 
-        with open(navpoint.fix_path.fix_path("GPL-3.0.txt")) as f:
-            gpl = f.read()
+def about():
+    with open(navpoint.fix_path.fix_path("README.md")) as f:
+        readme = markdown.markdown(
+            f.read()
+            .replace("https://www.gnu.org/licenses/gpl-3.0.en.html", "#gpl")
+            .replace("https://creativecommons.org/licenses/by-sa/4.0/", "#cc")
+        )
 
-        with open(navpoint.fix_path.fix_path("CC-BY-SA-4.0.txt")) as f:
-            cc = f.read()
+    with open(navpoint.fix_path.fix_path("GPL-3.0.txt")) as f:
+        gpl = f.read()
 
-        self.write(
+    with open(navpoint.fix_path.fix_path("CC-BY-SA-4.0.txt")) as f:
+        cc = f.read()
+
+    fd, name = tempfile.mkstemp(suffix=".html")
+    os.close(fd)
+
+    with open(name, "w") as f:
+        f.write(
             f"""\
 <!DOCTYPE html>
 <html>
@@ -44,19 +46,6 @@ class AboutHandler(tornado.web.RequestHandler):
 """
         )
 
-
-async def _run():
-    app = tornado.web.Application(
-        [
-            ("/", AboutHandler),
-        ]
-    )
-    app.listen(9999, address="127.0.0.1")
-    await asyncio.Event().wait()
-
-def run_server():
-    threading.Thread(target=asyncio.run, args=(_run(),), daemon=True).start()
-
-
-def about():
-    webbrowser.open("http://127.0.0.1:9999/")
+    webbrowser.open(name)
+    time.sleep(0.5)  # Give the browser time to open the file
+    os.remove(name)

navpoint/run.py

@@ -6,9 +6,6 @@ import navpoint.phone_server
 import navpoint.usb
 import navpoint.about
 
-def _version():
-    with open(navpoint.fix_path.fix_path("README.md")) as f:
-        return f.readline().split()[3]
 
 def run():
     def _usb_clicked():
@@ -37,10 +34,10 @@ def run():
         window, text="Phone running Navpoint Mobile", command=_mobile_clicked
     )
     mobile_button.pack()
-    ttk.Separator(window, orient="horizontal").pack(fill="x", pady=3)
+    ttk.Separator(window, orient="horizontal").pack()
     ttk.Label(window, text="Navpoint is free and open-source.").pack()
     about_button = ttk.Button(
-        window, text="About Navpoint " + _version(), command=navpoint.about.about
+        window, text="About Navpoint", command=navpoint.about.about
     )
     about_button.pack()
 
@@ -49,7 +46,6 @@ def run():
     except tk.TclError:
         pass
 
-    navpoint.about.run_server()
     window.mainloop()
 
     if mode == "mobile":

windows_installer.nsi

@@ -1,5 +1,5 @@
-Name "Navpoint <<version>>"
-OutFile "dist\<<distName>>-installer.exe"
+OutFile "dist\NavpointInstaller.exe"
+# define installation directory
 InstallDir $PROFILE\Navpoint
 
 RequestExecutionLevel user
@@ -9,15 +9,25 @@ Section
     SetOutPath $INSTDIR
 
     File dist\navpoint.exe
-    CreateShortcut "$SMPROGRAMS\Navpoint.lnk" "$INSTDIR\navpoint.exe"
-    CreateShortcut "$DESKTOP\Navpoint.lnk" "$INSTDIR\navpoint.exe"
  
+    # create the uninstaller
     WriteUninstaller "$INSTDIR\uninstall.exe"
+ 
+    # create a shortcut named "new shortcut" in the start menu programs directory
+    # point the new shortcut at the program uninstaller
     CreateShortcut "$SMPROGRAMS\Uninstall Navpoint.lnk" "$INSTDIR\uninstall.exe"
+    CreateShortcut "$SMPROGRAMS\Navpoint.lnk" "$INSTDIR\navpoint.exe"
 SectionEnd
  
+# uninstaller section start
 Section "uninstall"
+ 
+    # Remove the link from the start menu
     Delete "$SMPROGRAMS\Uninstall Navpoint.lnk"
+ 
+    # Delete the uninstaller
     Delete $INSTDIR\uninstaller.exe
+ 
     RMDir $INSTDIR
+# uninstaller section end
 SectionEnd