Funkwhale
/
tsacdop-podcast-app-android
mirror of https://github.com/stonega/tsacdop
1
0
Fork 0
Code Issues Releases Wiki Activity

Change download position.

This commit is contained in:
stonegate 2020-10-10 21:43:59 +08:00
parent 88ce52dcae
commit 05d5b76ca6
3 changed files with 222 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/local_storage/key_value_storage.dart
View File

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

386
lib/settings/storage.dart
View File

@ -1,7 +1,9 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:path_provider/path_provider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:tsacdop/util/general_dialog.dart';
import '../local_storage/key_value_storage.dart'; import '../local_storage/key_value_storage.dart';
import '../settings/downloads_manage.dart'; import '../settings/downloads_manage.dart';
@ -20,7 +22,8 @@ class _StorageSettingState extends State<StorageSetting>
final KeyValueStorage cacheStorage = KeyValueStorage(cacheMaxKey); final KeyValueStorage cacheStorage = KeyValueStorage(cacheMaxKey);
AnimationController _controller; AnimationController _controller;
Animation<double> _animation; Animation<double> _animation;
_getCacheMax() async { List<String> _dirs;
Future<void> _getCacheMax() async {
var cache = var cache =
await cacheStorage.getInt(defaultValue: (200 * 1024 * 1024).toInt()); await cacheStorage.getInt(defaultValue: (200 * 1024 * 1024).toInt());
if (cache == 0) { if (cache == 0) {
@ -56,17 +59,30 @@ class _StorageSettingState extends State<StorageSetting>
return days; return days;
} }
_setAutoDeleteDays(int days) async { Future<int> _getDownloadPasition() async {
final storage = KeyValueStorage(downloadPositionKey);
final index = await storage.getInt();
final externalDirs = await getExternalStorageDirectories();
_dirs = [for (var dir in externalDirs) dir.path];
return index;
}
Future<void> _setAutoDeleteDays(int days) async {
var storage = KeyValueStorage(autoDeleteKey); var storage = KeyValueStorage(autoDeleteKey);
await storage.saveInt(days); await storage.saveInt(days);
setState(() {}); setState(() {});
} }
_setAudtDownloadNetwork(bool boo) async { Future<void> _setAudtDownloadNetwork(bool boo) async {
var storage = KeyValueStorage(autoDownloadNetworkKey); var storage = KeyValueStorage(autoDownloadNetworkKey);
await storage.saveBool(boo); await storage.saveBool(boo);
} }
Future<void> _setDownloadPosition(int index) async {
final storage = KeyValueStorage(downloadPositionKey);
await storage.saveInt(index);
}
double _value; double _value;
@override @override
@ -105,189 +121,181 @@ class _StorageSettingState extends State<StorageSetting>
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Column( Padding(
mainAxisAlignment: MainAxisAlignment.start, padding: EdgeInsets.all(10.0),
mainAxisSize: MainAxisSize.min, ),
children: <Widget>[ Container(
Padding( height: 30.0,
padding: EdgeInsets.all(10.0), padding: EdgeInsets.symmetric(horizontal: 70),
alignment: Alignment.centerLeft,
child: Text(s.network,
style: context.textTheme.bodyText1
.copyWith(color: context.accentColor)),
),
Selector<SettingState, bool>(
selector: (_, settings) => settings.downloadUsingData,
builder: (_, data, __) {
return ListTile(
onTap: () => settings.downloadUsingData = !data,
contentPadding: EdgeInsets.only(
left: 70.0, right: 25, bottom: 10, top: 10),
title: Text(s.settingsNetworkCellular),
subtitle: Text(s.settingsNetworkCellularDes),
trailing: Transform.scale(
scale: 0.9,
child: Switch(
value: data,
onChanged: (value) =>
settings.downloadUsingData = value,
),
), ),
Container( );
height: 30.0, },
padding: EdgeInsets.symmetric(horizontal: 70), ),
alignment: Alignment.centerLeft, FutureBuilder<bool>(
child: Text(s.network, future: _getAutoDownloadNetwork(),
style: Theme.of(context) initialData: false,
.textTheme builder: (context, snapshot) {
.bodyText1 return ListTile(
.copyWith(color: Theme.of(context).accentColor)), onTap: () async {
), _setAudtDownloadNetwork(!snapshot.data);
ListView( setState(() {});
physics: const BouncingScrollPhysics(), },
shrinkWrap: true, contentPadding: EdgeInsets.only(
scrollDirection: Axis.vertical, left: 70.0, right: 25, bottom: 10, top: 10),
children: <Widget>[ title: Text(s.settingsNetworkCellularAuto),
Selector<SettingState, bool>( subtitle: Text(s.settingsNetworkCellularAutoDes),
selector: (_, settings) => settings.downloadUsingData, trailing: Transform.scale(
builder: (_, data, __) { scale: 0.9,
return ListTile( child: Switch(
onTap: () => settings.downloadUsingData = !data, value: snapshot.data,
contentPadding: EdgeInsets.only( onChanged: (value) async {
left: 70.0, right: 25, bottom: 10, top: 10), await _setAudtDownloadNetwork(value);
title: Text(s.settingsNetworkCellular), setState(() {});
subtitle: Text(s.settingsNetworkCellularDes),
trailing: Transform.scale(
scale: 0.9,
child: Switch(
value: data,
onChanged: (value) =>
settings.downloadUsingData = value,
),
),
);
}, },
), ),
Divider(height: 1),
FutureBuilder<bool>(
future: _getAutoDownloadNetwork(),
initialData: false,
builder: (context, snapshot) {
return ListTile(
onTap: () async {
_setAudtDownloadNetwork(!snapshot.data);
setState(() {});
},
contentPadding: EdgeInsets.only(
left: 70.0, right: 25, bottom: 10, top: 10),
title: Text(s.settingsNetworkCellularAuto),
subtitle:
Text(s.settingsNetworkCellularAutoDes),
trailing: Transform.scale(
scale: 0.9,
child: Switch(
value: snapshot.data,
onChanged: (value) async {
await _setAudtDownloadNetwork(value);
setState(() {});
},
),
),
);
}),
Divider(height: 1),
],
),
]),
Column(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Padding(
padding: EdgeInsets.all(10.0),
),
Container(
height: 30.0,
padding: EdgeInsets.symmetric(horizontal: 70),
alignment: Alignment.centerLeft,
child: Text(s.settingStorage,
style: Theme.of(context)
.textTheme
.bodyText1
.copyWith(color: Theme.of(context).accentColor)),
),
ListView(
physics: const BouncingScrollPhysics(),
shrinkWrap: true,
scrollDirection: Axis.vertical,
children: <Widget>[
ListTile(
onTap: () => Navigator.push(
context,
MaterialPageRoute(
builder: (context) => DownloadsManage())),
contentPadding: EdgeInsets.symmetric(horizontal: 70.0),
title: Text(s.download),
subtitle: Text(s.settingsManageDownloadDes),
), ),
Divider(height: 1), );
FutureBuilder<int>( }),
future: _getAutoDeleteDays(), Divider(height: 1),
initialData: 30, Padding(
builder: (context, snapshot) { padding: EdgeInsets.all(10.0),
return ListTile(
contentPadding:
EdgeInsets.only(left: 70.0, right: 20),
title: Text(s.settingsAutoDelete),
subtitle: Text(s.settingsAutoDeleteDes),
trailing: MyDropdownButton(
hint: snapshot.data == -1
? Text(s.daysCount(0))
: Text(s.daysCount(snapshot.data)),
underline: Center(),
elevation: 1,
value: snapshot.data,
onChanged: (value) async {
await _setAutoDeleteDays(value);
},
items: <int>[-1, 5, 10, 15, 30]
.map<DropdownMenuItem<int>>((e) {
return DropdownMenuItem<int>(
value: e,
child: e == -1
? Text(s.daysCount(0))
: Text(s.daysCount(e)));
}).toList()),
);
},
),
Divider(height: 1),
ListTile(
contentPadding: EdgeInsets.only(left: 70.0, right: 25),
// leading: Icon(Icons.colorize),
title: Text(s.settingsAudioCache),
subtitle: Text(s.settingsAudioCacheDes),
trailing: Text.rich(TextSpan(
text: '${(_value ~/ 100) * 100}',
style: GoogleFonts.teko(
textStyle: context.textTheme.headline6
.copyWith(color: context.accentColor)),
children: [
TextSpan(
text: ' Mb',
style: context.textTheme.subtitle2),
])),
),
Padding(
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)),
child: Slider(
label: '${_value ~/ 100 * 100} Mb',
activeColor: context.accentColor,
inactiveColor: context.primaryColorDark,
value: _value,
min: 100,
max: 1000,
divisions: 9,
onChanged: (val) {
setState(() {
_value = val;
});
cacheStorage
.saveInt((val * 1024 * 1024).toInt());
}),
),
),
Divider(height: 1),
],
),
],
), ),
Container(
height: 30.0,
padding: EdgeInsets.symmetric(horizontal: 70),
alignment: Alignment.centerLeft,
child: Text(s.settingStorage,
style: context.textTheme.bodyText1
.copyWith(color: context.accentColor)),
),
ListTile(
onTap: () => Navigator.push(context,
MaterialPageRoute(builder: (context) => DownloadsManage())),
contentPadding: EdgeInsets.symmetric(horizontal: 70.0),
title: Text(s.download),
subtitle: Text(s.settingsManageDownloadDes),
),
FutureBuilder<int>(
future: _getDownloadPasition(),
initialData: 0,
builder: (context, snapshot) {
return ListTile(
contentPadding: EdgeInsets.only(left: 70.0, right: 20),
title: Text('Donwload position'),
subtitle: Text(_dirs == null ? '' : _dirs[snapshot.data],
maxLines: 2, overflow: TextOverflow.ellipsis),
onTap: () => generalSheet(
context,
title: 'Download position',
child: Column(children: [
SizedBox(
height: 10,
),
for (var dir in _dirs)
ListTile(
title: Text(dir),
onTap: () =>
_setDownloadPosition(_dirs.indexOf(dir)),
trailing: Radio<int>(
value: _dirs.indexOf(dir),
groupValue: snapshot.data,
onChanged: _setDownloadPosition),
),
SizedBox(
height: 30,
)
]),
),
);
}),
FutureBuilder<int>(
future: _getAutoDeleteDays(),
initialData: 30,
builder: (context, snapshot) {
return ListTile(
contentPadding: EdgeInsets.only(left: 70.0, right: 20),
title: Text(s.settingsAutoDelete),
subtitle: Text(s.settingsAutoDeleteDes),
trailing: MyDropdownButton(
hint: snapshot.data == -1
? Text(s.daysCount(0))
: Text(s.daysCount(snapshot.data)),
underline: Center(),
elevation: 1,
value: snapshot.data,
onChanged: (value) async {
await _setAutoDeleteDays(value);
},
items: <int>[-1, 5, 10, 15, 30]
.map<DropdownMenuItem<int>>((e) {
return DropdownMenuItem<int>(
value: e,
child: e == -1
? Text(s.daysCount(0))
: Text(s.daysCount(e)));
}).toList()),
);
},
),
ListTile(
contentPadding: EdgeInsets.only(left: 70.0, right: 25),
// leading: Icon(Icons.colorize),
title: Text(s.settingsAudioCache),
subtitle: Text(s.settingsAudioCacheDes),
trailing: Text.rich(TextSpan(
text: '${(_value ~/ 100) * 100}',
style: GoogleFonts.teko(
textStyle: context.textTheme.headline6
.copyWith(color: context.accentColor)),
children: [
TextSpan(text: ' Mb', style: context.textTheme.subtitle2),
])),
),
Padding(
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)),
child: Slider(
label: '${_value ~/ 100 * 100} Mb',
activeColor: context.accentColor,
inactiveColor: context.primaryColorDark,
value: _value,
min: 100,
max: 1000,
divisions: 9,
onChanged: (val) {
setState(() {
_value = val;
});
cacheStorage.saveInt((val * 1024 * 1024).toInt());
}),
),
),
Divider(height: 1),
], ],
), ),
), ),
@ -295,3 +303,19 @@ class _StorageSettingState extends State<StorageSetting>
); );
} }
} }
class _DownloadPosition extends StatefulWidget {
_DownloadPosition({Key key}) : super(key: key);
@override
__DownloadPositionState createState() => __DownloadPositionState();
}
class __DownloadPositionState extends State<_DownloadPosition> {
@override
Widget build(BuildContext context) {
return Column(
children: [],
);
}
}

