add fallback urls to all include_url calls. improve http timeout handling.

input/projects/3d-printing/i3-am8.md

@@ -264,7 +264,10 @@ function copyEvent(id) {
 
 <pre id="printercfg" class="sh_desktop">
 <!--%
-include_url("https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/configs/i3-AM8/printer.cfg")
+include_url(
+    "https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/configs/i3-AM8/printer.cfg",
+    "https://codeberg.org/xythobuz/3d-print-designs/raw/branch/master/configs/i3-AM8/printer.cfg"
+)
 %-->
 </pre>
 
@@ -273,7 +276,10 @@ include_url("https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/c
 
 <pre id="moonrakerconf" class="sh_desktop">
 <!--%
-include_url("https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/configs/i3-AM8/moonraker.conf")
+include_url(
+    "https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/configs/i3-AM8/moonraker.conf",
+    "https://codeberg.org/xythobuz/3d-print-designs/raw/branch/master/configs/i3-AM8/moonraker.conf"
+)
 %-->
 </pre>
 
@@ -282,7 +288,10 @@ And [here](https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/con
 
 <pre id="prusabundle" class="sh_desktop">
 <!--%
-include_url("https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/configs/i3-AM8/PrusaSlicer_config_bundle.ini")
+include_url(
+    "https://git.xythobuz.de/thomas/3d-print-designs/raw/branch/master/configs/i3-AM8/PrusaSlicer_config_bundle.ini",
+    "https://codeberg.org/xythobuz/3d-print-designs/raw/branch/master/configs/i3-AM8/PrusaSlicer_config_bundle.ini"
+)
 %-->
 </pre>
 

input/projects/3d-printing/sparkmaker_repair.md

@@ -144,7 +144,10 @@ The route to take was therefore obvious: write a script that takes `.sl1` files
 
 <pre class="sh_python">
 <!--%
-include_url("https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/convert_sparkmaker.py")
+include_url(
+    "https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/convert_sparkmaker.py",
+    "https://codeberg.org/xythobuz/gcode-tools/raw/branch/master/tools/convert_sparkmaker.py"
+)
 %-->
 </pre>
 

input/projects/laser-engraver.md

@@ -275,7 +275,10 @@ But my script below should work for all variants I have seen up to now.
 
 <pre class="sh_python">
 <!--%
-include_url("https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/convert_lasergrbl.py")
+include_url(
+    "https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/convert_lasergrbl.py",
+    "https://codeberg.org/xythobuz/gcode-tools/raw/branch/master/tools/convert_lasergrbl.py"
+)
 %-->
 </pre>
 
@@ -338,7 +341,10 @@ I copy this file to the SD card, start it, and just abort it when I'm done with
 
 <pre class="sh_python">
 <!--%
-include_url("https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/outline_gcode.py")
+include_url(
+    "https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/outline_gcode.py",
+    "https://codeberg.org/xythobuz/gcode-tools/raw/branch/master/tools/outline_gcode.py"
+)
 %-->
 </pre>
 
@@ -349,7 +355,10 @@ It's drawing a grid for reference on the base plate of the machine, including nu
 
 <pre class="sh_python">
 <!--%
-include_url("https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/generators/grid_gcode.py")
+include_url(
+    "https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/generators/grid_gcode.py",
+    "https://codeberg.org/xythobuz/gcode-tools/raw/branch/master/generators/grid_gcode.py"
+)
 %-->
 </pre>
 
@@ -375,7 +384,10 @@ As I grew tired of removing, flashing and re-inserting of the SD card, I decided
 
 <pre class="sh_python">
 <!--%
-include_url("https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/send_gcode.py")
+include_url(
+    "https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/tools/send_gcode.py",
+    "https://codeberg.org/xythobuz/gcode-tools/raw/branch/master/tools/send_gcode.py"
+)
 %-->
 </pre>
 
@@ -390,7 +402,10 @@ I then made another Python script go generate G-Code for a cutting test, varying
 
 <pre class="sh_python">
 <!--%
-include_url("https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/generators/cut_test_gcode.py")
+include_url(
+    "https://git.xythobuz.de/thomas/gcode-tools/raw/branch/master/generators/cut_test_gcode.py",
+    "https://codeberg.org/xythobuz/gcode-tools/raw/branch/master/generators/cut_test_gcode.py"
+)
 %-->
 </pre>
 

input/projects/osci_music_player.md

@@ -2,6 +2,7 @@ title: Oscilloscope Music Player
 description: Properly playing sound files for visualization on an oscilloscope
 parent: projects
 git: https://git.xythobuz.de/thomas/osci-music-player
+github: https://github.com/xythobuz/osci-music-player
 date: 2024-02-11
 update: 2024-03-08
 comments: true
@@ -257,7 +258,10 @@ Here is [`~/osci-pi.py`](https://git.xythobuz.de/thomas/osci-music-player/raw/br
 
 <pre id="oscipipy" class="sh_python">
 <!--%
-include_url("https://git.xythobuz.de/thomas/osci-music-player/raw/branch/master/osci-pi.py")
+include_url(
+    "https://git.xythobuz.de/thomas/osci-music-player/raw/branch/master/osci-pi.py",
+    "https://raw.githubusercontent.com/xythobuz/osci-music-player/refs/heads/master/osci-pi.py"
+)
 %-->
 </pre>
 
@@ -267,7 +271,10 @@ Adjust the username and path accordingly.
 
 <pre id="osciservice" class="sh_desktop">
 <!--%
-include_url("https://git.xythobuz.de/thomas/osci-music-player/raw/branch/master/osci.service")
+include_url(
+    "https://git.xythobuz.de/thomas/osci-music-player/raw/branch/master/osci.service",
+    "https://raw.githubusercontent.com/xythobuz/osci-music-player/refs/heads/master/osci.service"
+)
 %-->
 </pre>
 

macros.py

@@ -509,9 +509,9 @@ def print_cnsl_error(s, url):
     sys.stderr.write("warning: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")
     sys.stderr.write("\n")
 
-def http_request(url):
+def http_request(url, timeout = 5):
     if PY3:
-        response = urllib.request.urlopen(url, timeout = 5)
+        response = urllib.request.urlopen(url, timeout = timeout)
     else:
         response = urllib.urlopen(url)
 
@@ -521,19 +521,20 @@ def http_request(url):
     data = response.read().decode("utf-8")
     return data
 
-def include_url(url, fallback = None):
+def include_url(url, fallback = None, timeout = 2):
     sys.stderr.write('sub    : fetching page "%s"\n' % url)
 
     if fallback == None:
         print_cnsl_error("include_url() without fallback option", url)
+        timeout = timeout * 3
 
     try:
-        data = http_request(url)
+        data = http_request(url, timeout)
     except Exception as e:
         if fallback != None:
-            sys.stderr.write('sub    : fetching fallback page "%s"\n' % url)
+            sys.stderr.write('sub    : fetching fallback page "%s"\n' % fallback)
             try:
-                data = http_request(fallback)
+                data = http_request(fallback, timeout * 3)
             except Exception as e:
                 print_cnsl_error(str(e), fallback)
                 return