Merge pull request #8 from kodify-js/aniwave-fix

Refactor aniwave season play fix

Author: kodify-js

lib/api/api.dart

@@ -390,8 +390,10 @@ class Api {
             seasons: []);
         if (type == ContentType.tv.value) {
           for (var data in (response['seasons'] as List)) {
-            Season season =
-                Season(id: data['id'], season: data['season_number']);
+            Season season = Season(
+                id: data['id'],
+                season: data['season_number'],
+                airDate: data['air_date']);
             content.seasons?.add(season);
           }
         }
@@ -428,7 +430,6 @@ class Api {
       final response = jsonDecode(data.body);
       if (response['status_code'] != null)
         throw Exception("Failed to fetch data");
-
       final List<Episode> episodes = (response['episodes'] as List)
           .where((episode) => episode['still_path'] != null)
           .map((episode) => Episode(

lib/api/class/content_class.dart

@@ -6,34 +6,34 @@ part 'content_class.g.dart';
 class Contentclass {
   @HiveField(0)
   final int id;
-  
+
   @HiveField(1)
   final String backdrop;
-  
+
   @HiveField(2)
   final String title;
-  
+
   @HiveField(3)
   final String language;
-  
+
   @HiveField(4)
   final List<dynamic> genres;
-  
+
   @HiveField(5)
   final String type;
-  
+
   @HiveField(6)
   final String description;
-  
+
   @HiveField(7)
   final String poster;
-  
+
   @HiveField(8)
   String? logoPath;
-  
+
   @HiveField(9)
   double? rating;
-  
+
   @HiveField(10)
   List<Season>? seasons;
 
@@ -90,26 +90,32 @@ class Contentclass {
 class Season {
   @HiveField(0)
   final int id;
-  
+
   @HiveField(1)
   final int season;
 
+  @HiveField(2)
+  final String? airDate;
+
   Season({
     required this.id,
     required this.season,
+    this.airDate,
   });
 
   Map<String, dynamic> toJson() {
     return {
       'id': id,
       'season': season,
+      'airDate': airDate,
     };
   }
 
   factory Season.fromJson(Map<String, dynamic> json) {
     return Season(
       id: json['id'] as int,
       season: json['season'] as int,
+      airDate: json['airDate'] as String?,
     );
   }
-}
+}

lib/api/class/episode_class.dart

@@ -1,4 +1,4 @@
-class Episode{
+class Episode {
   final int id;
   final String name;
   final int episode;
@@ -13,6 +13,6 @@ class Episode{
     required this.season,
     required this.description,
     required this.airDate,
-    required this.image
+    required this.image,
   });
-}
+}

lib/api/contentproviders/anime_providers/aniwave.dart

@@ -26,11 +26,13 @@ class Aniwave {
   final String? name;
   bool isError = false;
   final List? animeEpisodes;
+  final String? airDate;
   Aniwave(
       {required this.title,
       required this.type,
       this.episodeNumber,
       this.seasonNumber,
+      this.airDate,
       this.name = 'Aniwave',
       this.animeEpisodes});
 
@@ -84,9 +86,11 @@ class Aniwave {
     try {
       List episode = animeEpisodes ?? [];
       final List<StreamClass> streams = [];
+      print(
+          'https://aniwave.at/catalog?keyword=$title${airDate != null ? ("&year=${airDate?.split("-").first}") : ""}');
       if (episode.isEmpty) {
-        final data = await http
-            .get(Uri.parse('https://aniwave.at/catalog?keyword=$title'));
+        final data = await http.get(Uri.parse(
+            'https://aniwave.at/catalog?keyword=$title${airDate != null ? ("&year=${airDate?.split("-").first}") : ""}'));
         final document = parse(data.body);
         final results = document.querySelectorAll("div.mt-6 div.grid a");
         if (results.isEmpty)

lib/api/contentproviders/contentprovider.dart

@@ -39,12 +39,15 @@ class ContentProvider {
 
   final bool? isAnime;
 
+  final String? airDate;
+
   ContentProvider(
       {required this.id,
       required this.type,
       required this.title,
       this.isAnime = false,
       this.episodeNumber,
+      this.airDate,
       this.seasonNumber,
       this.animeEpisode});
 
@@ -88,6 +91,7 @@ class ContentProvider {
   Aniwave get aniwave => Aniwave(
       title: title,
       type: type,
+      airDate: airDate,
       episodeNumber: episodeNumber,
       seasonNumber: seasonNumber,
       animeEpisodes: animeEpisode);

lib/api/contentproviders/movie-tv_providers/embed.dart

@@ -87,8 +87,8 @@ class Embed {
         "Accept": "*/*"
       }).timeout(const Duration(seconds: 5));
       final data = jsonDecode(response.body);
-      final sourceUrl =
-          data['source'].toString().replaceAll("embed.su/api/proxy/viper/", "");
+      print(data);
+      final sourceUrl = data['source'].toString();
       final sources = await _getSources(url: sourceUrl);
       return StreamClass(
           language: 'original',
@@ -114,13 +114,20 @@ class Embed {
         return [SourceClass(quality: "Auto", url: url)];
       }
 
-      final response = await http.get(Uri.parse(url));
+      final response = await http.get(Uri.parse(url), headers: {
+        "Referer": baseUrl,
+        "User-Agent":
+            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
+        "Accept": "*/*"
+      });
+      print(response.body);
       final sources = _parseM3U8Playlist(response.body, url);
       if (sources.isEmpty) throw "No valid sources found";
       isError = false;
       return sources;
     } catch (e) {
       isError = true;
+      print("Error: $e");
       return [];
     }
   }
@@ -133,7 +140,7 @@ class Embed {
       if (lines[i].contains('#EXT-X-STREAM-INF')) {
         final quality = _extractQuality(lines[i]);
         if (quality != null && i + 1 < lines.length) {
-          final streamUrl = _resolveStreamUrl(lines[i + 1], baseUrl);
+          final streamUrl = _resolveStreamUrl(lines[i + 1]);
           sources.add(SourceClass(quality: quality, url: streamUrl));
         }
       }
@@ -147,10 +154,9 @@ class Embed {
     return match?.group(1);
   }
 
-  String _resolveStreamUrl(String streamUrl, String baseUrl) {
-    final resolvedUri = streamUrl
-        .replaceAll("/api/proxy/viper/", "https://")
-        .replaceAll(".png", ".m3u8");
+  String _resolveStreamUrl(String streamUrl) {
+    final resolvedUri =
+        Uri.parse(baseUrl).resolve(streamUrl.replaceAll('.png', '.m3u8'));
     return resolvedUri.toString();
   }
 }

lib/api/contentproviders/movie-tv_providers/vidsrcsu.dart

@@ -113,6 +113,7 @@ class VidSrcSu {
               ? _resolveStreamUrl(
                   lines[i + 1].split('./')[1].trim(), lines[i + 1])
               : lines[i + 1];
+          print('Stream URL: $streamUrl');
           sources.add(SourceClass(quality: quality, url: streamUrl));
         }
       }

lib/components/carousel.dart

@@ -217,7 +217,7 @@ class Carousel extends StatelessWidget {
       MaterialPageRoute(
         builder: (context) => Infopage(
           id: data.id,
-          name: data.title,
+          title: data.title,
           type: data.type,
         ),
       ),

lib/components/episodes_list.dart

@@ -8,7 +8,9 @@ import 'package:moviedex/pages/watch_page.dart';
 class EpisodesList extends StatefulWidget {
   final Episode episode;
   final Contentclass data;
-  const EpisodesList({super.key,required this.episode,required this.data}); 
+  final String? airDate;
+  const EpisodesList(
+      {super.key, required this.episode, required this.data, this.airDate});
 
   @override
   State<EpisodesList> createState() => _EpisodesListState();
@@ -24,19 +26,27 @@ class _EpisodesListState extends State<EpisodesList> {
     super.initState();
     Hive.openBox(widget.data.title).then((value) => storage = value);
   }
+
   @override
   Widget build(BuildContext context) {
     final width = MediaQuery.of(context).size.width;
-    final isMobile = width<600;
+    final isMobile = width < 600;
     final episode = widget.episode;
     return GestureDetector(
       onTapDown: (_) => setState(() => isPressed = true),
       onTapUp: (_) => setState(() => isPressed = false),
       onTapCancel: () => setState(() => isPressed = false),
-      onTap: (){
-        hivePut(storage:storage,key: "episode",value: 'E${episode.episode}');
-        hivePut(storage: storage,key: "season",value: 'S${episode.season}');
-        Navigator.of(context).push(MaterialPageRoute(builder: (context) => WatchPage(data: widget.data,episodeNumber: episode.episode,seasonNumber: episode.season,title: episode.name,)));
+      onTap: () {
+        hivePut(storage: storage, key: "episode", value: 'E${episode.episode}');
+        hivePut(storage: storage, key: "season", value: 'S${episode.season}');
+        Navigator.of(context).push(MaterialPageRoute(
+            builder: (context) => WatchPage(
+                  data: widget.data,
+                  episodeNumber: episode.episode,
+                  seasonNumber: episode.season,
+                  airDate: widget.airDate,
+                  title: episode.name,
+                )));
       },
       child: MouseRegion(
         cursor: SystemMouseCursors.click,
@@ -52,49 +62,70 @@ class _EpisodesListState extends State<EpisodesList> {
               spacing: 8,
               children: [
                 Card(
-                  clipBehavior: Clip.antiAlias,
-                  shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  child: Stack(
-                    alignment: Alignment.center,
-                    children: [
-                      Image.network(episode.image,fit: BoxFit.cover,width: isMobile?width/2.5:200,height: 100,),
-                      Container(
-                        width: isMobile?width/2.5:200,
-                        height: 100,
-                        color: Colors.black.withValues(alpha: 0.3),
-                        child: const Center(
-                          child: Icon(
-                            Icons.play_circle_outline_rounded,
-                            size: 42,
-                            color: Colors.white,
+                    clipBehavior: Clip.antiAlias,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    child: Stack(
+                      alignment: Alignment.center,
+                      children: [
+                        Image.network(
+                          episode.image,
+                          fit: BoxFit.cover,
+                          width: isMobile ? width / 2.5 : 200,
+                          height: 100,
+                        ),
+                        Container(
+                          width: isMobile ? width / 2.5 : 200,
+                          height: 100,
+                          color: Colors.black.withValues(alpha: 0.3),
+                          child: const Center(
+                            child: Icon(
+                              Icons.play_circle_outline_rounded,
+                              size: 42,
+                              color: Colors.white,
+                            ),
                           ),
                         ),
-                      ),
-                    ],
-                  )
-                ),
+                      ],
+                    )),
                 SizedBox(
-                  width: width/2,
+                  width: width / 2,
                   child: Column(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text('${episode.episode}. ${episode.name}',maxLines: 2,style: TextStyle(fontSize: 20,fontWeight: FontWeight.bold,overflow: TextOverflow.ellipsis),),
-                      Text("Season ${episode.season} Episode ${episode.episode}",style: TextStyle(fontSize: 16,color: Colors.grey)),
-                      Text(episode.airDate,style: TextStyle(fontSize: 14,color: Colors.grey),),
+                      Text(
+                        '${episode.episode}. ${episode.name}',
+                        maxLines: 2,
+                        style: TextStyle(
+                            fontSize: 20,
+                            fontWeight: FontWeight.bold,
+                            overflow: TextOverflow.ellipsis),
+                      ),
+                      Text(
+                          "Season ${episode.season} Episode ${episode.episode}",
+                          style: TextStyle(fontSize: 16, color: Colors.grey)),
+                      Text(
+                        episode.airDate,
+                        style: TextStyle(fontSize: 14, color: Colors.grey),
+                      ),
                     ],
                   ),
                 ),
               ],
             ),
             Padding(
               padding: const EdgeInsets.all(8.0),
-              child: Text(episode.description,maxLines: 3, style: TextStyle(fontSize: 14,color: Colors.grey,overflow: TextOverflow.ellipsis)),
+              child: Text(episode.description,
+                  maxLines: 3,
+                  style: TextStyle(
+                      fontSize: 14,
+                      color: Colors.grey,
+                      overflow: TextOverflow.ellipsis)),
             ),
           ],
         ),
       ),
     );
   }
-}
+}