Auto delete downloads after played.

lib/local_storage/key_value_storage.dart

@@ -57,6 +57,7 @@ const String hidePodcastDiscoveryKey = 'hidePodcastDiscoveryKey';
 const String searchEngineKey = 'searchEngineKey';
 const String markListenedAfterSkipKey = 'markListenedAfterSkipKey';
 const String downloadPositionKey = 'downloadPositionKey';
+const String deleteAfterPlayedKey = 'removeAfterPlayedKey';
 
 class KeyValueStorage {
   final String key;

lib/local_storage/sqflite_localpodcast.dart

@@ -1091,7 +1091,8 @@ class DBHelper {
     return episodes;
   }
 
-  Future<List<EpisodeBrief>> getOutdatedEpisode(int deadline) async {
+  Future<List<EpisodeBrief>> getOutdatedEpisode(int deadline,
+      {bool deletePlayed}) async {
     var dbClient = await database;
     var episodes = <EpisodeBrief>[];
     List<Map> list = await dbClient.rawQuery(
@@ -1100,6 +1101,7 @@ class DBHelper {
         P.imagePath, P.primaryColor FROM Episodes E INNER JOIN PodcastLocal P ON E.feed_id = P.id 
         WHERE E.download_date < ? AND E.enclosure_url != E.media_id
         ORDER BY E.milliseconds DESC""", [deadline]);
+    if (list.isNotEmpty) {
       for (var i in list) {
         episodes.add(EpisodeBrief(
             i['title'],
@@ -1113,6 +1115,32 @@ class DBHelper {
             i['imagePath'],
             i['is_new']));
       }
+    }
+    if (deletePlayed) {
+      List<Map> results = await dbClient.rawQuery(
+          """SELECT E.title, E.enclosure_url, E.enclosure_length, E.is_new,
+        E.milliseconds, P.title as feed_title, E.duration, E.explicit, 
+        P.imagePath, P.primaryColor FROM Episodes E INNER JOIN PodcastLocal P 
+        ON E.feed_id = P.id LEFT JOIN PlayHistory H ON E.enclosure_url = 
+        H.enclosure_url WHERE E.enclosure_url != E.media_id 
+        GROUP BY E.enclosure_url HAVING SUM(H.listen_time) > 0 ORDER BY 
+        E.milliseconds DESC""");
+      if (results.isNotEmpty) {
+        for (var i in results) {
+          episodes.add(EpisodeBrief(
+              i['title'],
+              i['enclosure_url'],
+              i['enclosure_length'],
+              i['milliseconds'],
+              i['feed_title'],
+              i['primaryColor'],
+              i['duration'],
+              i['explicit'],
+              i['imagePath'],
+              i['is_new']));
+        }
+      }
+    }
     return episodes;
   }
 

lib/settings/storage.dart

@@ -67,6 +67,11 @@ class _StorageSettingState extends State<StorageSetting>
     return index;
   }
 
+  Future<bool> _getDelteAfterPlayed() async {
+    final storage = KeyValueStorage(deleteAfterPlayedKey);
+    return await storage.getBool(defaultValue: false);
+  }
+
   Future<void> _setAutoDeleteDays(int days) async {
     var storage = KeyValueStorage(autoDeleteKey);
     await storage.saveInt(days);
@@ -83,6 +88,11 @@ class _StorageSettingState extends State<StorageSetting>
     await storage.saveInt(index);
   }
 
+  Future<void> _setDeleteAfterPlayed(bool boo) async {
+    final storage = KeyValueStorage(deleteAfterPlayedKey);
+    await storage.saveBool(boo);
+  }
+
   double _value;
 
   @override
@@ -117,6 +127,7 @@ class _StorageSettingState extends State<StorageSetting>
           backgroundColor: Theme.of(context).primaryColor,
         ),
         body: SafeArea(
+          child: SingleChildScrollView(
             child: Column(
               mainAxisAlignment: MainAxisAlignment.start,
               mainAxisSize: MainAxisSize.min,
@@ -190,8 +201,10 @@ class _StorageSettingState extends State<StorageSetting>
                           .copyWith(color: context.accentColor)),
                 ),
                 ListTile(
-                onTap: () => Navigator.push(context,
+                  onTap: () => Navigator.push(
-                    MaterialPageRoute(builder: (context) => DownloadsManage())),
+                      context,
+                      MaterialPageRoute(
+                          builder: (context) => DownloadsManage())),
                   contentPadding: EdgeInsets.symmetric(horizontal: 70.0),
                   title: Text(s.download),
                   subtitle: Text(s.settingsManageDownloadDes),
@@ -203,8 +216,10 @@ class _StorageSettingState extends State<StorageSetting>
                       return ListTile(
                         contentPadding: EdgeInsets.fromLTRB(70, 10, 20, 10),
                         title: Text(s.settingsDownloadPosition),
-                      subtitle: Text(_dirs == null ? '' : _dirs[snapshot.data],
+                        subtitle: Text(
-                          maxLines: 2, overflow: TextOverflow.ellipsis),
+                            _dirs == null ? '' : _dirs[snapshot.data],
+                            maxLines: 2,
+                            overflow: TextOverflow.ellipsis),
                         onTap: () => generalSheet(
                           context,
                           title: s.settingsDownloadPosition,
@@ -258,6 +273,30 @@ class _StorageSettingState extends State<StorageSetting>
                     );
                   },
                 ),
+                FutureBuilder<bool>(
+                    future: _getDelteAfterPlayed(),
+                    initialData: false,
+                    builder: (context, snapshot) {
+                      return ListTile(
+                        onTap: () async {
+                          _setDeleteAfterPlayed(snapshot.data);
+                          setState(() {});
+                        },
+                        contentPadding: EdgeInsets.only(left: 70.0, right: 25),
+                        title: Text('Delete download after played'),
+                        subtitle: Text('Delete after played'),
+                        trailing: Transform.scale(
+                          scale: 0.9,
+                          child: Switch(
+                            value: snapshot.data,
+                            onChanged: (value) async {
+                              await _setDeleteAfterPlayed(value);
+                              setState(() {});
+                            },
+                          ),
+                        ),
+                      );
+                    }),
                 ListTile(
                   contentPadding: EdgeInsets.only(left: 70.0, right: 25),
                   //  leading: Icon(Icons.colorize),
@@ -269,16 +308,19 @@ class _StorageSettingState extends State<StorageSetting>
                           textStyle: context.textTheme.headline6
                               .copyWith(color: context.accentColor)),
                       children: [
-                      TextSpan(text: ' Mb', style: context.textTheme.subtitle2),
+                        TextSpan(
+                            text: ' Mb', style: context.textTheme.subtitle2),
                       ])),
                 ),
                 Padding(
-                padding: EdgeInsets.only(left: 50.0, right: 20.0, bottom: 10.0),
+                  padding:
+                      EdgeInsets.only(left: 50.0, right: 20.0, bottom: 10.0),
                   child: SliderTheme(
                     data: Theme.of(context).sliderTheme.copyWith(
                         showValueIndicator: ShowValueIndicator.always,
                         trackHeight: 2,
-                      thumbShape: RoundSliderThumbShape(enabledThumbRadius: 6)),
+                        thumbShape:
+                            RoundSliderThumbShape(enabledThumbRadius: 6)),
                     child: Slider(
                         label: '${_value ~/ 100 * 100} Mb',
                         activeColor: context.accentColor,
@@ -300,6 +342,7 @@ class _StorageSettingState extends State<StorageSetting>
             ),
           ),
         ),
+      ),
     );
   }
 }

lib/state/download_state.dart

@@ -335,7 +335,7 @@ class DownloadState extends ChangeNotifier {
         taskId: task.taskId, shouldDeleteContent: false);
   }
 
-  Future delTask(EpisodeBrief episode) async {
+  Future<void> delTask(EpisodeBrief episode) async {
     var task = episodeToTask(episode);
     await FlutterDownloader.remove(
         taskId: task.taskId, shouldDeleteContent: true);
@@ -350,22 +350,25 @@ class DownloadState extends ChangeNotifier {
     _removeTask(episode);
   }
 
-  _removeTask(EpisodeBrief episode) {
+  void _removeTask(EpisodeBrief episode) {
     _episodeTasks.removeWhere((element) => element.episode == episode);
     notifyListeners();
   }
 
-  _autoDelete() async {
+  Future<void> _autoDelete() async {
     developer.log('Start auto delete outdated episodes');
-    var autoDeleteStorage = KeyValueStorage(autoDeleteKey);
+    final autoDeleteStorage = KeyValueStorage(autoDeleteKey);
-    var autoDelete = await autoDeleteStorage.getInt();
+    final deletePlayedStorage = KeyValueStorage(deleteAfterPlayedKey);
+    final autoDelete = await autoDeleteStorage.getInt();
+    final deletePlayed = await deletePlayedStorage.getBool(defaultValue: false);
     if (autoDelete == 0) {
       await autoDeleteStorage.saveInt(30);
     } else if (autoDelete > 0) {
       var deadline = DateTime.now()
           .subtract(Duration(days: autoDelete))
           .millisecondsSinceEpoch;
-      var episodes = await dbHelper.getOutdatedEpisode(deadline);
+      var episodes = await dbHelper.getOutdatedEpisode(deadline,
+          deletePlayed: deletePlayed);
       if (episodes.isNotEmpty) {
         for (var episode in episodes) {
           await delTask(episode);

lib/state/podcast_group.dart

@@ -362,7 +362,7 @@ class GroupList extends ChangeNotifier {
   }
 
   /// Load groups from storage at start.
-  Future loadGroups() async {
+  Future<void> loadGroups() async {
     _isLoading = true;
     notifyListeners();
     _groupStorage.getGroups().then((loadgroups) async {
@@ -376,7 +376,7 @@ class GroupList extends ChangeNotifier {
   }
 
   /// Update podcasts of each group
-  Future updateGroups() async {
+  Future<void> updateGroups() async {
     for (var group in _groups) {
       await group.getPodcasts();
     }
@@ -384,7 +384,7 @@ class GroupList extends ChangeNotifier {
   }
 
   /// Add new group.
-  Future addGroup(PodcastGroup podcastGroup) async {
+  Future<void> addGroup(PodcastGroup podcastGroup) async {
     _isLoading = true;
     _groups.add(podcastGroup);
     await _saveGroup();
@@ -393,7 +393,7 @@ class GroupList extends ChangeNotifier {
   }
 
   /// Remove group.
-  Future delGroup(PodcastGroup podcastGroup) async {
+  Future<void> delGroup(PodcastGroup podcastGroup) async {
     _isLoading = true;
     for (var podcast in podcastGroup.podcastList) {
       if (!_groups.first.podcastList.contains(podcast)) {

lib/state/setting_state.dart

@@ -496,6 +496,11 @@ class SettingState extends ChangeNotifier {
     var speedList = await KeyValueStorage(speedListKey).getStringList();
     var hidePodcastDiscovery = await KeyValueStorage(hidePodcastDiscoveryKey)
         .getBool(defaultValue: false);
+    final markListenedAfterSKip =
+        await KeyValueStorage(markListenedAfterSkipKey)
+            .getBool(defaultValue: false);
+    final deleteAfterPlayed = await KeyValueStorage(deleteAfterPlayedKey)
+        .getBool(defaultValue: false);
 
     return SettingsBackup(
         theme: theme,
@@ -527,7 +532,9 @@ class SettingState extends ChangeNotifier {
         notificationLayout: notificationLayout,
         showNotesFont: showNotesFont,
         speedList: speedList,
-        hidePodcastDiscovery: hidePodcastDiscovery);
+        hidePodcastDiscovery: hidePodcastDiscovery,
+        markListenedAfterSkip: markListenedAfterSKip,
+        deleteAfterPlayed: deleteAfterPlayed);
   }
 
   Future<void> restore(SettingsBackup backup) async {
@@ -563,6 +570,10 @@ class SettingState extends ChangeNotifier {
         .saveInt(backup.notificationLayout);
     await showNotesFontStorage.saveInt(backup.showNotesFont);
     await KeyValueStorage(speedListKey).saveStringList(backup.speedList);
+    await KeyValueStorage(markListenedAfterSkipKey)
+        .saveBool(backup.markListenedAfterSkip);
+    await KeyValueStorage(deleteAfterPlayedKey)
+        .saveBool(backup.deleteAfterPlayed);
 
     if (backup.locale == '') {
       await localeStorage.saveStringList([]);

lib/type/settings_backup.dart

@@ -29,6 +29,8 @@ class SettingsBackup {
   final int showNotesFont;
   final List<String> speedList;
   final bool hidePodcastDiscovery;
+  final bool markListenedAfterSkip;
+  final bool deleteAfterPlayed;
 
   SettingsBackup(
       {this.theme,
@@ -60,7 +62,9 @@ class SettingsBackup {
       this.notificationLayout,
       this.showNotesFont,
       this.speedList,
-      this.hidePodcastDiscovery});
+      this.hidePodcastDiscovery,
+      this.markListenedAfterSkip,
+      this.deleteAfterPlayed});
 
   Map<String, Object> toJson() {
     return {
@@ -92,7 +96,9 @@ class SettingsBackup {
       'notificationLayout': notificationLayout,
       'showNotesFont': showNotesFont,
       'speedList': speedList,
-      'hidePodcastDiscovery': hidePodcastDiscovery
+      'hidePodcastDiscovery': hidePodcastDiscovery,
+      'markListenedAfterSkip': markListenedAfterSkip,
+      'deleteAfterPlayed': deleteAfterPlayed
     };
   }
 
@@ -128,6 +134,8 @@ class SettingsBackup {
         notificationLayout: json['notificationLayout'] as int,
         showNotesFont: json['showNotesFont'] as int,
         speedList: speedList,
-        hidePodcastDiscovery: json['hidePodcastDiscovery'] as bool);
+        hidePodcastDiscovery: json['hidePodcastDiscovery'] as bool,
+        markListenedAfterSkip: json['markListenedAfterSkip'] as bool,
+        deleteAfterPlayed: json['deleteAfterPlayed'] as bool);
   }
 }