diff --git a/anime/multisrc/dopeflix/dopeflix.dart b/anime/multisrc/dopeflix/dopeflix.dart index bf9a639b..2f389574 100644 --- a/anime/multisrc/dopeflix/dopeflix.dart +++ b/anime/multisrc/dopeflix/dopeflix.dart @@ -82,7 +82,7 @@ class DopeFlix extends MProvider { @override Future getDetail(MSource source, String url) async { - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url"))) .body; @@ -146,7 +146,7 @@ class DopeFlix extends MProvider { @override Future> getVideoList(MSource source, String url) async { - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}/$url"))) .body; diff --git a/anime/src/all/animeworldindia/animeworldindia.dart b/anime/src/all/animeworldindia/animeworldindia.dart index 353f5979..7be85eef 100644 --- a/anime/src/all/animeworldindia/animeworldindia.dart +++ b/anime/src/all/animeworldindia/animeworldindia.dart @@ -168,18 +168,6 @@ class AnimeWorldIndia extends MProvider { return sortVideos(videos, source.id); } - String getUrlWithoutDomain(String orig) { - final uri = Uri.parse(orig.replaceAll(' ', '%20')); - String out = uri.path; - if (uri.query.isNotEmpty) { - out += '?${uri.query}'; - } - if (uri.fragment.isNotEmpty) { - out += '#${uri.fragment}'; - } - return out; - } - MPages parseAnimeList(String res, String baseUrl) { List animeList = []; final document = parseHtml(res); diff --git a/anime/src/de/aniflix/aniflix.dart b/anime/src/de/aniflix/aniflix.dart index 9dbb811c..da028625 100644 --- a/anime/src/de/aniflix/aniflix.dart +++ b/anime/src/de/aniflix/aniflix.dart @@ -147,18 +147,6 @@ class AniFlix extends MProvider { return sortVideos(videos, source.id); } - String getUrlWithoutDomain(String orig) { - final uri = Uri.parse(orig.replaceAll(' ', '%20')); - String out = uri.path; - if (uri.query.isNotEmpty) { - out += '?${uri.query}'; - } - if (uri.fragment.isNotEmpty) { - out += '#${uri.fragment}'; - } - return out; - } - MPages parseAnimeList(String res, String baseUrl, bool hasNextPage) { final datas = json.decode(res); List animeList = []; diff --git a/anime/src/en/dramacool/dramacool.dart b/anime/src/en/dramacool/dramacool.dart index dbe99c6b..19274f84 100644 --- a/anime/src/en/dramacool/dramacool.dart +++ b/anime/src/en/dramacool/dramacool.dart @@ -42,14 +42,14 @@ class DramaCool extends MProvider { final statusList = [ {"Ongoing": 0, "Completed": 1} ]; - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); if (url.contains("-episode-") && url.endsWith(".html")) { final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url"))) .body; url = parseHtml(res).selectFirst("div.category a").attr("href"); } - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url"))) @@ -101,7 +101,7 @@ class DramaCool extends MProvider { @override Future> getVideoList(MSource source, String url) async { - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url"))) diff --git a/anime/src/en/uhdmovies/uhdmovies.dart b/anime/src/en/uhdmovies/uhdmovies.dart index b09f892e..354bde59 100644 --- a/anime/src/en/uhdmovies/uhdmovies.dart +++ b/anime/src/en/uhdmovies/uhdmovies.dart @@ -33,7 +33,7 @@ class UHDMovies extends MProvider { @override Future getDetail(MSource source, String url) async { - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}${url}"))) .body; diff --git a/anime/src/fr/animesama/animesama.dart b/anime/src/fr/animesama/animesama.dart index 35e9e831..aa59c97b 100644 --- a/anime/src/fr/animesama/animesama.dart +++ b/anime/src/fr/animesama/animesama.dart @@ -106,7 +106,7 @@ class AnimeSama extends MProvider { @override Future getDetail(MSource source, String url) async { var animeUrl = - "${source.baseUrl}${substringBeforeLast(Uri.parse(url).path, "/")}"; + "${source.baseUrl}${substringBeforeLast(getUrlWithoutDomain(url), "/")}"; var movie = int.tryParse(url.split("#").length >= 2 ? url.split("#")[1] : ""); List> playersList = []; diff --git a/anime/src/hi/yomovies/yomovies.dart b/anime/src/hi/yomovies/yomovies.dart index c1f61883..4abe8380 100644 --- a/anime/src/hi/yomovies/yomovies.dart +++ b/anime/src/hi/yomovies/yomovies.dart @@ -57,7 +57,7 @@ class YoMovies extends MProvider { @override Future getDetail(MSource source, String url) async { - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url"))) @@ -97,7 +97,7 @@ class YoMovies extends MProvider { @override Future> getVideoList(MSource source, String url) async { - url = Uri.parse(url).path; + url = getUrlWithoutDomain(url); final res = (await client.get(Uri.parse("${preferenceBaseUrl(source.id)}$url"))) .body; diff --git a/manga/multisrc/mangareader/mangareader.dart b/manga/multisrc/mangareader/mangareader.dart index 6f3342a4..804bd8ff 100644 --- a/manga/multisrc/mangareader/mangareader.dart +++ b/manga/multisrc/mangareader/mangareader.dart @@ -314,18 +314,6 @@ class MangaReader extends MProvider { } return "/manga"; } - - String getUrlWithoutDomain(String orig) { - final uri = Uri.parse(orig.replaceAll(' ', '%20')); - String out = uri.path; - if (uri.query.isNotEmpty) { - out += '?${uri.query}'; - } - if (uri.fragment.isNotEmpty) { - out += '#${uri.fragment}'; - } - return out; - } } MangaReader main() {