0.5.1 - Download fixes

lib/ui/downloads_screen.dart

@@ -1,12 +1,16 @@
-import 'dart:async';
+import 'dart:io';
 
 import 'package:filesize/filesize.dart';
 import 'package:flutter/material.dart';
 import 'package:freezer/api/download.dart';
 import 'package:freezer/translations.i18n.dart';
-
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
 import 'cached_image.dart';
 
+import 'dart:async';
+
+
 class DownloadsScreen extends StatefulWidget {
   @override
   _DownloadsScreenState createState() => _DownloadsScreenState();
@@ -189,15 +193,30 @@ class DownloadTile extends StatelessWidget {
 
   String subtitle() {
     String out = '';
-    //Download type
-    if (download.private) out += 'Offline'.i18n;
-    else out += 'External'.i18n;
-    out += ' | ';
+
+    if (download.state != DownloadState.DOWNLOADING && download.state != DownloadState.POST) {
+      //Download type
+      if (download.private) out += 'Offline'.i18n;
+      else out += 'External'.i18n;
+      out += ' | ';
+    }
+
+    if (download.state == DownloadState.POST) {
+      return 'Post processing...'.i18n;
+    }
+
     //Quality
     if (download.quality == 9) out += 'FLAC';
     if (download.quality == 3) out += 'MP3 320kbps';
     if (download.quality == 1) out += 'MP3 128kbps';
 
+    //Downloading show progress
+    if (download.state == DownloadState.DOWNLOADING) {
+      out += ' | ${filesize(download.received, 2)} / ${filesize(download.filesize, 2)}';
+      double progress = download.received.toDouble() / download.filesize.toDouble();
+      out += ' ${(progress*100.0).toStringAsFixed(2)}%';
+    }
+
     return out;
   }
 
@@ -281,4 +300,63 @@ class DownloadTile extends StatelessWidget {
       ],
     );
   }
-}
+}
+
+class DownloadLogViewer extends StatefulWidget {
+  @override
+  _DownloadLogViewerState createState() => _DownloadLogViewerState();
+}
+
+class _DownloadLogViewerState extends State<DownloadLogViewer> {
+
+  List<String> data = [];
+
+  //Load log from file
+  Future _load() async {
+    String path = p.join((await getExternalStorageDirectory()).path, 'download.log');
+    File file = File(path);
+    if (await file.exists()) {
+      String _d = await file.readAsString();
+      setState(() {
+        data = _d.replaceAll("\r", "").split("\n");
+      });
+    }
+  }
+
+  //Get color by log type
+  Color color(String line) {
+    if (line.startsWith('E:')) return Colors.red;
+    if (line.startsWith('W:')) return Colors.orange[600];
+    return null;
+  }
+
+  @override
+  void initState() {
+    _load();
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Download Log'.i18n),
+      ),
+      body: ListView.builder(
+        itemCount: data.length,
+        itemBuilder: (context, i) {
+          return Padding(
+            padding: EdgeInsets.all(8.0),
+            child: Text(
+              data[i],
+              style: TextStyle(
+                fontSize: 14.0,
+                color: color(data[i])
+              ),
+            ),
+          );
+        },
+      )
+    );
+  }
+}

lib/ui/library.dart

