Merge pull request #20 from C0ntrolDev/dev-1.1

Ver 1.1.3

Author: C0ntrolDev

README.md

@@ -31,17 +31,17 @@ App that allows you to download your favorite playlists at the touch of just one
 ### Android
 
 You can download this apk if you don't know what kind of architecture you have.
-- [spotify_downloader.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.2/spotify_downloader.apk)
+- [spotify_downloader.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.3/spotify_downloader.apk)
 
 If you know what architecture you have, then download one of the apk listed below.
-- [spotify_downloader_armeabi-v7a.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.2/spotify_downloader_armeabi-v7a.apk)
-- [spotify_downloader_arm64-v8a.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.2/spotify_downloader_arm64-v8a.apk)
-- [spotify_downloader_x86_64.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.2/spotify_downloader_x86_64.apk)
+- [spotify_downloader_armeabi-v7a.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.3/spotify_downloader_armeabi-v7a.apk)
+- [spotify_downloader_arm64-v8a.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.3/spotify_downloader_arm64-v8a.apk)
+- [spotify_downloader_x86_64.apk](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.3/spotify_downloader_x86_64.apk)
 
 ### IOS
 
 You can download ipa there.
-- [spotify_downloader.ipa](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.2/spotify_downloader.ipa)
+- [spotify_downloader.ipa](https://github.com/C0ntrolDev/spotify_downloader/releases/download/v1.1.3/spotify_downloader.ipa)
 
 ## How to use
 

lib/core/utils/failures/custom_failures.dart

@@ -26,6 +26,11 @@ final class AuthFailure extends NoDetailedFailure {
   AuthFailure({super.message = 'auth failure', super.stackTrace});
 }
 
+final class AuthExitFailure extends NoDetailedFailure {
+  AuthExitFailure({super.message = 'auth exit failure', super.stackTrace});
+}
+
+
 final class InvalidClientCredentialsFailure extends NoDetailedFailure {
   InvalidClientCredentialsFailure({super.message = 'invalid auth credentials failure', super.stackTrace});
 }

lib/features/data_domain/auth/network_auth/data/data_source/network_auth_data_source.dart

@@ -19,6 +19,10 @@ class NetworkAuthDataSource {
             AuthFailure(message: '${accessTokenResponse.error} : ${accessTokenResponse.errorDescription}'));
       }
 
