Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Subscriptions can include
GEOSITE/GEOIPrules together withgeodata-modeand customgeox-urlsources. The current merger keeps the rules but discards those settings, so Mihomo can use the wrong database format or source and fail to start (for example,list google not found in GeoSite.dat).Preserve
geodata-mode,geodata-loader,geosite-matcher,geo-auto-update,geo-update-interval, and the completegeox-urlblock when generating the runtime YAML. Same-name settings inuser.yamlorothers.yamltake precedence over subscription values without introducing duplicate subscription keys. If custom configuration validation fails, the base fallback retains the original subscription geodata settings. Temporary fragments are removed during finalization.This does not replace existing cached databases: an installation with an incompatible cached dataset still needs to refresh that dataset once. It prevents configuration generation from discarding the subscription settings again.
Validation:
sh tests/clash_geodata.sh; fails on the unmodifieddevbranch and passes with this change./bin/sh, and BusyBoxsh; shell syntax andgit diff --checkpassed.GEOSITE,GOOGLE,DIRECTandGEOIP,GOOGLE,DIRECTwith Mihomo v1.19.11 and full geodata: configuration test successful.