18
lib/state/download_state.dart
View File

@ -73,6 +73,13 @@ class AutoDownloader {
_completer?.complete(); _completer?.complete();
} }
Future<Directory> _getDownloadDirectory() async {
final storage = KeyValueStorage(downloadPositionKey);
final index = await storage.getInt();
final externalDirs = await getExternalStorageDirectories();
return externalDirs[index];
}
Future _saveMediaId(EpisodeTask episodeTask) async { Future _saveMediaId(EpisodeTask episodeTask) async {
final completeTask = await FlutterDownloader.loadTasksWithRawQuery( final completeTask = await FlutterDownloader.loadTasksWithRawQuery(
query: "SELECT * FROM task WHERE task_id = '${episodeTask.taskId}'"); query: "SELECT * FROM task WHERE task_id = '${episodeTask.taskId}'");
@ -91,7 +98,7 @@ class AutoDownloader {
Future startTask(List<EpisodeBrief> episodes, Future startTask(List<EpisodeBrief> episodes,
{bool showNotification = false}) async { {bool showNotification = false}) async {
for (var episode in episodes) { for (var episode in episodes) {
final dir = await getExternalStorageDirectory(); final dir = await _getDownloadDirectory();
var localPath = path.join(dir.path, episode.feedTitle); var localPath = path.join(dir.path, episode.feedTitle);
final saveDir = Directory(localPath); final saveDir = Directory(localPath);
var hasExisted = await saveDir.exists(); var hasExisted = await saveDir.exists();
@ -182,6 +189,13 @@ class DownloadState extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
Future<Directory> _getDownloadDirectory() async {
final storage = KeyValueStorage(downloadPositionKey);
final index = await storage.getInt();
final externalDirs = await getExternalStorageDirectories();
return externalDirs[index];
}
void _bindBackgroundIsolate() { void _bindBackgroundIsolate() {
var _port = ReceivePort(); var _port = ReceivePort();
var isSuccess = IsolateNameServer.registerPortWithName( var isSuccess = IsolateNameServer.registerPortWithName(
@ -256,7 +270,7 @@ class DownloadState extends ChangeNotifier {
var dbHelper = DBHelper(); var dbHelper = DBHelper();
var isDownloaded = await dbHelper.isDownloaded(episode.enclosureUrl); var isDownloaded = await dbHelper.isDownloaded(episode.enclosureUrl);
if (!isDownloaded) { if (!isDownloaded) {
final dir = await getExternalStorageDirectory(); final dir = await _getDownloadDirectory();
var localPath = var localPath =
path.join(dir.path, episode.feedTitle?.replaceAll('/', '')); path.join(dir.path, episode.feedTitle?.replaceAll('/', ''));
final saveDir = Directory(localPath); final saveDir = Directory(localPath);