Merge remote-tracking branch 'origin/master'

Author: Hexer10

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.0
+- BREAKING CHANGE: 
+    - In `getUploadsFromPage`: the `videoSorting` parameter is now a named parameter
+- Shorts filter possibility added in `getUploadsFromPage`.
+
 ## 2.0.4
 - Fix issue when parsing dates formatted as "Streamed <q> <unit> ago" due to a leading whitespace. #265
 

lib/src/channels/channel_client.dart

@@ -134,17 +134,20 @@ class ChannelClient {
 
   /// Enumerates videos uploaded by the specified channel.
   /// This fetches thru all the uploads pages of the channel.
+  /// The content by default is sorted by time of upload.
   ///
   /// Use .nextPage() to fetch the next batch of videos.
   Future<ChannelUploadsList> getUploadsFromPage(
-    dynamic channelId, [
+    dynamic channelId, {
     VideoSorting videoSorting = VideoSorting.newest,
-  ]) async {
+    VideoType videoType = VideoType.normal,
+  }) async {
     channelId = ChannelId.fromString(channelId);
     final page = await ChannelUploadPage.get(
       _httpClient,
       (channelId as ChannelId).value,
       videoSorting.code,
+      videoType,
     );
 
     final channel = await get(channelId);

lib/src/channels/channels.dart

@@ -13,3 +13,4 @@ export 'channel_uploads_list.dart';
 export 'channel_video.dart';
 export 'username.dart';
 export 'video_sorting.dart';
+export 'video_type.dart';

lib/src/channels/video_sorting.dart

@@ -1,3 +1,5 @@
+import 'package:meta/meta.dart';
+
 /// Metadata about video are sorted with [ChannelClient.getUploadsFromPage]
 enum VideoSorting {
   newest._('dd'),
@@ -6,6 +8,7 @@ enum VideoSorting {
 
   /// Code used to fetch the video.
   /// Used internally.
+  @internal
   final String code;
 
   const VideoSorting._(this.code);

lib/src/channels/video_type.dart

@@ -0,0 +1,17 @@
+import 'package:meta/meta.dart';
+
+/// Video types provided by Youtube
+enum VideoType {
+  /// Default horizontal video
+  normal('videos', 'videoRenderer'),
+
+  /// Youtube shorts video
+  shorts('shorts', 'reelItemRenderer');
+
+  final String name;
+
+  @internal
+  final String youtubeRenderText;
+
+  const VideoType(this.name, this.youtubeRenderText);
+}

lib/src/extensions/helpers_extension.dart

@@ -172,7 +172,10 @@ extension StringUtility2 on String? {
       // Streamed x y ago
       parts = parts.skip(1).toList();
     }
-    assert(parts.length == 3);
+
+    if (parts.length != 3) {
+      return null;
+    }
 
     final qty = int.parse(parts.first);
 

lib/src/reverse_engineering/pages/channel_upload_page.dart

@@ -1,5 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:html/parser.dart' as parser;
+import '../../channels/video_type.dart';
 
 import '../../channels/channel_video.dart';
 import '../../exceptions/exceptions.dart';
@@ -15,10 +16,12 @@ class ChannelUploadPage extends YoutubePage<_InitialData> {
   ///
   final String channelId;
 
+  final VideoType type;
+
   late final List<ChannelVideo> uploads = initialData.uploads;
 
   /// InitialData
-  ChannelUploadPage.id(this.channelId, super.initialData)
+  ChannelUploadPage.id(this.channelId, this.type, super.initialData)
       : super.fromInitialData();
 
   ///
@@ -28,30 +31,33 @@ class ChannelUploadPage extends YoutubePage<_InitialData> {
     }
 
     final data = await httpClient.sendContinuation('browse', initialData.token);
-    return ChannelUploadPage.id(channelId, _InitialData(data));
+    return ChannelUploadPage.id(channelId, type, _InitialData(data, type));
   }
 
   ///
   static Future<ChannelUploadPage> get(
     YoutubeHttpClient httpClient,
     String channelId,
     String sorting,
+    VideoType type,
   ) {
     final url =
-        'https://www.youtube.com/channel/$channelId/videos?view=0&sort=$sorting&flow=grid';
+        'https://www.youtube.com/channel/$channelId/${type.name}?view=0&sort=$sorting&flow=grid';
     return retry(httpClient, () async {
       final raw = await httpClient.getString(url);
-      return ChannelUploadPage.parse(raw, channelId);
+      return ChannelUploadPage.parse(raw, channelId, type);
     });
   }
 
   ///
-  ChannelUploadPage.parse(String raw, this.channelId)
-      : super(parser.parse(raw), (root) => _InitialData(root));
+  ChannelUploadPage.parse(String raw, this.channelId, this.type)
+      : super(parser.parse(raw), (root) => _InitialData(root, type));
 }
 
 class _InitialData extends InitialData {
-  _InitialData(super.root);
+  _InitialData(super.root, this.type);
+
+  final VideoType type;
 
   late final JsonMap? continuationContext = getContinuationContext();
 
@@ -175,8 +181,10 @@ class _InitialData extends InitialData {
     if (content.containsKey('gridVideoRenderer')) {
       video = content.get('gridVideoRenderer');
     } else if (content.containsKey('richItemRenderer')) {
-      video =
-          content.get('richItemRenderer')?.get('content')?.get('videoRenderer');
+      video = content
+          .get('richItemRenderer')
+          ?.get('content')
+          ?.get(type.youtubeRenderText);
     }
 
     if (video == null) {

pubspec.yaml

@@ -1,11 +1,10 @@
 name: youtube_explode_dart
 description: A port in dart of the youtube explode library. Supports several API functions without the need of Youtube API Key.
-version: 2.0.4
+version: 2.1.0
 homepage: https://github.com/Hexer10/youtube_explode_dart
 
 topics:
   - youtube
-  - lints
   - video
   - streams