kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-12-05 23:19:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: quality preset initialization fails and audio source auth

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2025-11-04 12:02:10 +06:00
parent 4b5108e54e
commit 6272f376ea
7 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/.gitignore vendored
View File

@ -11,3 +11,4 @@ GeneratedPluginRegistrant.java
key.properties
**/*.keystore
**/*.jks
.kotlin

2
lib/models/metadata/audio_source.dart
View File

@ -44,7 +44,7 @@ class SpotubeAudioLossyContainerQuality
@override
toString() {
return "${oneOptionalDecimalFormatter.format(bitrate)}kbps";
return "${oneOptionalDecimalFormatter.format(bitrate / 1000)}kbps";
}
}

7
lib/modules/metadata_plugins/installed_plugin.dart
View File

@ -52,9 +52,10 @@ class MetadataInstalledPluginItem extends HookConsumerWidget {
ref.watch(metadataPluginAuthenticatedProvider);
final isAudioSourceAuthenticatedSnapshot =
ref.watch(audioSourcePluginAuthenticatedProvider);
final isAuthenticated =
isMetadataAuthenticatedSnapshot.asData?.value == true ||
isAudioSourceAuthenticatedSnapshot.asData?.value == true;
final isAuthenticated = (isDefaultMetadata &&
isMetadataAuthenticatedSnapshot.asData?.value == true) ||
(isDefaultAudioSource &&
isAudioSourceAuthenticatedSnapshot.asData?.value == true);
final metadataUpdateAvailable =
ref.watch(metadataPluginUpdateCheckerProvider);

50
lib/provider/metadata_plugin/audio_source/quality_presets.dart
View File

@ -6,6 +6,7 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'package:spotube/models/metadata/metadata.dart';
import 'package:spotube/provider/metadata_plugin/metadata_plugin_provider.dart';
import 'package:spotube/services/audio_player/audio_player.dart';
import 'package:spotube/services/metadata/metadata.dart';
part 'quality_presets.g.dart';
part 'quality_presets.freezed.dart';
@ -28,9 +29,13 @@ class AudioSourceAvailableQualityPresetsNotifier
extends Notifier<AudioSourcePresetsState> {
@override
build() {
ref.watch(audioSourcePluginProvider);
final audioSourceSnapshot = ref.watch(audioSourcePluginProvider);
final audioSourceConfigSnapshot = ref.watch(
metadataPluginsProvider.select((data) =>
data.whenData((value) => value.defaultAudioSourcePluginConfig)),
);
_initialize();
_initialize(audioSourceSnapshot, audioSourceConfigSnapshot);
listenSelf((previous, next) {
final isNewLossless =
@ -49,26 +54,29 @@ class AudioSourceAvailableQualityPresetsNotifier
return AudioSourcePresetsState();
}
void _initialize() async {
final audioSource = await ref.read(audioSourcePluginProvider.future);
final audioSourceConfig = await ref.read(
metadataPluginsProvider
.selectAsync((data) => data.defaultAudioSourcePluginConfig),
);
if (audioSource == null || audioSourceConfig == null) {
throw Exception("Dude wat?");
}
final preferences = await SharedPreferences.getInstance();
final persistedStateStr =
preferences.getString("audioSourceState-${audioSourceConfig.slug}");
void _initialize(
AsyncValue<MetadataPlugin?> audioSourceSnapshot,
AsyncValue<PluginConfiguration?> audioSourceConfigSnapshot,
) async {
audioSourceConfigSnapshot.whenData((audioSourceConfig) {
audioSourceSnapshot.whenData((audioSource) async {
if (audioSource == null || audioSourceConfig == null) {
throw Exception("Dude wat?");
}
final preferences = await SharedPreferences.getInstance();
final persistedStateStr =
preferences.getString("audioSourceState-${audioSourceConfig.slug}");
if (persistedStateStr != null) {
state = AudioSourcePresetsState.fromJson(jsonDecode(persistedStateStr));
} else {
state = AudioSourcePresetsState(
presets: audioSource.audioSource.supportedPresets,
);
}
if (persistedStateStr != null) {
state =
AudioSourcePresetsState.fromJson(jsonDecode(persistedStateStr));
} else {
state = AudioSourcePresetsState(
presets: audioSource.audioSource.supportedPresets,
);
}
});
});
}
void setSelectedStreamingContainerIndex(int index) {

4
lib/provider/metadata_plugin/core/auth.dart
View File

@ -65,6 +65,6 @@ class AudioSourcePluginAuthenticatedNotifier extends AsyncNotifier<bool> {
}
final audioSourcePluginAuthenticatedProvider =
AsyncNotifierProvider<MetadataPluginAuthenticatedNotifier, bool>(
MetadataPluginAuthenticatedNotifier.new,
AsyncNotifierProvider<AudioSourcePluginAuthenticatedNotifier, bool>(
AudioSourcePluginAuthenticatedNotifier.new,
);

6
lib/provider/server/routes/playback.dart
View File

@ -48,7 +48,7 @@ class ServerPlaybackRoutes {
return join(
await UserPreferencesNotifier.getMusicCacheDir(),
ServiceUtils.sanitizeFilename(
'${track.query.name} - ${track.query.artists.join(",")} (${track.info.id}).${track.qualityPreset!.name}',
'${track.query.name} - ${track.query.artists.map((d) => d.name).join(",")} (${track.info.id}).${track.qualityPreset!.name}',
),
);
}
@ -288,7 +288,9 @@ class ServerPlaybackRoutes {
imageBytes: imageBytes,
fileLength: fileLength,
),
);
).catchError((e, stackTrace) {
AppLogger.reportError(e, stackTrace);
});
}
return (bytes: bytes, response: res);

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

@ -317,7 +317,7 @@ class SourcedTrack extends BasicSourcedTrack {
source.bitDepth == quality.bitDepth;
} else {
return source.bitrate ==
(preset as SpotubeAudioLossyContainerQuality).bitrate;
(quality as SpotubeAudioLossyContainerQuality).bitrate;
}
},
);