Skip to content

Merge upstream PRs #322, #316, and the code portion of #309 - #2

Merged
ThoughtzThruKeyz merged 9 commits into
masterfrom
merge/upstream-prs
Aug 8, 2026
Merged

ThoughtzThruKeyz merged 9 commits into
masterfrom
merge/upstream-prs

Conversation

@ThoughtzThruKeyz

Copy link
Copy Markdown
Owner

Pulls in three open upstream PRs from Snd-R/komf. Two were merged whole; the third was taken in part, for reasons below.

Merged in full

#322 — mangabaka links .dev → .org
Verified before merging, since it changes a database download URL and not just display links:

  • https://api.mangabaka.dev/v1/series/1 → HTTP 500
  • https://api.mangabaka.org/v1/series/1 → HTTP 200, correctly-shaped payload (series 1 = "DICE")

The service genuinely moved. Four files, URL constants only.

#316 — graceful per-provider failure handling
A single failing metadata provider no longer aborts search/match for every other provider. One file.

Two notes for later, neither blocking:

  • MetadataService.kt uses metadataMatch.mapValues { it.value?.let { null } }, which always evaluates to null — an obfuscated mapValues { null }.
  • It converts hard provider failures into silently-null metadata, which can mask real breakage. Errors are logged and emitted as ProviderErrorEvent.

Merged in part

#309 — Kavita 0.9.x+ compatibility — code changes only.

The genuine fix is 12 lines across two files, and it is included:

  • treat HTTP 404 as resource-not-found alongside 204
  • pass libraryId to api/series/scan
  • switch cover reset to api/upload/chapter using KavitaCoverUploadRequest

The remaining ~2.1MB of that PR was excluded:

Excluded Why
3 .wasm blobs + minified komelia-app.js committed to komf-app/src/main/resources/komelia/ Opaque prebuilt binaries the server would ship to every browser loading the UI
Komelia submodule bump to bf519dcf That commit does not exist in Snd-R/Komelia (GitHub API returns 422), so the binaries above are built from unavailable source, and git submodule update would fail
Removal of the DefaultHeaders block Deletes Cross-Origin-Embedder-Policy: require-corp and Cross-Origin-Opener-Policy: same-origin
build-docker.ps1 Builds and pushes to loloky/komf, a third-party Docker Hub account
extension.md Links a Google Drive download of a prebuilt browser extension for side-loading
README changes Replaces official Chrome/Firefox store links with instructions to side-load that build

Result

7 source files changed, no binaries, no submodule movement, COEP/COOP headers intact.

Test plan

  • :komf-core:compileKotlinJvm — clean
  • :komf-mediaserver:compileKotlinJvm — clean
  • :komf-client:compileKotlinJvm — clean
  • :komf-app:compileKotlin — clean
  • Verified no .wasm/.ps1/submodule/resource files present in the diff
  • Runtime verification against a live Kavita 0.9.x instance
  • Runtime verification of MangaBaka database download from the .org host

sloth-of-all-trades and others added 9 commits July 7, 2026 08:56
When a metadata provider fails (403, 500, timeout, Cloudflare block),
the error is now caught and logged for that provider only. The search
/match / aggregation continues with remaining providers instead of
aborting the entire operation with a 500 error.

Fixes Snd-R#216
Verified: api.mangabaka.dev now returns HTTP 500 while api.mangabaka.org
returns valid series data, confirming the service moved domains.

Snd-R#322
Prevents a single failing metadata provider from aborting search and
match operations for all providers.

Snd-R#316
Cherry-picks only the source changes from upstream PR Snd-R#309, excluding
the prebuilt binaries, build scripts, docs, submodule bump, and the
removal of COEP/COOP headers that PR also contained.

- treat 404 as resource-not-found alongside 204
- pass libraryId to api/series/scan
- use api/upload/chapter with KavitaCoverUploadRequest for cover reset

Snd-R#309
…nly)

Takes only the source changes from upstream PR Snd-R#309. Deliberately
excludes the rest of that PR:
  - prebuilt .wasm/.js binaries committed to komf-app resources
  - Komelia submodule bump to bf519dcf, which does not exist in
    Snd-R/Komelia and would break submodule init
  - removal of Cross-Origin-Embedder-Policy / Cross-Origin-Opener-Policy
  - build-docker.ps1 pushing to a third-party Docker Hub account
  - extension.md linking a Google Drive extension download

Snd-R#309
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants