From 7435a5d959c1bea7e954c6e70c3a9e173003e41f Mon Sep 17 00:00:00 2001 From: Hexah Date: Mon, 24 Feb 2020 19:27:00 +0100 Subject: [PATCH] Models directory refactoring --- example/video_download.dart | 2 -- .../{ => closed_captions}/closed_caption.dart | 0 .../closed_caption_track.dart | 2 +- .../closed_caption_track_info.dart | 2 +- .../{ => closed_captions}/language.dart | 0 .../{ => media_streams}/audio_encoding.dart | 0 .../audio_stream_info.dart | 2 +- .../models/{ => media_streams}/container.dart | 0 .../media_stream_info.dart | 2 +- .../media_stream_info_set.dart | 2 +- .../muxed_stream_info.dart | 2 +- .../{ => media_streams}/video_encoding.dart | 0 .../{ => media_streams}/video_quality.dart | 0 .../{ => media_streams}/video_resolution.dart | 0 .../video_stream_info.dart | 2 +- lib/src/models/models.dart | 28 +++++++++---------- 16 files changed, 21 insertions(+), 23 deletions(-) rename lib/src/models/{ => closed_captions}/closed_caption.dart (100%) rename lib/src/models/{ => closed_captions}/closed_caption_track.dart (95%) rename lib/src/models/{ => closed_captions}/closed_caption_track_info.dart (95%) rename lib/src/models/{ => closed_captions}/language.dart (100%) rename lib/src/models/{ => media_streams}/audio_encoding.dart (100%) rename lib/src/models/{ => media_streams}/audio_stream_info.dart (95%) rename lib/src/models/{ => media_streams}/container.dart (100%) rename lib/src/models/{ => media_streams}/media_stream_info.dart (96%) rename lib/src/models/{ => media_streams}/media_stream_info_set.dart (97%) rename lib/src/models/{ => media_streams}/muxed_stream_info.dart (97%) rename lib/src/models/{ => media_streams}/video_encoding.dart (100%) rename lib/src/models/{ => media_streams}/video_quality.dart (100%) rename lib/src/models/{ => media_streams}/video_resolution.dart (100%) rename lib/src/models/{ => media_streams}/video_stream_info.dart (97%) diff --git a/example/video_download.dart b/example/video_download.dart index c7de302..e7bcbe3 100644 --- a/example/video_download.dart +++ b/example/video_download.dart @@ -11,8 +11,6 @@ final yt = YoutubeExplode(); final console = Console(); Future main() async { - await Future.delayed(Duration(seconds: 10)); - console.writeLine('Type the video id or url: '); var url = stdin.readLineSync().trim(); diff --git a/lib/src/models/closed_caption.dart b/lib/src/models/closed_captions/closed_caption.dart similarity index 100% rename from lib/src/models/closed_caption.dart rename to lib/src/models/closed_captions/closed_caption.dart diff --git a/lib/src/models/closed_caption_track.dart b/lib/src/models/closed_captions/closed_caption_track.dart similarity index 95% rename from lib/src/models/closed_caption_track.dart rename to lib/src/models/closed_captions/closed_caption_track.dart index 8411cae..606b2c2 100644 --- a/lib/src/models/closed_caption_track.dart +++ b/lib/src/models/closed_captions/closed_caption_track.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; -import 'models.dart'; +import '../models.dart'; /// Set of captions that get displayed during video playback. class ClosedCaptionTrack extends Equatable { diff --git a/lib/src/models/closed_caption_track_info.dart b/lib/src/models/closed_captions/closed_caption_track_info.dart similarity index 95% rename from lib/src/models/closed_caption_track_info.dart rename to lib/src/models/closed_captions/closed_caption_track_info.dart index a23d3a2..308b45d 100644 --- a/lib/src/models/closed_caption_track_info.dart +++ b/lib/src/models/closed_captions/closed_caption_track_info.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; -import 'models.dart'; +import '../models.dart'; /// Metadata associated with a certain [ClosedCaptionTrack] class ClosedCaptionTrackInfo extends Equatable { diff --git a/lib/src/models/language.dart b/lib/src/models/closed_captions/language.dart similarity index 100% rename from lib/src/models/language.dart rename to lib/src/models/closed_captions/language.dart diff --git a/lib/src/models/audio_encoding.dart b/lib/src/models/media_streams/audio_encoding.dart similarity index 100% rename from lib/src/models/audio_encoding.dart rename to lib/src/models/media_streams/audio_encoding.dart diff --git a/lib/src/models/audio_stream_info.dart b/lib/src/models/media_streams/audio_stream_info.dart similarity index 95% rename from lib/src/models/audio_stream_info.dart rename to lib/src/models/media_streams/audio_stream_info.dart index 6cccb45..d53a45c 100644 --- a/lib/src/models/audio_stream_info.dart +++ b/lib/src/models/media_streams/audio_stream_info.dart @@ -1,4 +1,4 @@ -import 'models.dart'; +import '../models.dart'; /// Metadata associated with a certain [MediaStream] that contains only audio. class AudioStreamInfo extends MediaStreamInfo { diff --git a/lib/src/models/container.dart b/lib/src/models/media_streams/container.dart similarity index 100% rename from lib/src/models/container.dart rename to lib/src/models/media_streams/container.dart diff --git a/lib/src/models/media_stream_info.dart b/lib/src/models/media_streams/media_stream_info.dart similarity index 96% rename from lib/src/models/media_stream_info.dart rename to lib/src/models/media_streams/media_stream_info.dart index 86fff8e..7c1451b 100644 --- a/lib/src/models/media_stream_info.dart +++ b/lib/src/models/media_streams/media_stream_info.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; -import 'models.dart'; +import '../models.dart'; /// Metadata associated with a certain [MediaStream] class MediaStreamInfo extends Equatable { diff --git a/lib/src/models/media_stream_info_set.dart b/lib/src/models/media_streams/media_stream_info_set.dart similarity index 97% rename from lib/src/models/media_stream_info_set.dart rename to lib/src/models/media_streams/media_stream_info_set.dart index 9a3cc2d..b1ec4d6 100644 --- a/lib/src/models/media_stream_info_set.dart +++ b/lib/src/models/media_streams/media_stream_info_set.dart @@ -1,6 +1,6 @@ import 'package:equatable/equatable.dart'; -import 'models.dart'; +import '../models.dart'; /// Set of all available media stream infos. class MediaStreamInfoSet extends Equatable { diff --git a/lib/src/models/muxed_stream_info.dart b/lib/src/models/media_streams/muxed_stream_info.dart similarity index 97% rename from lib/src/models/muxed_stream_info.dart rename to lib/src/models/media_streams/muxed_stream_info.dart index 9fbe0c9..1c18cef 100644 --- a/lib/src/models/muxed_stream_info.dart +++ b/lib/src/models/media_streams/muxed_stream_info.dart @@ -1,4 +1,4 @@ -import 'models.dart'; +import '../models.dart'; /// Metadata associated with a certain [MediaStream] /// that contains both audio and video. diff --git a/lib/src/models/video_encoding.dart b/lib/src/models/media_streams/video_encoding.dart similarity index 100% rename from lib/src/models/video_encoding.dart rename to lib/src/models/media_streams/video_encoding.dart diff --git a/lib/src/models/video_quality.dart b/lib/src/models/media_streams/video_quality.dart similarity index 100% rename from lib/src/models/video_quality.dart rename to lib/src/models/media_streams/video_quality.dart diff --git a/lib/src/models/video_resolution.dart b/lib/src/models/media_streams/video_resolution.dart similarity index 100% rename from lib/src/models/video_resolution.dart rename to lib/src/models/media_streams/video_resolution.dart diff --git a/lib/src/models/video_stream_info.dart b/lib/src/models/media_streams/video_stream_info.dart similarity index 97% rename from lib/src/models/video_stream_info.dart rename to lib/src/models/media_streams/video_stream_info.dart index f5267d1..372d04b 100644 --- a/lib/src/models/video_stream_info.dart +++ b/lib/src/models/media_streams/video_stream_info.dart @@ -1,4 +1,4 @@ -import 'models.dart'; +import '../models.dart'; /// Metadata associated with a certain [MediaStream]that contains only video. class VideoStreamInfo extends MediaStreamInfo { diff --git a/lib/src/models/models.dart b/lib/src/models/models.dart index dc27598..4356d43 100644 --- a/lib/src/models/models.dart +++ b/lib/src/models/models.dart @@ -1,23 +1,23 @@ library youtube_explode.models; -export 'audio_encoding.dart'; -export 'audio_stream_info.dart'; export 'channel.dart'; -export 'closed_caption.dart'; -export 'closed_caption_track.dart'; -export 'closed_caption_track_info.dart'; -export 'container.dart'; -export 'language.dart'; -export 'media_stream_info.dart'; -export 'media_stream_info_set.dart'; -export 'muxed_stream_info.dart'; +export 'closed_captions/closed_caption.dart'; +export 'closed_captions/closed_caption_track.dart'; +export 'closed_captions/closed_caption_track_info.dart'; +export 'closed_captions/language.dart'; +export 'media_streams/audio_encoding.dart'; +export 'media_streams/audio_stream_info.dart'; +export 'media_streams/container.dart'; +export 'media_streams/media_stream_info.dart'; +export 'media_streams/media_stream_info_set.dart'; +export 'media_streams/muxed_stream_info.dart'; +export 'media_streams/video_encoding.dart'; +export 'media_streams/video_quality.dart'; +export 'media_streams/video_resolution.dart'; +export 'media_streams/video_stream_info.dart'; export 'player_configuration.dart'; export 'playlist.dart'; export 'playlist_type.dart'; export 'statistics.dart'; export 'thumbnail_set.dart'; export 'video.dart'; -export 'video_encoding.dart'; -export 'video_quality.dart'; -export 'video_resolution.dart'; -export 'video_stream_info.dart';