Merge 42e954428b into 3d334d96fd

.github/workflows/pr-lint.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
 
 env:
-  FLUTTER_VERSION: 3.29.1
+  FLUTTER_VERSION: 3.29.0
 
 jobs:
   lint:

.github/workflows/spotube-release-binary.yml

@@ -20,7 +20,7 @@ on:
         description: Dry run without uploading to release
 
 env:
-  FLUTTER_VERSION: 3.29.1
+  FLUTTER_VERSION: 3.29.0
   FLUTTER_CHANNEL: master
 
 permissions:

lib/pages/lastfm_login/lastfm_login.dart

@@ -96,9 +96,7 @@ class LastFMLoginPage extends HookConsumerWidget {
                             FormField(
                               label: Text(context.l10n.username),
                               key: usernameKey,
-                              validator: const NotEmptyValidator(
+                              validator: const NotEmptyValidator(),
-                                message: "Username is required",
-                              ),
                               child: TextField(
                                 autofillHints: const [
                                   AutofillHints.username,
@@ -109,9 +107,7 @@ class LastFMLoginPage extends HookConsumerWidget {
                             ),
                             FormField(
                               key: passwordKey,
-                              validator: const NotEmptyValidator(
+                              validator: const NotEmptyValidator(),
-                                message: "Password is required",
-                              ),
                               label: Text(context.l10n.password),
                               child: TextField(
                                 autofillHints: const [

lib/provider/local_tracks/local_tracks_provider.dart

@@ -24,9 +24,6 @@ const supportedAudioTypes = [
   "audio/opus",
   "audio/wav",
   "audio/aac",
-  "audio/flac",
-  "audio/x-flac",
-  "audio/x-wav",
 ];
 
 const imgMimeToExt = {
@@ -71,16 +68,13 @@ final localTracksProvider =
               await Directory(location).list(recursive: true).toList();
 
           entities.addAll(
-            dirEntities.where(
+            dirEntities
-              (e) {
+                .where(
-                final mime = lookupMimeType(e.path) ??
+                  (e) =>
-                    (extension(e.path) == ".opus" ? "audio/opus" : null);
+                      e is File &&
-
+                      supportedAudioTypes.contains(lookupMimeType(e.path)),
-                print("${basename(e.path)}: $mime");
+                )
-
+                .cast<File>(),
-                return e is File && supportedAudioTypes.contains(mime);
-              },
-            ).cast<File>(),
           );
         } catch (e, stack) {
           AppLogger.reportError(e, stack);

pubspec.lock

@@ -1539,10 +1539,10 @@ packages:
     dependency: "direct main"
     description:
       name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "1.0.6"
   nm:
     dependency: transitive
     description:

pubspec.yaml

@@ -88,7 +88,7 @@ dependencies:
   media_kit: ^1.1.10+1
   media_kit_libs_audio: ^1.0.4
   metadata_god: ^1.0.0
-  mime: ^2.0.0
+  mime: ^1.0.2
   open_file: ^3.5.10
   package_info_plus: ^6.0.0
   palette_generator: ^0.3.3