Skip to content

Commit

Permalink
fix moviesapi supplier
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrii Pyvovarov committed Sep 3, 2024
1 parent 05116ab commit 8f730bd
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 28 deletions.
2 changes: 0 additions & 2 deletions lib/content_suppliers/content_suppliers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'dart:isolate';
import 'package:cloud_hook/content_suppliers/suppliers/animeua/animeua.dart';
import 'package:cloud_hook/content_suppliers/suppliers/anitaku/anitaku.dart';
import 'package:cloud_hook/content_suppliers/suppliers/anitube/anitube.dart';
import 'package:cloud_hook/content_suppliers/suppliers/aniwave/aniwave.dart';
import 'package:cloud_hook/content_suppliers/suppliers/eneyida/eneyida.dart';
import 'package:cloud_hook/content_suppliers/suppliers/hianime/hianime.dart';
import 'package:cloud_hook/content_suppliers/suppliers/mangadex/mangadex.dart';
Expand All @@ -24,7 +23,6 @@ class ContentSuppliers {
TmdbSupplier(),
Anitaku(),
HianimeSupplier(),
AniWaveSupplier(),
MangaDexSupllier(),
EneyidaSupplier(),
UASerialSupplier(),
Expand Down
2 changes: 1 addition & 1 deletion lib/content_suppliers/extrators/source/moviesapi.dart
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class MoviesapiSourceLoader implements ContentMediaItemSourceLoader {
static const baseUrl = "https://moviesapi.club";
static const iframeBaseUrl = "https://w1.moviesapi.club";

static final _aesRegExp = RegExp(r"JScripts\s+=\s+'(?<aes>[^']+)'");
static final _aesRegExp = RegExp(r"\s+=\s+'(?<aes>[^']+)'");
static final _sourcesConfigRegExp = RegExp(r'sources:\s+(?<arr>[^\]]+\])');
static final _tracksConfigRegExp = RegExp(r'tracks:\s+(?<arr>[^\]]+\])');

Expand Down
14 changes: 8 additions & 6 deletions lib/content_suppliers/extrators/source/two_embed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ class TwoEmbedSourceLoader implements ContentMediaItemSourceLoader {
return [];
}

final packedScript = await Scrapper(
uri: Uri.https(playerHost, "/e/$id"),
headers: {
"Referer": ref,
},
).scrap(Filter(
final scrapper = Scrapper(
uri: Uri.https(playerHost, "/e/$id"),
headers: {
"Referer": ref,
},
);

final packedScript = await scrapper.scrap(Filter(
Iterate(itemScope: "script", item: TextSelector()),
filter: (script) => script.startsWith("eval("),
)) ??
Expand Down
1 change: 0 additions & 1 deletion lib/content_suppliers/suppliers/tmdb/tmdb.dart
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ class TmdbSupplier extends ContentSupplier {
MoviesapiSourceLoader(tmdb: tmdb, season: season, episode: episode),
MultiembedSourceLoader(tmdb: tmdb, season: season, episode: episode),
if (imdb != null) ...[
VidSrcToSourceLoader(imdb: imdb, season: season, episode: episode),
TwoEmbedSourceLoader(imdb: imdb, season: season, episode: episode),
]
]),
Expand Down
28 changes: 14 additions & 14 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -774,11 +774,11 @@ packages:
dependency: "direct main"
description:
path: media_kit
ref: "50c510d"
resolved-ref: "50c510d018cc5286eb6730f3ea165290f19dc5f6"
ref: e41e50c
resolved-ref: e41e50c8cfb370e69612b205dcfd9f3ca80690f5
url: "https://github.com/media-kit/media-kit"
source: git
version: "1.1.10+1"
version: "1.1.11"
media_kit_libs_android_video:
dependency: transitive
description:
Expand Down Expand Up @@ -815,37 +815,37 @@ packages:
dependency: "direct main"
description:
path: "libs/universal/media_kit_libs_video"
ref: "50c510d"
resolved-ref: "50c510d018cc5286eb6730f3ea165290f19dc5f6"
ref: e41e50c
resolved-ref: e41e50c8cfb370e69612b205dcfd9f3ca80690f5
url: "https://github.com/media-kit/media-kit"
source: git
version: "1.0.4"
version: "1.0.5"
media_kit_libs_windows_video:
dependency: transitive
description:
name: media_kit_libs_windows_video
sha256: "7bace5f35d9afcc7f9b5cdadb7541d2191a66bb3fc71bfa11c1395b3360f6122"
sha256: "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887"
url: "https://pub.dev"
source: hosted
version: "1.0.9"
version: "1.0.10"
media_kit_native_event_loop:
dependency: "direct overridden"
description:
path: media_kit_native_event_loop
ref: "50c510d"
resolved-ref: "50c510d018cc5286eb6730f3ea165290f19dc5f6"
ref: e41e50c
resolved-ref: e41e50c8cfb370e69612b205dcfd9f3ca80690f5
url: "https://github.com/media-kit/media-kit"
source: git
version: "1.0.8"
version: "1.0.9"
media_kit_video:
dependency: "direct main"
description:
path: media_kit_video
ref: "50c510d"
resolved-ref: "50c510d018cc5286eb6730f3ea165290f19dc5f6"
ref: e41e50c
resolved-ref: e41e50c8cfb370e69612b205dcfd9f3ca80690f5
url: "https://github.com/media-kit/media-kit"
source: git
version: "1.2.4"
version: "1.2.5"
meta:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: cloud_hook
description: "Cloud Hooks"
publish_to: 'none'
version: 1.3.5
version: 1.3.6

isar_version: &isar_version 3.1.8
media_kit_version: &media_kit_version 50c510d
media_kit_version: &media_kit_version e41e50c

environment:
sdk: ">=3.0.0 <4.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:test/test.dart';

void main() async {
test('moviesapi should return sources', () async {
final sources = await MoviesapiSourceLoader(tmdb: 958196).call();
final sources = await MoviesapiSourceLoader(tmdb: 385687).call();
expect(sources, isNotEmpty);
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:test/test.dart';

void main() {
test('two embed should return sources', () async {
final sources = await TwoEmbedSourceLoader(imdb: "tt0088247").call();
final sources = await TwoEmbedSourceLoader(imdb: "tt10676048").call();
expect(sources, isNotEmpty);
});
}

0 comments on commit 8f730bd

Please sign in to comment.