diff --git a/pack.py b/pack.py index 16baa19..50b582f 100644 --- a/pack.py +++ b/pack.py @@ -240,6 +240,24 @@ def head_ok(url): return e.code, None +def fetch_md5(url): + """Download the published asset and hash it -- exactly what Jellyfin does. + + This is the check that catches a manifest whose checksum no longer matches the + uploaded zip (a real failure mode: the install then dies with + "The checksum of the received data doesn't match."). + """ + h = hashlib.md5() + req = urllib.request.Request(url, method="GET") + with urllib.request.urlopen(req, timeout=300) as resp: + while True: + chunk = resp.read(1 << 20) + if not chunk: + break + h.update(chunk) + return h.hexdigest().upper() + + # ---------------------------------------------------------------- steps @@ -275,11 +293,25 @@ def verify_embedded(dll): def make_zip(dll, target_abi): + """Package the DLL the way Jellyfin expects: one file, named after the assembly. + + The entry gets a fixed timestamp on purpose. zip stores mtimes, so packaging + the same DLL twice would otherwise produce different bytes, a different MD5, + and a manifest checksum that no longer matches the already-uploaded asset. + """ os.makedirs(OUT_DIR, exist_ok=True) asset = "%s_%s.zip" % (ASSEMBLY, target_abi) path = os.path.join(OUT_DIR, asset) - with zipfile.ZipFile(path, "w", zipfile.ZIP_DEFLATED) as zf: - zf.write(dll, ASSEMBLY + ".dll") + + info = zipfile.ZipInfo(ASSEMBLY + ".dll", date_time=(1980, 1, 1, 0, 0, 0)) + info.compress_type = zipfile.ZIP_DEFLATED + info.external_attr = 0o644 << 16 + + with open(dll, "rb") as fh: + payload = fh.read() + with zipfile.ZipFile(path, "w") as zf: + zf.writestr(info, payload) + print("packaged %s (%d bytes)" % (path, os.path.getsize(path))) return path, asset @@ -383,6 +415,13 @@ def main(): if status != 200: sys.exit("the asset is not downloadable -- is the release a draft?") + # What Jellyfin will do at install time: download it and compare MD5. + live = fetch_md5(entry["sourceUrl"]) + if live != checksum: + sys.exit("published asset md5 %s != manifest checksum %s -- install would fail" + % (live, checksum)) + print("asset md5 matches the manifest checksum (%s)" % live) + if not args.no_push: run(["git", "add", "manifest.json", "plugin/build.yaml"], cwd=HERE) dirty = subprocess.run( diff --git a/plugin/Jellyfin.Plugin.JFVR/Services/ScriptInjectionStartupFilter.cs b/plugin/Jellyfin.Plugin.JFVR/Services/ScriptInjectionStartupFilter.cs index 383bd97..a955e02 100644 --- a/plugin/Jellyfin.Plugin.JFVR/Services/ScriptInjectionStartupFilter.cs +++ b/plugin/Jellyfin.Plugin.JFVR/Services/ScriptInjectionStartupFilter.cs @@ -38,6 +38,7 @@ public sealed class ScriptInjectionStartupFilter : IStartupFilter private readonly BundleProvider _bundle; private readonly ILogger _logger; private int _loggedOnce; + private int _legacyLoggedOnce; /// /// Initializes a new instance of the class. @@ -158,9 +159,15 @@ public sealed class ScriptInjectionStartupFilter : IStartupFilter var rewritten = IndexHtmlRewriter.Rewrite(html, scriptUrl, out var removedLegacy); - if (removedLegacy) + if (removedLegacy && Interlocked.Exchange(ref _legacyLoggedOnce, 1) == 0) { - _logger.LogInformation("JFVR: removed the legacy deploy.py