mirror of
https://github.com/KRTirtho/spotube.git
synced 2026-06-20 18:08:04 +00:00
Merge branch 'dev' into master
This commit is contained in:
Riccardo Venturini
GitHub
commit
335be449d2
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
@ -30,5 +30,6 @@
|
||||
"README.md": "LICENSE,CODE_OF_CONDUCT.md,CONTRIBUTING.md,SECURITY.md,CONTRIBUTION.md,CHANGELOG.md,PRIVACY_POLICY.md",
|
||||
"*.dart": "${capture}.g.dart,${capture}.freezed.dart"
|
||||
},
|
||||
"dart.flutterSdkPath": ".fvm/versions/3.35.2"
|
||||
"dart.flutterSdkPath": ".fvm/versions/3.35.2",
|
||||
"makefile.configureOnOpen": false
|
||||
}
|
||||
1910
CHANGELOG.md
1910
CHANGELOG.md
File diff suppressed because it is too large
Load Diff
@ -59,6 +59,7 @@ class SearchPage extends HookConsumerWidget {
|
||||
|
||||
void onSubmitted(String value) {
|
||||
ref.read(searchTermStateProvider.notifier).state = value;
|
||||
focusNode.unfocus();
|
||||
if (value.trim().isEmpty) {
|
||||
return;
|
||||
}
|
||||
@ -127,61 +128,47 @@ class SearchPage extends HookConsumerWidget {
|
||||
)
|
||||
.toList();
|
||||
|
||||
return KeyboardListener(
|
||||
focusNode: focusNode,
|
||||
autofocus: true,
|
||||
onKeyEvent: (value) {
|
||||
final isEnter = value.logicalKey ==
|
||||
LogicalKeyboardKey.enter;
|
||||
|
||||
if (isEnter) {
|
||||
onSubmitted(controller.text);
|
||||
focusNode.unfocus();
|
||||
}
|
||||
},
|
||||
child: AutoComplete(
|
||||
suggestions: suggestions.length <= 2
|
||||
? [
|
||||
...suggestions,
|
||||
"Twenty One Pilots",
|
||||
"Linkin Park",
|
||||
"d4vd"
|
||||
]
|
||||
: suggestions,
|
||||
completer: (suggestion) => suggestion,
|
||||
mode: AutoCompleteMode.replaceAll,
|
||||
child: TextField(
|
||||
autofocus: true,
|
||||
controller: controller,
|
||||
features: [
|
||||
const InputFeature.leading(
|
||||
Icon(SpotubeIcons.search),
|
||||
),
|
||||
InputFeature.trailing(
|
||||
AnimatedCrossFade(
|
||||
duration:
|
||||
const Duration(milliseconds: 300),
|
||||
crossFadeState:
|
||||
controller.text.isNotEmpty
|
||||
? CrossFadeState.showFirst
|
||||
: CrossFadeState.showSecond,
|
||||
firstChild: IconButton.ghost(
|
||||
size: ButtonSize.small,
|
||||
icon:
|
||||
const Icon(SpotubeIcons.close),
|
||||
onPressed: () {
|
||||
controller.clear();
|
||||
},
|
||||
),
|
||||
secondChild: const SizedBox.square(
|
||||
dimension: 28),
|
||||
return AutoComplete(
|
||||
suggestions: suggestions.length <= 2
|
||||
? [
|
||||
...suggestions,
|
||||
"Twenty One Pilots",
|
||||
"Linkin Park",
|
||||
]
|
||||
: suggestions,
|
||||
completer: (suggestion) => suggestion,
|
||||
mode: AutoCompleteMode.replaceAll,
|
||||
child: TextField(
|
||||
autofocus: true,
|
||||
controller: controller,
|
||||
focusNode: focusNode,
|
||||
features: [
|
||||
const InputFeature.leading(
|
||||
Icon(SpotubeIcons.search),
|
||||
),
|
||||
InputFeature.trailing(
|
||||
AnimatedCrossFade(
|
||||
duration:
|
||||
const Duration(milliseconds: 300),
|
||||
crossFadeState:
|
||||
controller.text.isNotEmpty
|
||||
? CrossFadeState.showFirst
|
||||
: CrossFadeState.showSecond,
|
||||
firstChild: IconButton.ghost(
|
||||
size: ButtonSize.small,
|
||||
icon: const Icon(SpotubeIcons.close),
|
||||
onPressed: () {
|
||||
controller.clear();
|
||||
},
|
||||
),
|
||||
)
|
||||
],
|
||||
textInputAction: TextInputAction.search,
|
||||
placeholder: Text(context.l10n.search),
|
||||
onSubmitted: onSubmitted,
|
||||
),
|
||||
secondChild: const SizedBox.square(
|
||||
dimension: 28),
|
||||
),
|
||||
)
|
||||
],
|
||||
textInputAction: TextInputAction.search,
|
||||
placeholder: Text(context.l10n.search),
|
||||
onSubmitted: onSubmitted,
|
||||
),
|
||||
);
|
||||
}),
|
||||
|
||||
@ -28,6 +28,26 @@ class NewPipeEngine implements YouTubeEngine {
|
||||
);
|
||||
}
|
||||
|
||||
AudioOnlyStreamInfo _parseVideoStream(VideoStream stream, String videoId) {
|
||||
return AudioOnlyStreamInfo(
|
||||
VideoId(videoId),
|
||||
stream.itag,
|
||||
Uri.parse(stream.content),
|
||||
StreamContainer.parse(stream.mediaFormat!.mimeType.split("/").last),
|
||||
FileSize.unknown,
|
||||
Bitrate(stream.bitrate),
|
||||
stream.codec,
|
||||
switch (stream.bitrate) {
|
||||
> 130 * 1024 => "high",
|
||||
> 64 * 1024 => "medium",
|
||||
_ => "low",
|
||||
},
|
||||
[],
|
||||
MediaType.parse(stream.mediaFormat!.mimeType),
|
||||
null,
|
||||
);
|
||||
}
|
||||
|
||||
Video _parseVideo(VideoInfo info) {
|
||||
return Video(
|
||||
VideoId(info.id),
|
||||
@ -76,6 +96,14 @@ class NewPipeEngine implements YouTubeEngine {
|
||||
final streams =
|
||||
video.audioStreams.map((stream) => _parseAudioStream(stream, videoId));
|
||||
|
||||
if (streams.isEmpty) {
|
||||
final videoStreams = video.videoStreams
|
||||
.map((stream) => _parseVideoStream(stream, videoId));
|
||||
if (videoStreams.isNotEmpty) {
|
||||
return StreamManifest(videoStreams);
|
||||
}
|
||||
}
|
||||
|
||||
return StreamManifest(streams);
|
||||
}
|
||||
|
||||
@ -93,6 +121,14 @@ class NewPipeEngine implements YouTubeEngine {
|
||||
final streams =
|
||||
video.audioStreams.map((stream) => _parseAudioStream(stream, videoId));
|
||||
|
||||
if (streams.isEmpty) {
|
||||
final videoStreams = video.videoStreams
|
||||
.map((stream) => _parseVideoStream(stream, videoId));
|
||||
if (videoStreams.isNotEmpty) {
|
||||
return (_parseVideo(video), StreamManifest(videoStreams));
|
||||
}
|
||||
}
|
||||
|
||||
return (_parseVideo(video), StreamManifest(streams));
|
||||
}
|
||||
|
||||
|
||||
10
pubspec.lock
10
pubspec.lock
@ -486,10 +486,10 @@ packages:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: data_widget
|
||||
sha256: "95388df890189014f702b7e93f9de6bcf7d45143a99f6288f31899f10be441ba"
|
||||
sha256: "4947aae3c50635496d56f94ad18de98e19015c5ebf01abee0f39a2c098c7021a"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "0.0.2"
|
||||
version: "0.0.3"
|
||||
dbus:
|
||||
dependency: transitive
|
||||
description:
|
||||
@ -947,7 +947,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: HEAD
|
||||
resolved-ref: ab3ff415114b7b43593e6ee718ad3d760af18350
|
||||
resolved-ref: "41cbd821ce49b9343136f67d83d3117e582dad75"
|
||||
url: "https://github.com/KRTirtho/flutter_new_pipe_extractor"
|
||||
source: git
|
||||
version: "0.1.0"
|
||||
@ -2728,10 +2728,10 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: youtube_explode_dart
|
||||
sha256: "3d731d71df9901b1915bae806781df519cff32517e36db279f844ae619669e45"
|
||||
sha256: "10134a53989b2f3dc576121735aec8fc6d88784956f4a2ad1a2525b006373a76"
|
||||
url: "https://pub.dev"
|
||||
source: hosted
|
||||
version: "3.0.5"
|
||||
version: "3.1.0"
|
||||
yt_dlp_dart:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
|
||||
@ -3,7 +3,7 @@ description: Open source extensible music streaming platform and app, based on B
|
||||
|
||||
publish_to: "none"
|
||||
|
||||
version: 5.1.1+44
|
||||
version: 5.1.2+45
|
||||
|
||||
homepage: https://spotube.krtirtho.dev
|
||||
repository: https://github.com/KRTirtho/spotube
|
||||
@ -90,7 +90,7 @@ dependencies:
|
||||
ref: dart-3-support
|
||||
url: https://github.com/KRTirtho/scrobblenaut.git
|
||||
scroll_to_index: ^3.0.1
|
||||
shadcn_flutter: ^0.0.47
|
||||
shadcn_flutter: 0.0.47
|
||||
shared_preferences: ^2.2.3
|
||||
shelf: ^1.4.1
|
||||
shelf_router: ^1.1.4
|
||||
@ -114,7 +114,7 @@ dependencies:
|
||||
wikipedia_api: ^0.1.0
|
||||
win32_registry: ^1.1.5
|
||||
window_manager: ^0.4.3
|
||||
youtube_explode_dart: ^3.0.5
|
||||
youtube_explode_dart: ^3.1.0
|
||||
yt_dlp_dart:
|
||||
git:
|
||||
url: https://github.com/KRTirtho/yt_dlp_dart.git
|
||||
@ -171,7 +171,7 @@ dev_dependencies:
|
||||
pub_api_client: ^3.0.0
|
||||
io: ^1.0.4
|
||||
drift_dev: ^2.21.0
|
||||
test: ^1.25.7
|
||||
test: any
|
||||
auto_route_generator: ^9.0.0
|
||||
|
||||
dependency_overrides:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user