@@ -203,6 +203,7 @@ class LibraryTracks extends StatefulWidget {
 class _LibraryTracksState extends State<LibraryTracks> {
 
   bool _loading = false;
+  bool _loadingTracks = false;
   ScrollController _scrollController = ScrollController();
   List<Track> tracks = [];
   List<Track> allTracks = [];
@@ -250,6 +251,9 @@ class _LibraryTracksState extends State<LibraryTracks> {
       }
 
       //Load another page of tracks from deezer
+      if (_loadingTracks) return;
+      _loadingTracks = true;
+
       List<Track> _t;
       try {
         _t = await deezerAPI.playlistTracksPage(deezerAPI.favoritesPlaylistId, pos);
@@ -263,6 +267,7 @@ class _LibraryTracksState extends State<LibraryTracks> {
         tracks.addAll(_t);
         _makeFavorite();
         _loading = false;
+        _loadingTracks = false;
       });
 
     }

lib/ui/search.dart

@@ -88,8 +88,13 @@ class _SearchScreenState extends State<SearchScreen> {
     await Future.delayed(Duration(milliseconds: 300));
     if (q != _query) return null;
     //Load
-    List sugg = await deezerAPI.searchSuggestions(_query);
-    setState(() => _suggestions = sugg);
+    List sugg;
+    try {
+      sugg = await deezerAPI.searchSuggestions(_query);
+    } catch (e) {}
+
+    if (sugg != null)
+      setState(() => _suggestions = sugg);
   }
 
   @override

lib/ui/settings_screen.dart

@@ -10,6 +10,7 @@ import 'package:fluttericon/font_awesome5_icons.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:freezer/api/deezer.dart';
 import 'package:freezer/api/download.dart';
+import 'package:freezer/ui/downloads_screen.dart';
 import 'package:freezer/ui/error.dart';
 import 'package:freezer/ui/home_screen.dart';
 import 'package:i18n_extension/i18n_widget.dart';
@@ -352,7 +353,7 @@ class _QualityPickerState extends State<QualityPicker> {
   }
 
   //Update quality in settings
-  void _updateQuality(AudioQuality q) {
+  void _updateQuality(AudioQuality q) async {
     setState(() {
       _quality = q;
     });
@@ -370,15 +371,8 @@ class _QualityPickerState extends State<QualityPicker> {
       case 'offline':
         settings.offlineQuality = _quality; break;
     }
-    settings.updateAudioServiceQuality();
-  }
-
-  @override
-  void dispose() {
-    //Save
-    settings.updateAudioServiceQuality();
-    settings.save();
-    super.dispose();
+    await settings.save();
+    await settings.updateAudioServiceQuality();
   }
 
   @override
@@ -558,8 +552,9 @@ class _DownloadsSettingsState extends State<DownloadsSettings> {
               if (!(await Permission.storage.request().isGranted)) return;
               //Navigate
               Navigator.of(context).push(MaterialPageRoute(
-                  builder: (context) => DirectoryPicker(settings.downloadPath, onSelect: (String p) {
+                  builder: (context) => DirectoryPicker(settings.downloadPath, onSelect: (String p) async {
                     setState(() => settings.downloadPath = p);
+                    await settings.save();
                   },)
               ));
             },
@@ -590,7 +585,7 @@ class _DownloadsSettingsState extends State<DownloadsSettings> {
                           ),
                           Container(height: 8.0),
                           Text(
-                            'Valid variables are'.i18n + ': %artists%, %artist%, %title%, %album%, %trackNumber%, %0trackNumber%, %feats%, %playlistTrackNumber%, %0playlistTrackNumber%, %year%',
+                            'Valid variables are'.i18n + ': %artists%, %artist%, %title%, %album%, %trackNumber%, %0trackNumber%, %feats%, %playlistTrackNumber%, %0playlistTrackNumber%, %year%, %date%',
                             style: TextStyle(
                               fontSize: 12.0,
                             ),
@@ -734,6 +729,26 @@ class _DownloadsSettingsState extends State<DownloadsSettings> {
               ),
             ),
           ),
+          ListTile(
+            title: Text('Save cover file for every track'.i18n),
+            leading: Container(
+              width: 30.0,
+              child: Checkbox(
+                value: settings.trackCover,
+                onChanged: (v) {
+                  setState(() => settings.trackCover = v);
+                  settings.save();
+                },
+              ),
+            ),
+          ),
+          ListTile(
+            title: Text('Download Log'.i18n),
+            leading: Icon(Icons.sticky_note_2),
+            onTap: () => Navigator.of(context).push(
+              MaterialPageRoute(builder: (context) => DownloadLogViewer())
+            ),
+          )
         ],
       ),
     );
@@ -1071,6 +1086,14 @@ class _CreditsScreenState extends State<CreditsScreen> {
               launch('https://t.me/freezerandroid');
             },
           ),
+          ListTile(
+            title: Text('Repository'.i18n),
+            subtitle: Text('Source code, report issues there.'),
+            leading: Icon(Icons.code, color: Colors.green, size: 36.0),
+            onTap: () {
+              launch('https://notabug.org/exttex/freezer');
+            },
+          ),
           Divider(),
           ...List.generate(credits.length, (i) => ListTile(
             title: Text(credits[i][0]),