Skip to content

Fix custom Geo resource URLs #2226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imzihuailin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix custom Geo resource URLs #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/enum/enum.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,9 @@ enum GeoResource {
MMDB,
@JsonValue('asn')
ASN,
@JsonValue('geo-ip')
@JsonValue('geoip')
GEOIP,
@JsonValue('geo-site')
@JsonValue('geosite')
GEOSITE;

static GeoResource fromJson(String value) {
Expand All @@ -357,8 +357,8 @@ extension GeoResourceExt on GeoResource {
return switch (this) {
GeoResource.MMDB => 'mmdb',
GeoResource.ASN => 'asn',
GeoResource.GEOIP => 'geo-ip',
GeoResource.GEOSITE => 'geo-site',
GeoResource.GEOIP => 'geoip',
GeoResource.GEOSITE => 'geosite',
};
}

Expand Down
8 changes: 4 additions & 4 deletions test/models/config_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ void main() {
test('exposes lowercase GeoResource values', () {
expect(GeoResource.MMDB.value, 'mmdb');
expect(GeoResource.ASN.value, 'asn');
expect(GeoResource.GEOIP.value, 'geo-ip');
expect(GeoResource.GEOSITE.value, 'geo-site');
expect(GeoResource.GEOIP.value, 'geoip');
expect(GeoResource.GEOSITE.value, 'geosite');
});

test('parses current lowercase GeoResource keys from config JSON', () {
Expand Down Expand Up @@ -66,7 +66,7 @@ void main() {
geoXUrl: {GeoResource.GEOIP: 'https://example.com/geoip.dat'},
).toJson();

expect(json['geox-url'], {'geo-ip': 'https://example.com/geoip.dat'});
expect(json['geox-url'], {'geoip': 'https://example.com/geoip.dat'});
});

test('converts geoXUrl map to raw config map', () {
Expand All @@ -77,7 +77,7 @@ void main() {

expect(geoXUrl.raw, {
'mmdb': 'https://example.com/mmdb',
'geo-site': 'https://example.com/geosite.dat',
'geosite': 'https://example.com/geosite.dat',
});
});

Expand Down