+      if(accessTokenResponse.httpStatusCode == 404) {
+        return Result.notSuccessful(AuthExitFailure());
+      }
+
       if (accessTokenResponse.accessToken == null ||
           accessTokenResponse.refreshToken == null ||
           accessTokenResponse.expirationDate == null) {

lib/features/data_domain/tracks/download_tracks/data/data_sources/dowload_audio_from_youtube_data_source.dart

@@ -194,7 +194,7 @@ class DownloadAudioFromYoutubeDataSource {
       video = await yt.videos.get(VideoId.parseVideoId(args.youtubeUrl));
       if (token.isCancelled) return const CancellableResult.isCancelled();
 
-      final manifest = await yt.videos.streamsClient.getManifest(video.id);
+      final manifest = await yt.videos.streams.getManifest(video.id, ytClients: [YoutubeApiClient.android, YoutubeApiClient.ios]);
       if (token.isCancelled) return const CancellableResult.isCancelled();
 
       downloadStreamInfo = manifest.audioOnly.withHighestBitrate();

lib/features/presentation/settings/widgets/auth_settings/blocs/account_auth/account_auth_bloc.dart

@@ -59,12 +59,14 @@ class AccountAuthBloc extends Bloc<AccountAuthEvent, AccountAuthState> {
   }
 
   AccountAuthState _getFailureState(Failure? failure) {
-    if (failure is NotAuthorizedFailure) {
+    if (failure is NotAuthorizedFailure || failure is AuthExitFailure) {
       return AccountAuthNotAuthorized();
     }
+
     if (failure is InvalidClientCredentialsFailure || failure is InvalidAccountCredentialsFailure) {
       return AccountAuthInvalidCredentialsFailure(failure: failure);
     }
+    
     if (failure is NetworkFailure) {
       return AccountAuthNetworkFailure();
     }

lib/features/presentation/settings/widgets/auth_settings/blocs/account_auth/account_auth_state.dart

@@ -22,12 +22,6 @@ final class AccountAuthNotAuthorized extends AccountAuthState {}
 
 final class AccountAuthNetworkFailure extends AccountAuthState {}
 
-final class AccountAuthInvalidCredentialsFailure extends AccountAuthState {
-  final Failure? failure;
-
-  const AccountAuthInvalidCredentialsFailure({required this.failure});
-}
-
 final class AccountAuthFailure extends AccountAuthState {
   final Failure? failure;
 
@@ -36,3 +30,7 @@ final class AccountAuthFailure extends AccountAuthState {
   @override
   List<Object?> get props => [failure];
 }
+
+final class AccountAuthInvalidCredentialsFailure extends AccountAuthFailure {
+  const AccountAuthInvalidCredentialsFailure({required super.failure});
+}

lib/features/presentation/settings/widgets/auth_settings/view/auth_settings.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:spotify_downloader/core/app/colors/colors.dart';
 import 'package:spotify_downloader/core/di/injector.dart';
-import 'package:spotify_downloader/core/utils/failures/failures.dart';
 import 'package:spotify_downloader/features/presentation/settings/widgets/auth_settings/blocs/account_auth/account_auth_bloc.dart';
 import 'package:spotify_downloader/features/presentation/settings/widgets/auth_settings/blocs/client_auth/client_auth_bloc.dart';
 import 'package:spotify_downloader/features/presentation/settings/widgets/setting_with_text_field.dart';
@@ -77,20 +76,11 @@ class _AuthSettingsState extends State<AuthSettings> {
             BlocConsumer<AccountAuthBloc, AccountAuthState>(
               listener: (context, state) {
                 if (state is AccountAuthFailure) {
-                  if (state.failure is! AuthFailure) {
-                    showFailureSnackBar(context, state.failure.toString());
-                  }
-                }
-
-                if (state is AccountAuthInvalidCredentialsFailure) {
                   showFailureSnackBar(context, state.failure.toString());
                 }
               },
               bloc: _accountAuthBloc,
-              buildWhen: (previous, current) => current is! AccountAuthFailure,
               builder: (context, state) {
-                if (state is AccountAuthFailure) return Container();
-
                 return SizedBox(
                   height: 30,
                   child: Row(
@@ -117,12 +107,12 @@ class _AuthSettingsState extends State<AuthSettings> {
                               );
                             case AccountAuthNotAuthorized():
                               return Text(S.of(context).youAreNotLoggedInToYourAccount, maxLines: 2);
-                            case AccountAuthFailure():
-                              return Text(S.of(context).unknownError, maxLines: 2);
                             case AccountAuthNetworkFailure():
                               return Text(S.of(context).connectionError, maxLines: 2);
                             case AccountAuthInvalidCredentialsFailure():
                               return Text(S.of(context).couldntLogInToYourAccount, maxLines: 2);
+                            case AccountAuthFailure():
+                              return Text(S.of(context).unknownError, maxLines: 2);
                           }
                         }),
                       ),
@@ -141,7 +131,7 @@ class _AuthSettingsState extends State<AuthSettings> {
                         late final String buttonText;
                         late final void Function() onButtonClicked;
 
-                        if (state is AccountAuthAuthorized || state is AccountAuthNetworkFailure) {
+                        if (state is AccountAuthAuthorized) {
                           buttonText = S.of(context).logOut;
                           onButtonClicked = () => _accountAuthBloc.add(AccountAuthLogOut());
                         } else {

pubspec.lock

@@ -641,10 +641,10 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   leak_tracker:
     dependency: transitive
     description:
@@ -677,6 +677,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  lists:
+    dependency: transitive
+    description:
+      name: lists
+      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   logging:
     dependency: transitive
     description:
@@ -1170,6 +1178,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
+  unicode:
+    dependency: transitive
+    description:
+      name: unicode
+      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   url_launcher:
     dependency: "direct main"
     description:
@@ -1358,10 +1374,10 @@ packages:
     dependency: "direct main"
     description:
       name: youtube_explode_dart
-      sha256: "89aff5ac7de139c492ecea4bfc9189d33791632fa57e7e438e598873b040b077"
+      sha256: "51ca5b2c03bf56060143d4f87df90ec3227592d7ae8a8003532533ae019d4291"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.3.6"
 sdks:
   dart: ">=3.4.3 <3.11.0"
   flutter: ">=3.22.0"

pubspec.yaml

@@ -3,7 +3,7 @@ description: App with which you can download tracks from Spotify using YouTube
 publish_to: 'none'
 repository: 'https://github.com/C0ntrolDev/spotify_downloader'
 
-version: 1.1.2+1
+version: 1.1.3+1
 
 environment:
   sdk: '>=3.1.4 <4.0.0'
@@ -24,7 +24,7 @@ dependencies:
   auto_route: ^7.8.4
   palette_generator: ^0.3.3+3
   ffmpeg_kit_flutter_full: ^6.0.3
-  youtube_explode_dart: ^2.0.4
+  youtube_explode_dart: ^2.3.6
   metadata_god: ^0.5.2
   cached_network_image: ^3.3.0
   path: ^1.8.3