improve handling of external resources

input/blog/2024/2024_05_05_auto_project_docs.md

@@ -96,7 +96,10 @@ function copyEvent(id) {
 
 <pre id="generatedocs" class="sh_sh">
 <!--%
-include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/docs/generate_docs.sh")
+include_url(
+    "https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/docs/generate_docs.sh",
+    "https://github.com/xythobuz/lars/raw/314bf218ca5e958d6ffa825d92d702cb5431abf6/docs/generate_docs.sh"
+)
 %-->
 </pre>
 
@@ -109,7 +112,10 @@ Add the `.github/workflows/docs.yml` script:
 
 <pre id="docsyml" class="sh_yaml">
 <!--%
-include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/docs.yml")
+include_url(
+    "https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/docs.yml",
+    "https://github.com/xythobuz/lars/raw/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/docs.yml"
+)
 %-->
 </pre>
 
@@ -130,7 +136,10 @@ If you want to visualize 3D print files, do the same with `3dprint/generate_stls
 
 <pre id="generatestls" class="sh_sh">
 <!--%
-include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/3dprint/generate_stls.sh")
+include_url(
+    "https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/3dprint/generate_stls.sh",
+    "https://github.com/xythobuz/lars/raw/314bf218ca5e958d6ffa825d92d702cb5431abf6/3dprint/generate_stls.sh"
+)
 %-->
 </pre>
 
@@ -139,7 +148,10 @@ include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6
 
 <pre id="scadyml" class="sh_yaml">
 <!--%
-include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/scad.yml")
+include_url(
+    "https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/scad.yml",
+    "https://github.com/xythobuz/lars/raw/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/scad.yml"
+)
 %-->
 </pre>
 
@@ -158,7 +170,10 @@ If you want to generate gerber files from PCBs, do something similar with `pcb/g
 
 <pre id="generatefab" class="sh_sh">
 <!--%
-include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/pcb2/generate_fab.sh")
+include_url(
+    "https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/pcb2/generate_fab.sh",
+    "https://github.com/xythobuz/lars/raw/314bf218ca5e958d6ffa825d92d702cb5431abf6/pcb2/generate_fab.sh"
+)
 %-->
 </pre>
 
@@ -167,7 +182,10 @@ include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6
 
 <pre id="kicadyml" class="sh_yaml">
 <!--%
-include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/kicad.yml")
+include_url(
+    "https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/kicad.yml",
+    "https://github.com/xythobuz/lars/raw/314bf218ca5e958d6ffa825d92d702cb5431abf6/.github/workflows/kicad.yml"
+)
 %-->
 </pre>
 
@@ -180,7 +198,10 @@ If you want to visualize KiCad schematics and PCBs in 2D and 3D, add `pcb/genera
 
 <pre id="generateplot" class="sh_sh">
 <!--%
-include_url("https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/pcb2/generate_plot.sh")
+include_url(
+    "https://git.xythobuz.de/thomas/drumkit/raw/commit/314bf218ca5e958d6ffa825d92d702cb5431abf6/pcb2/generate_plot.sh",
+    "https://github.com/xythobuz/lars/raw/314bf218ca5e958d6ffa825d92d702cb5431abf6/pcb2/generate_plot.sh"
+)
 %-->
 </pre>
 

input/projects/auto_brightness.md

@@ -149,7 +149,10 @@ To alleviate this a bit I'm now using a [KWin script](https://develop.kde.org/do
 
 <pre class="sh_javascript">
 <!--%
-include_url("https://git.xythobuz.de/thomas/AutoBrightness/raw/branch/main/client/kwin_check.js")
+include_url(
+    "https://git.xythobuz.de/thomas/AutoBrightness/raw/branch/main/client/kwin_check.js",
+    "https://github.com/xythobuz/AutoBrightness/raw/refs/heads/main/client/kwin_check.js"
+)
 %-->
 </pre>
 

macros.py

@@ -510,32 +510,46 @@ def print_cnsl_error(s, url):
     sys.stderr.write("\n")
 
 def http_request(url):
-    sys.stderr.write('sub    : fetching %s\n' % url)
-
     if PY3:
-        try:
-            response = urllib.request.urlopen(url, timeout = 10)
-        except HTTPError as error:
-            print_cnsl_error("HTTPError: '%s'" % error, url)
-            return ""
-        except URLError as error:
-            print_cnsl_error("URLError: '%s'" % error, url)
-            return ""
+        response = urllib.request.urlopen(url, timeout = 5)
     else:
-        try:
-            response = urllib.urlopen(url)
-        except IOError as error:
-            print_cnsl_error("HTTPError: '%s'" % error, url)
-            return ""
+        response = urllib.urlopen(url)
 
     if response.getcode() != 200:
-        print_cnsl_error("invalid response code: " + str(response.getcode()), url)
-        return ""
+        raise RuntimeError("invalid response code: " + str(response.getcode()))
+
+    data = response.read().decode("utf-8")
+    return data
+
+def include_url(url, fallback = None):
+    sys.stderr.write('sub    : fetching page "%s"\n' % url)
+
+    if fallback == None:
+        print_cnsl_error("include_url() without fallback option", url)
+
+    try:
+        data = http_request(url)
+    except Exception as e:
+        if fallback != None:
+            sys.stderr.write('sub    : fetching fallback page "%s"\n' % url)
+            try:
+                data = http_request(fallback)
+            except Exception as e:
+                print_cnsl_error(str(e), fallback)
+                return
+        else:
+            print_cnsl_error(str(e), url)
+            return
+
+    if PY3:
+        encoded = html.escape(data)
     else:
-        data = response.read().decode("utf-8")
-        return data
+        encoded = cgi.escape(data)
+
+    print(encoded, end="")
 
 def restRequest(url):
+    sys.stderr.write('sub    : fetching REST "%s"\n' % url)
     data = json.loads(http_request(url))
     return data
 
@@ -583,14 +597,6 @@ def printLatestRelease(user, repo):
         print("<li><a href=\"" + a["browser_download_url"] + "\">" + a["name"] + "</a>" + ss)
     print("</ul></div>")
 
-def include_url(url):
-    data = http_request(url)
-    if PY3:
-        encoded = html.escape(data)
-    else:
-        encoded = cgi.escape(data)
-    print(encoded, end="")
-
 # -----------------------------------------------------------------------------
 # preconvert hooks
 # -----------------------------------------------------------------------------