kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2026-05-08 16:24:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: fix lint warnings

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2024-04-11 16:48:15 +06:00
parent 0afd5978d9
commit bc5d66d057
27 changed files with 45 additions and 761 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@ -2,15 +2,19 @@
"cmake.configureOnOpen": false,
"cSpell.words": [
"acousticness",
"ambiguate",
"Amoled",
"Buildless",
"danceability",
"fuzzywuzzy",
"gapless",
"instrumentalness",
"Mpris",
"RGBO",
"riverpod",
"Scrobblenaut",
"skeletonizer",
"songlink",
"speechiness",
"Spotube",
"winget"

8
analysis_options.yaml
View File

@ -30,10 +30,12 @@ linter:
# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
analyzer:
enable-experiment:
- records
- patterns
errors:
invalid_annotation_target: ignore
plugins:
- custom_lint
exclude:
- "**.freezed.dart"
- "**.g.dart"
- "**.gr.dart"
- "**/generated_plugin_registrant.dart"

2
bin/translated_messages.dart
View File

@ -1,3 +1,5 @@
// ignore_for_file: avoid_print
import 'dart:convert';
import 'dart:io';

3
bin/untranslated_messages.dart
View File

@ -1,3 +1,5 @@
// ignore_for_file: avoid_print
import 'dart:convert';
import 'dart:io';
@ -40,7 +42,6 @@ void main(List<String> args) {
"Translate following to their appropriate locale for flutter arb translations files."
" Put the respective new translations in a map of their corresponding locale.",
);
// ignore: avoid_print
print(
const JsonEncoder.withIndent(' ').convert(
args.isNotEmpty ? messagesWithValues[args.first] : messagesWithValues,

2
lib/components/album/album_card.dart
View File

@ -73,7 +73,7 @@ class AlbumCard extends HookConsumerWidget {
final fetchedTracks = await fetchAllTrack();
if (fetchedTracks.isEmpty) return;
if (fetchedTracks.isEmpty || !context.mounted) return;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice) {

4
lib/components/library/user_local_tracks.dart
View File

@ -28,6 +28,7 @@ import 'package:spotube/models/local_track.dart';
import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
import 'package:spotube/utils/service_utils.dart';
// ignore: depend_on_referenced_packages
import 'package:flutter_rust_bridge/flutter_rust_bridge.dart' show FfiException;
const supportedAudioTypes = [
@ -185,9 +186,6 @@ class UserLocalTracks extends HookConsumerWidget {
ref,
trackSnapshot.asData!.value,
);
} else {
// TODO: Remove stop capability
// playlistNotifier.stop();
}
}
}

1
lib/components/player/player.dart
View File

@ -96,6 +96,7 @@ class PlayerView extends HookConsumerWidget {
final topPadding = MediaQueryData.fromView(View.of(context)).padding.top;
// ignore: deprecated_member_use
return WillPopScope(
onWillPop: () async {
await panelController.close();

2
lib/components/root/bottom_player.dart
View File

@ -19,7 +19,6 @@ import 'package:spotube/hooks/utils/use_brightness_value.dart';
import 'package:spotube/models/logger.dart';
import 'package:flutter/material.dart';
import 'package:spotube/provider/authentication_provider.dart';
import 'package:spotube/provider/connect/connect.dart' hide volumeProvider;
import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
import 'package:spotube/provider/user_preferences/user_preferences_state.dart';
@ -36,7 +35,6 @@ class BottomPlayer extends HookConsumerWidget {
final playlist = ref.watch(ProxyPlaylistNotifier.provider);
final layoutMode =
ref.watch(userPreferencesProvider.select((s) => s.layoutMode));
final remoteControl = ref.watch(connectProvider);
final mediaQuery = MediaQuery.of(context);

2
lib/components/shared/bordered_text.dart
View File

@ -79,7 +79,7 @@ class BorderedText extends StatelessWidget {
strutStyle: child.strutStyle,
textAlign: child.textAlign,
textDirection: child.textDirection,
textScaleFactor: child.textScaleFactor,
textScaler: child.textScaler,
),
child,
],

1
lib/components/shared/page_window_title_bar.dart
View File

@ -599,6 +599,7 @@ class MouseStateBuilder extends StatefulWidget {
final VoidCallback? onPressed;
const MouseStateBuilder({super.key, required this.builder, this.onPressed});
@override
// ignore: library_private_types_in_public_api
_MouseStateBuilderState createState() => _MouseStateBuilderState();
}

2
lib/components/shared/panels/controller.dart
View File

@ -1,4 +1,4 @@
part of panels;
part of './sliding_up_panel.dart';
class PanelController extends ChangeNotifier {
SlidingUpPanelState? _panelState;

2
lib/components/shared/panels/helpers.dart
View File

@ -1,4 +1,4 @@
part of panels;
part of "./sliding_up_panel.dart";
/// if you want to prevent the panel from being dragged using the widget,
/// wrap the widget with this

2
lib/components/shared/track_tile/track_tile.dart
View File

@ -208,7 +208,7 @@ class TrackTile extends HookConsumerWidget {
Expanded(
flex: 4,
child: switch (track.runtimeType) {
LocalTrack => Text(
LocalTrack() => Text(
track.album!.name!,
maxLines: 1,
overflow: TextOverflow.ellipsis,

4
lib/components/shared/tracks_view/sections/header/header_buttons.dart
View File

@ -46,6 +46,8 @@ class TrackViewHeaderButtons extends HookConsumerWidget {
final allTracks = await props.pagination.onFetchAll();
if (!context.mounted) return;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice) {
final remotePlayback = ref.read(connectProvider.notifier);
@ -76,6 +78,8 @@ class TrackViewHeaderButtons extends HookConsumerWidget {
final allTracks = await props.pagination.onFetchAll();
if (!context.mounted) return;
final isRemoteDevice = await showSelectDeviceDialog(context, ref);
if (isRemoteDevice) {
final remotePlayback = ref.read(connectProvider.notifier);

1
lib/hooks/configurators/use_close_behavior.dart
View File

@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:spotube/hooks/configurators/use_window_listener.dart';
import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
import 'package:spotube/provider/user_preferences/user_preferences_state.dart';
// ignore: depend_on_referenced_packages
import 'package:local_notifier/local_notifier.dart';
final closeNotification = DesktopTools.createNotification(

7
lib/hooks/utils/use_custom_status_bar_color.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:spotube/models/logger.dart';
void useCustomStatusBarColor(
Color color,
@ -19,11 +20,13 @@ void useCustomStatusBarColor(
),
);
// ignore: invalid_use_of_visible_for_testing_member
final statusBarColor = SystemChrome.latestStyle?.statusBarColor;
useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (automaticSystemUiAdjustment != null) {
// ignore: deprecated_member_use
WidgetsBinding.instance.renderView.automaticSystemUiAdjustment =
automaticSystemUiAdjustment;
}
@ -43,7 +46,11 @@ void useCustomStatusBarColor(
});
return () {
if (automaticSystemUiAdjustment != null) {
// ignore: deprecated_member_use
WidgetsBinding.instance.renderView.automaticSystemUiAdjustment = false;
getLogger(["useCustomStatusBarColor"]).w(
"renderView.automaticSystemUiAdjustment is deprecated. Please use SystemChrome.setSystemUIOverlayStyle instead.",
);
}
};
}, [color, isCurrentRoute, statusBarColor]);

1
lib/hooks/utils/use_force_update.dart
View File

@ -2,5 +2,6 @@ import 'package:flutter_hooks/flutter_hooks.dart';
void Function() useForceUpdate() {
final state = useState(null);
// ignore: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
return () => state.notifyListeners();
}

4
lib/pages/lyrics/synced_lyrics.dart
View File

@ -1,8 +1,4 @@
import 'dart:ui';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:gap/gap.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';

1
lib/pages/root/root_app.dart
View File

@ -190,6 +190,7 @@ class RootApp extends HookConsumerWidget {
}
}
// ignore: deprecated_member_use
return WillPopScope(
onWillPop: () async {
if (rootPaths[location] != 0) {

2
lib/provider/authentication_provider.dart
View File

@ -131,7 +131,7 @@ class AuthenticationNotifier
Future<void> logout() async {
state = null;
if (kIsMobile) {
WebStorageManager.instance().android.deleteAllData();
WebStorageManager.instance().deleteAllData();
CookieManager.instance().deleteAllCookies();
}
}

736
lib/services/audio_services/linux_audio_service.dart
View File

@ -1,736 +0,0 @@
import 'dart:io';
import 'package:dbus/dbus.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:spotube/extensions/image.dart';
import 'package:spotube/provider/proxy_playlist/proxy_playlist.dart';
import 'package:spotube/provider/proxy_playlist/proxy_playlist_provider.dart';
import 'package:spotube/services/audio_player/audio_player.dart';
import 'package:spotube/services/audio_player/loop_mode.dart';
import 'package:spotube/services/sourced_track/sourced_track.dart';
final dbus = DBusClient.session();
class _MprisMediaPlayer2 extends DBusObject {
/// Creates a new object to expose on [path].
_MprisMediaPlayer2() : super(DBusObjectPath('/org/mpris/MediaPlayer2')) {
dbus.registerObject(this);
}
void dispose() {
dbus.unregisterObject(this);
}
/// Gets value of property org.mpris.MediaPlayer2.CanQuit
Future<DBusMethodResponse> getCanQuit() async {
return DBusMethodSuccessResponse([const DBusBoolean(true)]);
}
/// Gets value of property org.mpris.MediaPlayer2.Fullscreen
Future<DBusMethodResponse> getFullscreen() async {
return DBusMethodSuccessResponse([const DBusBoolean(false)]);
}
/// Sets property org.mpris.MediaPlayer2.Fullscreen
Future<DBusMethodResponse> setFullscreen(bool value) async {
return DBusMethodSuccessResponse();
}
/// Gets value of property org.mpris.MediaPlayer2.CanSetFullscreen
Future<DBusMethodResponse> getCanSetFullscreen() async {
return DBusMethodSuccessResponse([const DBusBoolean(false)]);
}
/// Gets value of property org.mpris.MediaPlayer2.CanRaise
Future<DBusMethodResponse> getCanRaise() async {
return DBusMethodSuccessResponse([const DBusBoolean(false)]);
}
/// Gets value of property org.mpris.MediaPlayer2.HasTrackList
Future<DBusMethodResponse> getHasTrackList() async {
return DBusMethodSuccessResponse([const DBusBoolean(false)]);
}
/// Gets value of property org.mpris.MediaPlayer2.Identity
Future<DBusMethodResponse> getIdentity() async {
return DBusMethodSuccessResponse([const DBusString("Spotube")]);
}
/// Gets value of property org.mpris.MediaPlayer2.DesktopEntry
Future<DBusMethodResponse> getDesktopEntry() async {
return DBusMethodSuccessResponse(
[const DBusString("/usr/share/application/spotube")],
);
}
/// Gets value of property org.mpris.MediaPlayer2.SupportedUriSchemes
Future<DBusMethodResponse> getSupportedUriSchemes() async {
return DBusMethodSuccessResponse([
DBusArray.string(["http"])
]);
}
/// Gets value of property org.mpris.MediaPlayer2.SupportedMimeTypes
Future<DBusMethodResponse> getSupportedMimeTypes() async {
return DBusMethodSuccessResponse([
DBusArray.string(["audio/mpeg"])
]);
}
/// Implementation of org.mpris.MediaPlayer2.Raise()
Future<DBusMethodResponse> doRaise() async {
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Quit()
Future<DBusMethodResponse> doQuit() async {
exit(0);
}
@override
List<DBusIntrospectInterface> introspect() {
return [
DBusIntrospectInterface('org.mpris.MediaPlayer2', methods: [
DBusIntrospectMethod('Raise'),
DBusIntrospectMethod('Quit')
], properties: [
DBusIntrospectProperty('CanQuit', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('Fullscreen', DBusSignature('b'),
access: DBusPropertyAccess.readwrite),
DBusIntrospectProperty('CanSetFullscreen', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('CanRaise', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('HasTrackList', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('Identity', DBusSignature('s'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('DesktopEntry', DBusSignature('s'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('SupportedUriSchemes', DBusSignature('as'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('SupportedMimeTypes', DBusSignature('as'),
access: DBusPropertyAccess.read)
])
];
}
@override
Future<DBusMethodResponse> handleMethodCall(DBusMethodCall methodCall) async {
if (methodCall.interface == 'org.mpris.MediaPlayer2') {
if (methodCall.name == 'Raise') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doRaise();
} else if (methodCall.name == 'Quit') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doQuit();
} else {
return DBusMethodErrorResponse.unknownMethod();
}
} else {
return DBusMethodErrorResponse.unknownInterface();
}
}
@override
Future<DBusMethodResponse> getProperty(String interface, String name) async {
if (interface == 'org.mpris.MediaPlayer2') {
if (name == 'CanQuit') {
return getCanQuit();
} else if (name == 'Fullscreen') {
return getFullscreen();
} else if (name == 'CanSetFullscreen') {
return getCanSetFullscreen();
} else if (name == 'CanRaise') {
return getCanRaise();
} else if (name == 'HasTrackList') {
return getHasTrackList();
} else if (name == 'Identity') {
return getIdentity();
} else if (name == 'DesktopEntry') {
return getDesktopEntry();
} else if (name == 'SupportedUriSchemes') {
return getSupportedUriSchemes();
} else if (name == 'SupportedMimeTypes') {
return getSupportedMimeTypes();
} else {
return DBusMethodErrorResponse.unknownProperty();
}
} else {
return DBusMethodErrorResponse.unknownProperty();
}
}
@override
Future<DBusMethodResponse> setProperty(
String interface, String name, DBusValue value) async {
if (interface == 'org.mpris.MediaPlayer2') {
if (name == 'CanQuit') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'Fullscreen') {
if (value.signature != DBusSignature('b')) {
return DBusMethodErrorResponse.invalidArgs();
}
return setFullscreen((value as DBusBoolean).value);
} else if (name == 'CanSetFullscreen') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'CanRaise') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'HasTrackList') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'Identity') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'DesktopEntry') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'SupportedUriSchemes') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'SupportedMimeTypes') {
return DBusMethodErrorResponse.propertyReadOnly();
} else {
return DBusMethodErrorResponse.unknownProperty();
}
} else {
return DBusMethodErrorResponse.unknownProperty();
}
}
@override
Future<DBusMethodResponse> getAllProperties(String interface) async {
var properties = <String, DBusValue>{};
if (interface == 'org.mpris.MediaPlayer2') {
properties['CanQuit'] = (await getCanQuit()).returnValues[0];
properties['Fullscreen'] = (await getFullscreen()).returnValues[0];
properties['CanSetFullscreen'] =
(await getCanSetFullscreen()).returnValues[0];
properties['CanRaise'] = (await getCanRaise()).returnValues[0];
properties['HasTrackList'] = (await getHasTrackList()).returnValues[0];
properties['Identity'] = (await getIdentity()).returnValues[0];
properties['DesktopEntry'] = (await getDesktopEntry()).returnValues[0];
properties['SupportedUriSchemes'] =
(await getSupportedUriSchemes()).returnValues[0];
properties['SupportedMimeTypes'] =
(await getSupportedMimeTypes()).returnValues[0];
}
return DBusMethodSuccessResponse([DBusDict.stringVariant(properties)]);
}
}
class _MprisMediaPlayer2Player extends DBusObject {
final Ref ref;
final ProxyPlaylistNotifier playlistNotifier;
/// Creates a new object to expose on [path].
_MprisMediaPlayer2Player(this.ref, this.playlistNotifier)
: super(DBusObjectPath("/org/mpris/MediaPlayer2")) {
(() async {
final nameStatus =
await dbus.requestName("org.mpris.MediaPlayer2.spotube");
if (nameStatus == DBusRequestNameReply.exists) {
await dbus.requestName("org.mpris.MediaPlayer2.spotube.instance$pid");
}
await dbus.registerObject(this);
}());
}
ProxyPlaylist get playlist => playlistNotifier.playlist;
void dispose() {
dbus.unregisterObject(this);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.PlaybackStatus
Future<DBusMethodResponse> getPlaybackStatus() async {
final status = audioPlayer.isPlaying
? "Playing"
: playlist.active == null
? "Stopped"
: "Paused";
return DBusMethodSuccessResponse([DBusString(status)]);
}
// TODO: Implement Track Loop
/// Gets value of property org.mpris.MediaPlayer2.Player.LoopStatus
Future<DBusMethodResponse> getLoopStatus() async {
final loopMode = switch (audioPlayer.loopMode) {
PlaybackLoopMode.all => "Playlist",
PlaybackLoopMode.one => "Track",
PlaybackLoopMode.none => "None",
};
return DBusMethodSuccessResponse([DBusString(loopMode)]);
}
/// Sets property org.mpris.MediaPlayer2.Player.LoopStatus
Future<DBusMethodResponse> setLoopStatus(String value) async {
// playlistNotifier.setIsLoop(value == "Track");
return DBusMethodSuccessResponse();
}
/// Gets value of property org.mpris.MediaPlayer2.Player.Rate
Future<DBusMethodResponse> getRate() async {
return DBusMethodSuccessResponse([const DBusDouble(1)]);
}
/// Sets property org.mpris.MediaPlayer2.Player.Rate
Future<DBusMethodResponse> setRate(double value) async {
return DBusMethodSuccessResponse();
}
/// Gets value of property org.mpris.MediaPlayer2.Player.Shuffle
Future<DBusMethodResponse> getShuffle() async {
return DBusMethodSuccessResponse(
[DBusBoolean(await audioPlayer.isShuffled)]);
}
/// Sets property org.mpris.MediaPlayer2.Player.Shuffle
Future<DBusMethodResponse> setShuffle(bool value) async {
audioPlayer.setShuffle(value);
return DBusMethodSuccessResponse();
}
/// Gets value of property org.mpris.MediaPlayer2.Player.Metadata
Future<DBusMethodResponse> getMetadata() async {
if (playlist.activeTrack == null || playlist.isFetching) {
return DBusMethodSuccessResponse([DBusDict.stringVariant({})]);
}
final id = playlist.activeTrack!.id;
return DBusMethodSuccessResponse([
DBusDict.stringVariant({
"mpris:trackid": DBusString("${path.value}/Track/$id"),
"mpris:length": DBusInt32(
(await audioPlayer.duration)?.inMicroseconds ?? 0,
),
"mpris:artUrl": DBusString(
(playlist.activeTrack?.album?.images).asUrlString(
placeholder: ImagePlaceholder.albumArt,
),
),
"xesam:album": DBusString(playlist.activeTrack!.album!.name!),
"xesam:artist": DBusArray.string(
playlist.activeTrack!.artists!.map((artist) => artist.name!),
),
"xesam:title": DBusString(playlist.activeTrack!.name!),
"xesam:url": DBusString(
playlist.activeTrack is SourcedTrack
? (playlist.activeTrack as SourcedTrack).url
: playlist.activeTrack!.previewUrl ?? "",
),
"xesam:genre": const DBusString("Unknown"),
}),
]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.Volume
Future<DBusMethodResponse> getVolume() async {
return DBusMethodSuccessResponse([DBusDouble(audioPlayer.volume)]);
}
/// Sets property org.mpris.MediaPlayer2.Player.Volume
Future<DBusMethodResponse> setVolume(double value) async {
await audioPlayer.setVolume(value);
return DBusMethodSuccessResponse();
}
/// Gets value of property org.mpris.MediaPlayer2.Player.Position
Future<DBusMethodResponse> getPosition() async {
return DBusMethodSuccessResponse([
DBusInt64((await audioPlayer.position)?.inMicroseconds ?? 0),
]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.MinimumRate
Future<DBusMethodResponse> getMinimumRate() async {
return DBusMethodSuccessResponse([const DBusDouble(1)]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.MaximumRate
Future<DBusMethodResponse> getMaximumRate() async {
return DBusMethodSuccessResponse([const DBusDouble(1)]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.CanGoNext
Future<DBusMethodResponse> getCanGoNext() async {
return DBusMethodSuccessResponse([
DBusBoolean(
(playlist.tracks.length) > 1,
)
]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.CanGoPrevious
Future<DBusMethodResponse> getCanGoPrevious() async {
return DBusMethodSuccessResponse([
DBusBoolean(
(playlist.tracks.length) > 1,
)
]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.CanPlay
Future<DBusMethodResponse> getCanPlay() async {
return DBusMethodSuccessResponse([const DBusBoolean(true)]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.CanPause
Future<DBusMethodResponse> getCanPause() async {
return DBusMethodSuccessResponse([const DBusBoolean(true)]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.CanSeek
Future<DBusMethodResponse> getCanSeek() async {
return DBusMethodSuccessResponse([const DBusBoolean(true)]);
}
/// Gets value of property org.mpris.MediaPlayer2.Player.CanControl
Future<DBusMethodResponse> getCanControl() async {
return DBusMethodSuccessResponse([const DBusBoolean(true)]);
}
/// Implementation of org.mpris.MediaPlayer2.Player.Next()
Future<DBusMethodResponse> doNext() async {
await playlistNotifier.next();
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.Previous()
Future<DBusMethodResponse> doPrevious() async {
await playlistNotifier.previous();
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.Pause()
Future<DBusMethodResponse> doPause() async {
await audioPlayer.pause();
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.PlayPause()
Future<DBusMethodResponse> doPlayPause() async {
audioPlayer.isPlaying
? await audioPlayer.pause()
: await audioPlayer.resume();
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.Stop()
Future<DBusMethodResponse> doStop() async {
playlistNotifier.stop();
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.Play()
Future<DBusMethodResponse> doPlay() async {
await audioPlayer.resume();
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.Seek()
Future<DBusMethodResponse> doSeek(int offset) async {
await audioPlayer.seek(Duration(microseconds: offset));
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.SetPosition()
Future<DBusMethodResponse> doSetPosition(String TrackId, int Position) async {
return DBusMethodSuccessResponse();
}
/// Implementation of org.mpris.MediaPlayer2.Player.OpenUri()
Future<DBusMethodResponse> doOpenUri(String Uri) async {
return DBusMethodSuccessResponse();
}
/// Emits signal org.mpris.MediaPlayer2.Player.Seeked
Future<void> emitSeeked(int position) async {
await emitSignal(
'org.mpris.MediaPlayer2.Player',
'Seeked',
[DBusInt64(position)],
);
}
Future<void> updateProperties() async {
return emitPropertiesChanged(
"org.mpris.MediaPlayer2.Player",
changedProperties: {
"PlaybackStatus": (await getPlaybackStatus()).returnValues.first,
"LoopStatus": (await getLoopStatus()).returnValues.first,
"Rate": (await getRate()).returnValues.first,
"Shuffle": (await getShuffle()).returnValues.first,
"Metadata": (await getMetadata()).returnValues.first,
"Volume": (await getVolume()).returnValues.first,
"Position": (await getPosition()).returnValues.first,
"MinimumRate": (await getMinimumRate()).returnValues.first,
"MaximumRate": (await getMaximumRate()).returnValues.first,
"CanGoNext": (await getCanGoNext()).returnValues.first,
"CanGoPrevious": (await getCanGoPrevious()).returnValues.first,
"CanPlay": (await getCanPlay()).returnValues.first,
"CanPause": (await getCanPause()).returnValues.first,
"CanSeek": (await getCanSeek()).returnValues.first,
"CanControl": (await getCanControl()).returnValues.first,
},
);
}
@override
List<DBusIntrospectInterface> introspect() {
return [
DBusIntrospectInterface('org.mpris.MediaPlayer2.Player', methods: [
DBusIntrospectMethod('Next'),
DBusIntrospectMethod('Previous'),
DBusIntrospectMethod('Pause'),
DBusIntrospectMethod('PlayPause'),
DBusIntrospectMethod('Stop'),
DBusIntrospectMethod('Play'),
DBusIntrospectMethod('Seek', args: [
DBusIntrospectArgument(DBusSignature('x'), DBusArgumentDirection.in_,
name: 'Offset')
]),
DBusIntrospectMethod('SetPosition', args: [
DBusIntrospectArgument(DBusSignature('o'), DBusArgumentDirection.in_,
name: 'TrackId'),
DBusIntrospectArgument(DBusSignature('x'), DBusArgumentDirection.in_,
name: 'Position')
]),
DBusIntrospectMethod('OpenUri', args: [
DBusIntrospectArgument(DBusSignature('s'), DBusArgumentDirection.in_,
name: 'Uri')
])
], signals: [
DBusIntrospectSignal('Seeked', args: [
DBusIntrospectArgument(DBusSignature('x'), DBusArgumentDirection.out,
name: 'Position')
])
], properties: [
DBusIntrospectProperty('PlaybackStatus', DBusSignature('s'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('LoopStatus', DBusSignature('s'),
access: DBusPropertyAccess.readwrite),
DBusIntrospectProperty('Rate', DBusSignature('d'),
access: DBusPropertyAccess.readwrite),
DBusIntrospectProperty('Shuffle', DBusSignature('b'),
access: DBusPropertyAccess.readwrite),
DBusIntrospectProperty('Metadata', DBusSignature('a{sv}'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('Volume', DBusSignature('d'),
access: DBusPropertyAccess.readwrite),
DBusIntrospectProperty('Position', DBusSignature('x'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('MinimumRate', DBusSignature('d'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('MaximumRate', DBusSignature('d'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('CanGoNext', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('CanGoPrevious', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('CanPlay', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('CanPause', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('CanSeek', DBusSignature('b'),
access: DBusPropertyAccess.read),
DBusIntrospectProperty('CanControl', DBusSignature('b'),
access: DBusPropertyAccess.read)
])
];
}
@override
Future<DBusMethodResponse> handleMethodCall(DBusMethodCall methodCall) async {
if (methodCall.interface == 'org.mpris.MediaPlayer2.Player') {
if (methodCall.name == 'Next') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doNext();
} else if (methodCall.name == 'Previous') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doPrevious();
} else if (methodCall.name == 'Pause') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doPause();
} else if (methodCall.name == 'PlayPause') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doPlayPause();
} else if (methodCall.name == 'Stop') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doStop();
} else if (methodCall.name == 'Play') {
if (methodCall.values.isNotEmpty) {
return DBusMethodErrorResponse.invalidArgs();
}
return doPlay();
} else if (methodCall.name == 'Seek') {
if (methodCall.signature != DBusSignature('x')) {
return DBusMethodErrorResponse.invalidArgs();
}
return doSeek((methodCall.values[0] as DBusInt64).value);
} else if (methodCall.name == 'SetPosition') {
if (methodCall.signature != DBusSignature('ox')) {
return DBusMethodErrorResponse.invalidArgs();
}
return doSetPosition((methodCall.values[0] as DBusObjectPath).value,
(methodCall.values[1] as DBusInt64).value);
} else if (methodCall.name == 'OpenUri') {
if (methodCall.signature != DBusSignature('s')) {
return DBusMethodErrorResponse.invalidArgs();
}
return doOpenUri((methodCall.values[0] as DBusString).value);
} else {
return DBusMethodErrorResponse.unknownMethod();
}
} else {
return DBusMethodErrorResponse.unknownInterface();
}
}
@override
Future<DBusMethodResponse> getProperty(String interface, String name) async {
if (interface == 'org.mpris.MediaPlayer2.Player') {
if (name == 'PlaybackStatus') {
return getPlaybackStatus();
} else if (name == 'LoopStatus') {
return getLoopStatus();
} else if (name == 'Rate') {
return getRate();
} else if (name == 'Shuffle') {
return getShuffle();
} else if (name == 'Metadata') {
return getMetadata();
} else if (name == 'Volume') {
return getVolume();
} else if (name == 'Position') {
return getPosition();
} else if (name == 'MinimumRate') {
return getMinimumRate();
} else if (name == 'MaximumRate') {
return getMaximumRate();
} else if (name == 'CanGoNext') {
return getCanGoNext();
} else if (name == 'CanGoPrevious') {
return getCanGoPrevious();
} else if (name == 'CanPlay') {
return getCanPlay();
} else if (name == 'CanPause') {
return getCanPause();
} else if (name == 'CanSeek') {
return getCanSeek();
} else if (name == 'CanControl') {
return getCanControl();
} else {
return DBusMethodErrorResponse.unknownProperty();
}
} else {
return DBusMethodErrorResponse.unknownProperty();
}
}
@override
Future<DBusMethodResponse> setProperty(
String interface, String name, DBusValue value) async {
if (interface == 'org.mpris.MediaPlayer2.Player') {
if (name == 'PlaybackStatus') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'LoopStatus') {
if (value.signature != DBusSignature('s')) {
return DBusMethodErrorResponse.invalidArgs();
}
return setLoopStatus((value as DBusString).value);
} else if (name == 'Rate') {
if (value.signature != DBusSignature('d')) {
return DBusMethodErrorResponse.invalidArgs();
}
return setRate((value as DBusDouble).value);
} else if (name == 'Shuffle') {
if (value.signature != DBusSignature('b')) {
return DBusMethodErrorResponse.invalidArgs();
}
return setShuffle((value as DBusBoolean).value);
} else if (name == 'Metadata') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'Volume') {
if (value.signature != DBusSignature('d')) {
return DBusMethodErrorResponse.invalidArgs();
}
return setVolume((value as DBusDouble).value);
} else if (name == 'Position') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'MinimumRate') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'MaximumRate') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'CanGoNext') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'CanGoPrevious') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'CanPlay') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'CanPause') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'CanSeek') {
return DBusMethodErrorResponse.propertyReadOnly();
} else if (name == 'CanControl') {
return DBusMethodErrorResponse.propertyReadOnly();
} else {
return DBusMethodErrorResponse.unknownProperty();
}
} else {
return DBusMethodErrorResponse.unknownProperty();
}
}
@override
Future<DBusMethodResponse> getAllProperties(String interface) async {
var properties = <String, DBusValue>{};
if (interface == 'org.mpris.MediaPlayer2.Player') {
properties['PlaybackStatus'] =
(await getPlaybackStatus()).returnValues[0];
properties['LoopStatus'] = (await getLoopStatus()).returnValues[0];
properties['Rate'] = (await getRate()).returnValues[0];
properties['Shuffle'] = (await getShuffle()).returnValues[0];
properties['Metadata'] = (await getMetadata()).returnValues[0];
properties['Volume'] = (await getVolume()).returnValues[0];
properties['Position'] = (await getPosition()).returnValues[0];
properties['MinimumRate'] = (await getMinimumRate()).returnValues[0];
properties['MaximumRate'] = (await getMaximumRate()).returnValues[0];
properties['CanGoNext'] = (await getCanGoNext()).returnValues[0];
properties['CanGoPrevious'] = (await getCanGoPrevious()).returnValues[0];
properties['CanPlay'] = (await getCanPlay()).returnValues[0];
properties['CanPause'] = (await getCanPause()).returnValues[0];
properties['CanSeek'] = (await getCanSeek()).returnValues[0];
properties['CanControl'] = (await getCanControl()).returnValues[0];
}
return DBusMethodSuccessResponse([DBusDict.stringVariant(properties)]);
}
}
class LinuxAudioService {
_MprisMediaPlayer2 mp2;
_MprisMediaPlayer2Player player;
LinuxAudioService(Ref ref, ProxyPlaylistNotifier playlistNotifier)
: mp2 = _MprisMediaPlayer2(),
player = _MprisMediaPlayer2Player(ref, playlistNotifier);
void dispose() {
mp2.dispose();
player.dispose();
}
}

1
lib/services/audio_services/mobile_audio_service.dart
View File

@ -11,6 +11,7 @@ class MobileAudioService extends BaseAudioHandler {
AudioSession? session;
final ProxyPlaylistNotifier playlistNotifier;
// ignore: invalid_use_of_protected_member
ProxyPlaylist get playlist => playlistNotifier.state;
MobileAudioService(this.playlistNotifier) {

2
lib/services/audio_services/smtc_windows_web.dart
View File

@ -1,3 +1,5 @@
// ignore_for_file: constant_identifier_names
class MusicMetadata {
final String? title;
final String? artist;

2
lib/services/cli/cli.dart
View File

@ -1,3 +1,5 @@
// ignore_for_file: avoid_print
import 'dart:io';
import 'package:args/args.dart';

2
lib/utils/duration.dart
View File

@ -37,8 +37,6 @@ Duration parseDuration(String input) {
days = p ~/ 24;
}
// TODO verify that there are no negative parts
return Duration(
days: days,
hours: hours,

4
pubspec.lock
View File

@ -1817,7 +1817,7 @@ packages:
source: hosted
version: "6.0.5"
pub_api_client:
dependency: "direct dev"
dependency: "direct main"
description:
name: pub_api_client
sha256: d456816ef5142906a22dc56e37be6bef6cb0276f0a26c11d1f7d277868202e71
@ -1841,7 +1841,7 @@ packages:
source: hosted
version: "2.3.0"
pubspec_parse:
dependency: "direct dev"
dependency: "direct main"
description:
name: pubspec_parse
sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367

4
pubspec.yaml
View File

@ -129,6 +129,8 @@ dependencies:
shelf_web_socket: ^1.0.4
web_socket_channel: ^2.4.4
lrc: ^1.0.2
pub_api_client: ^2.4.0
pubspec_parse: ^1.2.2
dev_dependencies:
build_runner: ^2.3.2
@ -143,8 +145,6 @@ dev_dependencies:
sdk: flutter
hive_generator: ^2.0.0
json_serializable: ^6.6.2
pub_api_client: ^2.4.0
pubspec_parse: ^1.2.2
freezed: ^2.4.6
custom_lint: ^0.5.11
riverpod_lint: ^2.1.1