fixed stuff included a fully working downloader for webpages which inlines the css / js. images do not work because they are hosted on the server

This commit is contained in:
2025-09-30 19:01:59 +02:00
parent 1f46207a64
commit f50d8f9d69
4 changed files with 64 additions and 20 deletions

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@ __pycache__
env
target
Cargo.lock
.idea

View File

@@ -16,6 +16,10 @@
<script src="https://cdn.jsdelivr.net/npm/prismjs/components/prism-python.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/prismjs/components/prism-javascript.min.js"></script>
<!-- JSZip for downloading the files as ZIP -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.11.0/jszip.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/2.0.5/FileSaver.min.js"></script>
<!-- remove if causing issues -->
<script src="../js/post/lazyimg.js"></script>
<script src="../js/shared/theme.js"></script>
@@ -50,8 +54,15 @@
<img src="../css/icons/magnifier.webp" width="16" height="16" alt="Hash2" loading="lazy" style="display:inline; vertical-align:middle;" />
Hash 2 (<b>Windows-1252</b>)<i>:{{ hash2 }}</i><br />
<img src="../css/icons/save.webp" width="16" height="16" alt="Hash2" loading="lazy" style="display:inline; vertical-align:middle;" />
<a id="download-md">Download as Markdown <noscript>Enable JavaScript for downloads</noscript></a>
<span style="display: inline-flex; align-items: center; gap: 8px;">
<img src="../css/icons/save.webp" width="16" height="16" alt="Save" loading="lazy" />
<a id="download-md">Download as Markdown <noscript>Enable JavaScript for downloads</noscript></a>
<span style="border-left: 1px solid #888; height: 16px;"></span> <!-- Vertical separator -->
<img src="../css/icons/script.webp" width="16" height="16" alt="Script" loading="lazy" />
<a id="download-html">Download as HTML <noscript>Enable JavaScript for downloads</noscript></a>
</span>
</footer>
</body>
</html>

View File

@@ -1,18 +1,50 @@
document.addEventListener("DOMContentLoaded", () => {
// current page URL
let url = window.location.href;
const htmlDownload = document.getElementById("download-html");
// replace `/html/` with `/markdown/`
url = url.replace("/html/", "/markdown/");
htmlDownload.addEventListener("click", async (e) => {
e.preventDefault();
// replace `.html` with `.md`
url = url.replace(/\.html$/, ".md");
const linkElements = document.querySelectorAll('link[rel="stylesheet"]');
for (const link of linkElements) {
const href = link.getAttribute("href");
try {
const res = await fetch(href);
const cssText = await res.text();
const styleEl = document.createElement("style");
styleEl.textContent = cssText;
document.head.appendChild(styleEl);
link.remove(); // remove original link
} catch (err) {
console.error("Failed to inline CSS:", href, err);
}
}
// assign to <a>
const a = document.getElementById("download-md");
a.href = url;
const scriptElements = document.querySelectorAll('script[src]');
for (const script of scriptElements) {
const src = script.getAttribute("src");
try {
const res = await fetch(src);
const jsText = await res.text();
const inlineScript = document.createElement("script");
inlineScript.textContent = jsText;
document.body.appendChild(inlineScript);
script.remove(); // remove original script
} catch (err) {
console.error("Failed to inline JS:", src, err);
}
}
// suggest filename
const filename = url.split("/").pop(); // e.g. markdowntest.md
a.download = filename;
const htmlContent = document.documentElement.outerHTML;
const blob = new Blob([htmlContent], { type: "text/html" });
const url = URL.createObjectURL(blob);
const a = document.createElement("a");
a.href = url;
a.download = "index.html"; // or derive from URL
document.body.appendChild(a);
a.click();
a.remove();
setTimeout(() => URL.revokeObjectURL(url), 1000);
});
});

View File

@@ -139,8 +139,8 @@ class MyHandler(BaseHTTPRequestHandler):
logger.log_info(f"Served markdown file: {markdown_filename}")
return
except Exception as e:
logger.log_error(f"Error serving markdown file {markdown_filename}: {e}")
except Exception as err:
logger.log_error(f"Error serving markdown file {markdown_filename}: {err}")
self.send_response(500)
self.end_headers()
self.wfile.write(b"500 - Internal Server Error")
@@ -166,8 +166,8 @@ class MyHandler(BaseHTTPRequestHandler):
if mime_type == "application/javascript" or file_path.endswith(".js"):
try:
content = jsmin(content.decode("utf-8")).encode("utf-8")
except Exception as e:
logger.log_error(f"Error minifying JS file {file_path}: {e}")
except Exception as err:
logger.log_error(f"Error minifying JS file {file_path}: {err}")
self.send_response(200)
self.send_header("Content-type", mime_type)
@@ -190,7 +190,7 @@ if __name__ == "__main__":
logger.log_debug("Started PyPost.py in background watcher thread.")
server_address = ("localhost", 8000)
httpd = HTTPServer(server_address, MyHandler)
httpd: HTTPServer = HTTPServer(server_address, MyHandler) # type: ignore[arg-type]
logger.log_info(f"Serving on http://{server_address[0]}:{server_address[1]}")
httpd.serve_forever()
except (Exception, KeyboardInterrupt) as e: