From fa883a47228506ea8ed91b4e1c70fc798e44ad5c Mon Sep 17 00:00:00 2001 From: stonegate Date: Thu, 1 Oct 2020 17:44:39 +0800 Subject: [PATCH] Minor change. --- CHANGELOG.md | 6 ++---- README.md | 2 +- lib/home/home_menu.dart | 2 +- lib/service/opml_build.dart | 4 ++-- lib/settings/data_backup.dart | 8 ++++---- lib/state/podcast_group.dart | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 897c0e2..db333fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,6 @@ Release date 2020/10/1 * Option to hide podcast discovery in search page. * Italian translation support, thanks Edoardo. - - ### Bug fixed * Mark all listened error. @@ -217,13 +215,13 @@ Release date 2020/7/16 ## New features -* OMPL backup file supports group. +* OPML backup file supports group. * Add settings backup and restore. * Enable R8 and dart obfuscate. ## Bugs fixed -* OMPL import not shown in group. +* OPML import not shown in group. ## Minor UI change diff --git a/README.md b/README.md index ff473c6..1379bb9 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The podcast search engine is powered by [ListenNotes](https://listennotes.com). * Podcast group management * Playlist support * Sleep timer / speed setting -* OMPL file export and import +* OPML file export and import * Auto syncing in background * Listening and subscription history record * Dark mode / accent color diff --git a/lib/home/home_menu.dart b/lib/home/home_menu.dart index 6131f0e..32410a9 100644 --- a/lib/home/home_menu.dart +++ b/lib/home/home_menu.dart @@ -58,7 +58,7 @@ class _PopupMenuState extends State { var file = File(path); try { final opml = file.readAsStringSync(); - Map> data = PodcastsBackup.parseOMPL(opml); + Map> data = PodcastsBackup.parseOPML(opml); for (var entry in data.entries) { var title = entry.key; var list = entry.value.reversed; diff --git a/lib/service/opml_build.dart b/lib/service/opml_build.dart index 56e02cb..a9030ee 100644 --- a/lib/service/opml_build.dart +++ b/lib/service/opml_build.dart @@ -54,13 +54,13 @@ class PodcastsBackup { return builder.build(); } - static parseOMPL(String opml) { + static parseOPML(String opml) { var data = >{}; // var opml = file.readAsStringSync(); var content = xml.XmlDocument.parse(opml); var title = content.findAllElements('head').first.findElements('title').first.text; - developer.log(title, name: 'Import OMPL'); + developer.log(title, name: 'Import OPML'); var groups = content.findAllElements('body').first.findElements('outline'); if (title != 'Tsacdop Feed Groups') { var total = content diff --git a/lib/settings/data_backup.dart b/lib/settings/data_backup.dart index 53aae54..feae69b 100644 --- a/lib/settings/data_backup.dart +++ b/lib/settings/data_backup.dart @@ -44,7 +44,7 @@ class _DataBackupState extends State { now.month.toString() + now.day.toString() + now.second.toString(); - var file = File(path.join(tempdir.path, 'tsacdop_ompl_$datePlus.xml')); + var file = File(path.join(tempdir.path, 'tsacdop_opml_$datePlus.xml')); await file.writeAsString(opml.toXmlString()); return file; } @@ -57,7 +57,7 @@ class _DataBackupState extends State { Future _shareFile(File file) async { final bytes = await file.readAsBytes(); await WcFlutterShare.share( - sharePopupTitle: 'share Clip', + sharePopupTitle: 'Share file', fileName: file.path.split('/').last, mimeType: 'text/plain', bytesOfFile: bytes.buffer.asUint8List()); @@ -653,7 +653,7 @@ class __LoginGpodderState extends State<_LoginGpodder> { var rssExp = RegExp(r'^(https?):\/\/(.*)'); final opml = await gpodder.getAllPodcast(); if (opml != '') { - Map> data = PodcastsBackup.parseOMPL(opml); + Map> data = PodcastsBackup.parseOPML(opml); for (var entry in data.entries) { var list = entry.value.reversed; for (var rss in list) { @@ -1005,7 +1005,7 @@ class __GpodderInfoState extends State<_GpodderInfo> { var rssExp = RegExp(r'^(https?):\/\/(.*)'); final opml = await _gpodder.getAllPodcast(); if (opml != '') { - Map> data = PodcastsBackup.parseOMPL(opml); + Map> data = PodcastsBackup.parseOPML(opml); for (var entry in data.entries) { var list = entry.value.reversed; for (var rss in list) { diff --git a/lib/state/podcast_group.dart b/lib/state/podcast_group.dart index 55c8656..13ba8f4 100644 --- a/lib/state/podcast_group.dart +++ b/lib/state/podcast_group.dart @@ -440,7 +440,7 @@ class GroupList extends ChangeNotifier { } } - /// Subscribe podcast from OMPL. + /// Subscribe podcast from OPML. Future _subscribeNewPodcast( {String id, String groupName = 'Home'}) async { //List groupNames = _groups.map((e) => e.name).toList();