fix: move last fm to its own service, re-organize main by adding regi…

…ster.dart (#1017)

lib/app/app_model.dart

@@ -26,20 +26,20 @@ class AppModel extends SafeChangeNotifier {
   Stream<String?> get errorStream => _exposeService.discordErrorStream;
   Stream<bool> get isDiscordConnectedStream =>
       _exposeService.isDiscordConnectedStream;
-  Stream<bool> get isLastFmAuthenticatedStream =>
-      _exposeService.isLastFmAuthenticatedStream;
-  //TODO: Do something(ex:change the text of the save button) once authenticated
-
   Future<void> connectToDiscord() async => _exposeService.connectToDiscord();
   Future<void> disconnectFromDiscord() async =>
       _exposeService.disconnectFromDiscord();
-  Future<void> setLastFmAuth() async {
-    final sessionData = await _exposeService.setLastFmAuth();
-    if (sessionData != null) {
-      _settingsService.setLastFmSessionKey(sessionData['sessionKey']!);
-      _settingsService.setLastFmUsername(sessionData['username']!);
-    }
-  }
+
+  ValueNotifier<bool> get isLastFmAuthorized =>
+      _exposeService.isLastFmAuthorized;
+  Future<void> authorizeLastFm({
+    required String apiKey,
+    required String apiSecret,
+  }) async =>
+      _exposeService.authorizeLastFm(
+        apiKey: apiKey,
+        apiSecret: apiSecret,
+      );
 
   final GitHub _gitHub;
   final SettingsService _settingsService;

lib/constants.dart

@@ -5,6 +5,8 @@ const kAppName = 'musicpod';
 
 const kAppId = 'org.feichtmeier.Musicpod';
 
+const kMusicPodFallBackColor = Color(0xFFed3c63);
+
 const kDiscordApplicationId = '1235321910221602837';
 
 const kLinuxDBusName = 'org.mpris.MediaPlayer2.musicpod';

lib/expose/expose_service.dart

@@ -1,24 +1,24 @@
 import 'dart:async';
 
+import 'package:flutter/widgets.dart';
 import 'package:flutter_discord_rpc/flutter_discord_rpc.dart';
-import 'package:lastfm/lastfm.dart';
-import 'package:url_launcher/url_launcher.dart';
+
+import 'lastfm_service.dart';
 
 class ExposeService {
   ExposeService({
     required FlutterDiscordRPC? discordRPC,
-    required LastFMAuthorized? lastFm,
+    required LastfmService lastFmService,
   })  : _discordRPC = discordRPC,
-        _lastFm = lastFm;
+        _lastFmService = lastFmService;
 
   final FlutterDiscordRPC? _discordRPC;
-  final LastFMAuthorized? _lastFm;
+  final LastfmService _lastFmService;
+
   final _errorController = StreamController<String?>.broadcast();
-  final _lastFmAuthController = StreamController<bool>.broadcast();
   Stream<String?> get discordErrorStream => _errorController.stream;
   Stream<bool> get isDiscordConnectedStream =>
       _discordRPC?.isConnectedStream ?? Stream.value(false);
-  Stream<bool> get isLastFmAuthenticatedStream => _lastFmAuthController.stream;
 
   Future<void> exposeTitleOnline({
     required String title,
@@ -32,43 +32,11 @@ class ExposeService {
       additionalInfo: additionalInfo,
       imageUrl: imageUrl,
     );
-    if (_lastFm != null) {
-      await _exposeTitleToLastfm(
-        title: title,
-        artist: artist,
-      );
-    }
-  }
 
-  Future<Map<String, String>?> setLastFmAuth() async {
-    final lastfmua = _lastFm as LastFMUnauthorized;
-    launchUrl(
-      Uri.parse(await lastfmua.authorizeDesktop()),
+    await _lastFmService.exposeTitleToLastfm(
+      title: title,
+      artist: artist,
     );
-
-    const maxWaitDuration = Duration(minutes: 2); // Customize as needed
-    final startTime = DateTime.now();
-    await Future.delayed(const Duration(seconds: 10));
-    while (DateTime.now().difference(startTime) < maxWaitDuration) {
-      try {
-        final lastfm = await lastfmua.finishAuthorizeDesktop();
-        final sessionKey = lastfm.sessionKey;
-        final username = lastfm.username;
-        _updateLastFmAuthStatus(true);
-        return {
-          'sessionKey': sessionKey,
-          'username': username,
-        };
-      } catch (e) {
-        await Future.delayed(const Duration(seconds: 10));
-      }
-    }
-    _updateLastFmAuthStatus(false);
-    return null;
-  }
-
-  void _updateLastFmAuthStatus(bool status) {
-    _lastFmAuthController.add(status);
   }
 
   Future<void> _exposeTitleToDiscord({
@@ -99,21 +67,6 @@ class ExposeService {
     }
   }
 
-  Future<void> _exposeTitleToLastfm({
-    required String title,
-    required String artist,
-  }) async {
-    try {
-      await _lastFm?.scrobble(
-        track: title,
-        artist: artist,
-        startTime: DateTime.now(),
-      );
-    } on Exception catch (e) {
-      _errorController.add(e.toString());
-    }
-  }
-
   Future<void> connect() async {
     await connectToDiscord();
   }
@@ -126,6 +79,16 @@ class ExposeService {
     }
   }
 
+  ValueNotifier<bool> get isLastFmAuthorized => _lastFmService.isAuthorized;
+  Future<void> authorizeLastFm({
+    required String apiKey,
+    required String apiSecret,
+  }) =>
+      _lastFmService.authorize(
+        apiKey: apiKey,
+        apiSecret: apiSecret,
+      );
+
   Future<void> disconnectFromDiscord() async {
     try {
       await _discordRPC?.disconnect();
@@ -137,6 +100,5 @@ class ExposeService {
   Future<void> dispose() async {
     await disconnectFromDiscord();
     await _errorController.close();
-    await _lastFmAuthController.close();
   }
 }

lib/expose/lastfm_service.dart

@@ -0,0 +1,96 @@
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import 'package:lastfm/lastfm.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+import '../common/logging.dart';
+import '../settings/settings_service.dart';
+
+class LastfmService {
+  LastfmService({required SettingsService settingsService})
+      : _settingsService = settingsService;
+
+  final SettingsService _settingsService;
+
+  LastFM? _lastFm;
+  final isAuthorized = ValueNotifier<bool>(false);
+  void _setLastFm(LastFM lastFm) {
+    _lastFm = lastFm;
+    isAuthorized.value = lastFm is LastFMAuthorized;
+  }
+
+  Future<void> exposeTitleToLastfm({
+    required String title,
+    required String artist,
+  }) async {
+    if (isAuthorized.value && _settingsService.enableLastFmScrobbling) {
+      try {
+        await (_lastFm as LastFMAuthorized).scrobble(
+          track: title,
+          artist: artist,
+          startTime: DateTime.now(),
+        );
+      } on Exception catch (e) {
+        printMessageInDebugMode(e);
+      }
+    }
+  }
+
+  void init({LastFMAuthorized? lastFmAuthorized}) {
+    if (lastFmAuthorized != null) {
+      _setLastFm(lastFmAuthorized);
+      _settingsService.setLastFmSessionKey(lastFmAuthorized.sessionKey);
+      _settingsService.setLastFmUsername(lastFmAuthorized.username);
+    } else {
+      final apiKey = _settingsService.lastFmApiKey;
+      final apiSecret = _settingsService.lastFmSecret;
+      final sessionKey = _settingsService.lastFmSessionKey;
+      final username = _settingsService.lastFmUsername;
+
+      if (sessionKey != null &&
+          username != null &&
+          apiKey != null &&
+          apiSecret != null) {
+        _setLastFm(
+          LastFMAuthorized(
+            apiKey,
+            secret: apiSecret,
+            sessionKey: sessionKey,
+            username: username,
+          ),
+        );
+      } else if (apiKey != null) {
+        _setLastFm(LastFMUnauthorized(apiKey, apiSecret));
+      }
+    }
+  }
+
+  Future<void> authorize({
+    required String apiKey,
+    required String apiSecret,
+  }) async {
+    _settingsService.setLastFmApiKey(apiKey);
+    _settingsService.setLastFmSecret(apiSecret);
+
+    final lastfmua = LastFMUnauthorized(apiKey, apiSecret);
+    launchUrl(
+      Uri.parse(await lastfmua.authorizeDesktop()),
+    );
+
+    const maxWaitDuration = Duration(minutes: 2); // Customize as needed
+    final startTime = DateTime.now();
+    await Future.delayed(const Duration(seconds: 10));
+    while (DateTime.now().difference(startTime) < maxWaitDuration) {
+      try {
+        final lastfm = await lastfmua.finishAuthorizeDesktop();
+        init(lastFmAuthorized: lastfm);
+      } catch (e) {
+        printMessageInDebugMode(e);
+        await Future.delayed(const Duration(seconds: 10));
+      }
+
+      if (isAuthorized.value) break;
+    }
+  }
+}

lib/l10n/app_de.arb

@@ -37,6 +37,7 @@
     "playlistDialogTitleNew": "Wiedergabeliste hinzufügen",
     "playlistDialogTitleEdit": "Wiedergabeliste editieren",
     "save": "Speichern",
+    "saveAndAuthorize": "Speichern und Autorisieren",
     "title": "Titel",
     "titles": "Titel",
     "artist": "Künstler",
@@ -357,6 +358,7 @@
     "exposeToDiscordTitle": "Discord",
     "exposeToDiscordSubTitle": "Der Künstler und Titel des Lieds/Radio-Senders/Podcast das du gerade hörst wird online geteilt.",
     "featureDisabledOnPlatform": "Diese Funktion ist momentan nicht für dieses Betriebssystem aktiviert.",
+    "exposeToLastfmSubTitle": "Der Künstler und Titel des Lieds/Radio-Senders/Podcast das du gerade hörst wird online geteilt.",
     "regionNone": "Keine",
     "onlineArtError": "Die Albumkunst-Online-Suche ist momentan nicht verfügbar",
     "regionAfghanistan": "Afghanistan",

lib/l10n/app_en.arb

@@ -37,6 +37,7 @@
     "playlistDialogTitleNew": "Add playlist",
     "playlistDialogTitleEdit": "Edit playlist",
     "save": "Save",
+    "saveAndAuthorize": "Save and authorize",
     "title": "Title",
     "titles": "Titles",
     "artist": "Artist",