Skip to content

Commit 8745c55

Browse files
SL-PirateSL-Pirate
authored
Merge pull request #27 from SL-Pirate/dev
Implemented audio downloading and major refactoring
2 parents a4ed6df + b9a114e commit 8745c55

18 files changed

+524
-296
lines changed

‎client/lib/components/download_section.dart

+18-24
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ import 'package:ytd_web/widgets/square_icon_button.dart';
77
class DownloadSection extends StatefulWidget {
88
final String videoId;
99
final ValueNotifier<String> videoResolution;
10+
final ValueNotifier<String> audioBitRate;
11+
final ValueNotifier<DownloadType> type;
1012
final void Function(DownloadType type, String quality) onDownload;
1113
const DownloadSection({
1214
super.key,
1315
required this.videoId,
1416
required this.videoResolution,
17+
required this.audioBitRate,
18+
required this.type,
1519
required this.onDownload
1620
});
1721

@@ -20,9 +24,6 @@ class DownloadSection extends StatefulWidget {
2024
}
2125

2226
class _DownloadSectionState extends State<DownloadSection> {
23-
DownloadType type = DownloadType.video;
24-
String audioQuality = "128kbps";
25-
2627
@override
2728
Widget build(BuildContext context) {
2829
return FutureBuilder(
@@ -40,7 +41,7 @@ class _DownloadSectionState extends State<DownloadSection> {
4041
width: double.infinity,
4142
child: Text(
4243
"Select ${
43-
(type == DownloadType.video)
44+
(widget.type.value == DownloadType.video)
4445
? "Resolution"
4546
: "Bitrate"
4647
}",
@@ -66,8 +67,8 @@ class _DownloadSectionState extends State<DownloadSection> {
6667
borderRadius: BorderRadius.circular(4)
6768
),
6869
child: DropdownButton(
69-
value: type == DownloadType.video
70-
? widget.videoResolution.value : audioQuality,
70+
value: widget.type.value == DownloadType.video
71+
? widget.videoResolution.value : widget.audioBitRate.value,
7172
isExpanded: true,
7273
style: TextStyle(
7374
color: Styles.black,
@@ -82,7 +83,7 @@ class _DownloadSectionState extends State<DownloadSection> {
8283
items: () {
8384
List<DropdownMenuItem> entries = [
8485
for (var quality in snapshot.data[
85-
type == DownloadType.video
86+
widget.type.value == DownloadType.video
8687
? "video_qualities" : "audio_qualities"
8788
]) DropdownMenuItem(
8889
value: quality,
@@ -109,11 +110,11 @@ class _DownloadSectionState extends State<DownloadSection> {
109110
} (),
110111
onChanged: (selection) {
111112
setState(() {
112-
if (type == DownloadType.video) {
113+
if (widget.type.value == DownloadType.video) {
113114
widget.videoResolution.value = selection;
114115
}
115116
else {
116-
audioQuality = selection;
117+
widget.audioBitRate.value = selection;
117118
}
118119
});
119120
},
@@ -123,39 +124,32 @@ class _DownloadSectionState extends State<DownloadSection> {
123124
Row(
124125
children: [
125126
SquareIconButton(
126-
color: type == DownloadType.video
127+
color: widget.type.value == DownloadType.video
127128
? Styles.red : Styles.white,
128129
icon: Icon(
129130
Icons.videocam,
130-
color: type == DownloadType.video
131+
color: widget.type.value == DownloadType.video
131132
? Styles.white : Styles.black,
132133
),
133134
onPressed: () {
134135
setState(() {
135-
type = DownloadType.video;
136+
widget.type.value = DownloadType.video;
136137
});
137138
},
138139
),
139140
const SizedBox(width: 6,),
140141
SquareIconButton(
141-
color: type == DownloadType.audio
142+
color: widget.type.value == DownloadType.audio
142143
? Styles.red : Styles.white,
143144
icon: Icon(
144145
Icons.music_note,
145-
color: type == DownloadType.audio
146+
color: widget.type.value == DownloadType.audio
146147
? Styles.white : Styles.black,
147148
),
148149
onPressed: () {
149-
ScaffoldMessenger.of(context).showSnackBar(
150-
const SnackBar(
151-
content: Text(
152-
"Audio download is not available yet!"
153-
)
154-
)
155-
);
156-
// setState(() {
157-
// type = DownloadType.audio;
158-
// });
150+
setState(() {
151+
widget.type.value = DownloadType.audio;
152+
});
159153
},
160154
)
161155
]

‎client/lib/modals/downloadable.dart

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import 'package:flutter/foundation.dart';
2+
import 'package:ytd_web/util/constants.dart';
3+
4+
class Downloadable {
5+
final String url;
6+
final String quality;
7+
final DownloadType type;
8+
final String name;
9+
10+
Downloadable({
11+
required this.url,
12+
required this.quality,
13+
required this.type,
14+
required this.name
15+
});
16+
17+
/// Converts a [Downloadable] to a JSON object
18+
/// json keys:
19+
/// - downloadable_link
20+
/// - quality
21+
/// - type
22+
/// - file_name
23+
Downloadable.fromJson(Map<String, dynamic> json)
24+
: url = json['downloadable_link'],
25+
quality = json['quality'],
26+
type = DownloadType.values.firstWhere(
27+
(element) => element.name == json['type']
28+
),
29+
name = json['file_name'];
30+
31+
static Downloadable? getDownloadableFromList({
32+
required List<Downloadable> downloadables,
33+
required DownloadType type,
34+
String? quality,
35+
List<String> blacklistQualities = const []
36+
}) {
37+
for (Downloadable downloadable in downloadables) {
38+
if (downloadable.type == type && (quality == null || downloadable.quality == quality)) {
39+
if (kDebugMode) {
40+
print("Quality: ${downloadable.quality}");
41+
}
42+
if (blacklistQualities.contains(downloadable.quality)) {
43+
continue;
44+
}
45+
46+
return downloadable;
47+
}
48+
}
49+
50+
if (kDebugMode) {
51+
print("Downloadable: null");
52+
}
53+
return null;
54+
}
55+
}

‎client/lib/screens/home.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class _HomePageState extends State<HomePage> {
109109
),
110110
Container(
111111
margin: const EdgeInsets.symmetric(vertical: 20),
112-
height: 40,
112+
height: Styles.of(context).isMobile ? 40 : 50,
113113
child: TextField(
114114
controller: controller,
115115
decoration: InputDecoration(

‎client/lib/screens/video_screen.dart

+88-37
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ import 'package:flutter/material.dart';
33
import 'package:media_kit/media_kit.dart';
44
import 'package:media_kit_video/media_kit_video.dart';
55
import 'package:ytd_web/components/download_section.dart';
6+
import 'package:ytd_web/modals/downloadable.dart';
67
import 'package:ytd_web/util/api.dart';
78
import 'package:ytd_web/modals/search_result_model.dart';
89
import 'package:dio/dio.dart';
10+
import 'package:ytd_web/util/constants.dart';
911
import 'package:ytd_web/util/styles.dart';
1012
import 'package:ytd_web/components/channel_label.dart';
1113
import 'package:ytd_web/widgets/download_button/download_button.dart';
@@ -19,9 +21,11 @@ class VideoScreen extends StatefulWidget {
1921
}
2022

2123
class _VideoScreenState extends State<VideoScreen> {
22-
static const double playerMaxWidth = 540;
24+
static const double playerMaxWidth = 640;
2325
final ValueNotifier<String> videoResolution = ValueNotifier("360p");
24-
final Map<String, String> downloadable = {};
26+
final ValueNotifier<String> audioBitRate = ValueNotifier("128kbps");
27+
final ValueNotifier<DownloadType> type = ValueNotifier(DownloadType.video);
28+
final List<Downloadable> downloadables = [];
2529
final Player videoPlayer = Player();
2630
late final VideoController controller;
2731
Widget? preview;
@@ -96,36 +100,44 @@ class _VideoScreenState extends State<VideoScreen> {
96100
setState(() {
97101
startPlayerIndicator = const CircularProgressIndicator();
98102
});
99-
if (downloadable["link"] == null) {
100-
Response<dynamic> response = await Api.instance.getVideo(
103+
Downloadable? match = Downloadable.getDownloadableFromList(
104+
downloadables: downloadables,
105+
type: type.value,
106+
blacklistQualities: ["144p", "240p"]
107+
);
108+
109+
if (match == null) {
110+
final Response<dynamic> fileResponse = await Api.instance.getVideo(
101111
widget.searchResult.videoId,
102-
videoResolution.value
112+
() {
113+
// Ignoring 144p and 240p because they tend to cause errors with the player
114+
// and its also not practical to show preview of such low quality
115+
if (videoResolution.value == "144p" || videoResolution.value == "240p") {
116+
return "360p";
117+
}
118+
119+
return videoResolution.value;
120+
} ()
103121
);
104-
if (response.statusCode != 404) {
105-
downloadable["link"] = response.data["downloadable_link"];
106-
downloadable["name"] = response.data["file_name"];
107-
setupPlayer(downloadable["link"]!);
108-
}
109-
else {
110-
setState(() {
111-
startPlayerIndicator = const Icon(
112-
Icons.close,
113-
size: 69,
114-
color: Colors.red,
115-
);
116-
});
117-
if (!mounted) return;
118-
showDialog(
119-
context: context,
120-
builder: (context) => const AlertDialog(
121-
content: Text("Video unavailable!"),
122-
)
123-
);
122+
if (fileResponse.statusCode != 404) {
123+
final String url = fileResponse.data["downloadable_link"];
124+
downloadables.add(Downloadable(
125+
url: url,
126+
type: DownloadType.video,
127+
quality: () {
128+
// Applying the correct quality to the downloadable
129+
// Because it 144p and 240p were replaced with 360p above
130+
if (videoResolution.value == "144p" || videoResolution.value == "240p") {
131+
return "360p";
132+
}
133+
134+
return videoResolution.value;
135+
} (),
136+
name: fileResponse.data["file_name"]
137+
));
138+
setupPlayer(url);
124139
}
125140
}
126-
else {
127-
setupPlayer(downloadable["link"]!);
128-
}
129141
}
130142
),
131143
const SizedBox(height: 30,),
@@ -157,21 +169,58 @@ class _VideoScreenState extends State<VideoScreen> {
157169
borderRadius: BorderRadius.circular(15),
158170
border: Border.all(
159171
color: Colors.red,
160-
width: 2
172+
width: 1
161173
)
162174
),
163175
child: Column(
164176
children: [
165177
DownloadSection(
166178
videoId: widget.searchResult.videoId,
167179
videoResolution: videoResolution,
180+
audioBitRate: audioBitRate,
181+
type: type,
168182
onDownload: (type, quality) {},
169183
),
170184
const SizedBox(height: 30,),
171185
DownloadButton(
172-
downloadable: downloadable,
173-
searchResult: widget.searchResult,
174-
quality: videoResolution
186+
getDownloadable: () async {
187+
Downloadable? downloadable = Downloadable.getDownloadableFromList(
188+
downloadables: downloadables,
189+
type: type.value,
190+
quality: type.value == DownloadType.video
191+
? videoResolution.value
192+
: audioBitRate.value
193+
);
194+
if (downloadable != null) {
195+
return downloadable;
196+
}
197+
if (type.value == DownloadType.video) {
198+
dynamic video = (await Api.instance.getVideo(
199+
widget.searchResult.videoId,
200+
videoResolution.value
201+
)).data;
202+
203+
video["type"] = type.value.name;
204+
video["quality"] = videoResolution.value;
205+
Downloadable downloadable = Downloadable.fromJson(video);
206+
downloadables.add(downloadable);
207+
208+
return downloadable;
209+
}
210+
else {
211+
dynamic audio = (await Api.instance.getAudio(
212+
widget.searchResult.videoId,
213+
audioBitRate.value
214+
)).data;
215+
216+
audio["type"] = type.value.name;
217+
audio["quality"] = audioBitRate.value;
218+
Downloadable downloadable = Downloadable.fromJson(audio);
219+
downloadables.add(downloadable);
220+
221+
return downloadable;
222+
}
223+
},
175224
)
176225
],
177226
),
@@ -197,12 +246,14 @@ class _VideoScreenState extends State<VideoScreen> {
197246
void setupPlayer(String src) {
198247
videoPlayer.open(Media(src));
199248
setState(() {
200-
preview = Container(
201-
constraints: const BoxConstraints(
249+
preview = AspectRatio(
250+
aspectRatio: 16/9,
251+
child: Container(
252+
constraints: const BoxConstraints(
202253
maxWidth: playerMaxWidth,
203-
maxHeight: 304
204-
),
205-
child: Video(controller: controller,)
254+
),
255+
child: Video(controller: controller,)
256+
),
206257
);
207258
});
208259
}

‎client/lib/util/api.dart

+21
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,27 @@ class Api{
4545
}
4646
}
4747

48+
Future<Response> getAudio (String videoId, String? bitrate) async {
49+
try{
50+
return await _dio.get(
51+
"$_baseUrl/download/audio",
52+
options: Options(
53+
headers: header
54+
),
55+
queryParameters: {
56+
"video_id": videoId,
57+
"resolution": bitrate ?? "128kbps"
58+
}
59+
);
60+
}
61+
on DioException {
62+
return Future(() => Response(
63+
requestOptions: RequestOptions(),
64+
statusCode: 404
65+
));
66+
}
67+
}
68+
4869
Future<dynamic> search(String searchParam) async {
4970
try{
5071
Response response = await _dio.get(

0 commit comments

Comments
 (0)