diff --git a/lib/domain/atom_feed.dart b/lib/domain/atom_feed.dart index 92f2cd6..9d8d2c9 100644 --- a/lib/domain/atom_feed.dart +++ b/lib/domain/atom_feed.dart @@ -3,7 +3,7 @@ import 'package:webfeed/domain/atom_generator.dart'; import 'package:webfeed/domain/atom_item.dart'; import 'package:webfeed/domain/atom_link.dart'; import 'package:webfeed/domain/atom_person.dart'; -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class AtomFeed { diff --git a/lib/domain/atom_item.dart b/lib/domain/atom_item.dart index 618015b..2badbb0 100644 --- a/lib/domain/atom_item.dart +++ b/lib/domain/atom_item.dart @@ -3,7 +3,7 @@ import 'package:webfeed/domain/atom_link.dart'; import 'package:webfeed/domain/atom_person.dart'; import 'package:webfeed/domain/atom_source.dart'; import 'package:webfeed/domain/media/media.dart'; -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class AtomItem { diff --git a/lib/domain/atom_person.dart b/lib/domain/atom_person.dart index 3eb1e4a..c68fe45 100644 --- a/lib/domain/atom_person.dart +++ b/lib/domain/atom_person.dart @@ -1,4 +1,4 @@ -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class AtomPerson { diff --git a/lib/domain/atom_source.dart b/lib/domain/atom_source.dart index 37fb619..d632d5a 100644 --- a/lib/domain/atom_source.dart +++ b/lib/domain/atom_source.dart @@ -1,4 +1,4 @@ -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class AtomSource { diff --git a/lib/domain/dublin_core/dublin_core.dart b/lib/domain/dublin_core/dublin_core.dart index 564bb4c..21b3838 100644 --- a/lib/domain/dublin_core/dublin_core.dart +++ b/lib/domain/dublin_core/dublin_core.dart @@ -1,4 +1,4 @@ -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class DublinCore { diff --git a/lib/domain/media/community.dart b/lib/domain/media/community.dart index b301050..8be70b9 100644 --- a/lib/domain/media/community.dart +++ b/lib/domain/media/community.dart @@ -1,7 +1,7 @@ import 'package:webfeed/domain/media/star_rating.dart'; import 'package:webfeed/domain/media/statistics.dart'; import 'package:webfeed/domain/media/tags.dart'; -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class Community { diff --git a/lib/domain/media/group.dart b/lib/domain/media/group.dart index 1a9a1cb..39e4153 100644 --- a/lib/domain/media/group.dart +++ b/lib/domain/media/group.dart @@ -2,7 +2,7 @@ import 'package:webfeed/domain/media/category.dart'; import 'package:webfeed/domain/media/content.dart'; import 'package:webfeed/domain/media/credit.dart'; import 'package:webfeed/domain/media/rating.dart'; -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class Group { diff --git a/lib/domain/media/media.dart b/lib/domain/media/media.dart index 2f685c1..39915b3 100644 --- a/lib/domain/media/media.dart +++ b/lib/domain/media/media.dart @@ -19,7 +19,7 @@ import 'package:webfeed/domain/media/status.dart'; import 'package:webfeed/domain/media/text.dart'; import 'package:webfeed/domain/media/thumbnail.dart'; import 'package:webfeed/domain/media/title.dart'; -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class Media { diff --git a/lib/domain/media/scene.dart b/lib/domain/media/scene.dart index 9eab8d0..f032e1c 100644 --- a/lib/domain/media/scene.dart +++ b/lib/domain/media/scene.dart @@ -1,4 +1,4 @@ -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class Scene { diff --git a/lib/domain/rss_feed.dart b/lib/domain/rss_feed.dart index 6978ef1..f8ada6e 100644 --- a/lib/domain/rss_feed.dart +++ b/lib/domain/rss_feed.dart @@ -5,7 +5,7 @@ import 'package:webfeed/domain/rss_category.dart'; import 'package:webfeed/domain/rss_cloud.dart'; import 'package:webfeed/domain/rss_image.dart'; import 'package:webfeed/domain/rss_item.dart'; -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; import 'rss_itunes.dart'; diff --git a/lib/domain/rss_image.dart b/lib/domain/rss_image.dart index cfc9479..447b628 100644 --- a/lib/domain/rss_image.dart +++ b/lib/domain/rss_image.dart @@ -1,4 +1,4 @@ -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; class RssImage { diff --git a/lib/domain/rss_item.dart b/lib/domain/rss_item.dart index 783585a..4af2b96 100644 --- a/lib/domain/rss_item.dart +++ b/lib/domain/rss_item.dart @@ -4,12 +4,11 @@ import 'package:webfeed/domain/media/media.dart'; import 'package:webfeed/domain/rss_category.dart'; import 'package:webfeed/domain/rss_content.dart'; import 'package:webfeed/domain/rss_enclosure.dart'; +import 'package:webfeed/domain/rss_item_itunes.dart'; import 'package:webfeed/domain/rss_source.dart'; -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; -import 'rss_item_itunes.dart'; - class RssItem { final String title; final String description; @@ -42,8 +41,7 @@ class RssItem { this.enclosure, this.dc, this.itunes, - }) - : this.pubDate = _parsePubDate(pubDate); + }) : this.pubDate = _parsePubDate(pubDate); factory RssItem.parse(XmlElement element) { return RssItem( diff --git a/lib/domain/rss_item_itunes.dart b/lib/domain/rss_item_itunes.dart index 3d89cc5..19f1c12 100644 --- a/lib/domain/rss_item_itunes.dart +++ b/lib/domain/rss_item_itunes.dart @@ -1,4 +1,4 @@ -import 'package:webfeed/util/helpers.dart'; +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; import 'rss_itunes_category.dart'; @@ -42,19 +42,25 @@ class RssItemItunes { } var episodeStr = findElementOrNull(element, "itunes:episode")?.text?.trim(); var seasonStr = findElementOrNull(element, "itunes:season")?.text?.trim(); - var durationStr = findElementOrNull(element, "itunes:duration")?.text?.trim(); + var durationStr = + findElementOrNull(element, "itunes:duration")?.text?.trim(); return RssItemItunes( title: findElementOrNull(element, "itunes:title")?.text?.trim(), episode: episodeStr == null ? null : int.parse(episodeStr), season: seasonStr == null ? null : int.parse(seasonStr), duration: durationStr == null ? null : parseDuration(durationStr), - episodeType: newRssItunesEpisodeType(findElementOrNull(element, "itunes:episodeType")), + episodeType: newRssItunesEpisodeType( + findElementOrNull(element, "itunes:episodeType")), author: findElementOrNull(element, "itunes:author")?.text?.trim(), summary: findElementOrNull(element, "itunes:summary")?.text?.trim(), explicit: parseBoolLiteral(element, "itunes:explicit"), subtitle: findElementOrNull(element, "itunes:subtitle")?.text?.trim(), - keywords: findElementOrNull(element, "itunes:keywords")?.text?.split(",")?.map((keyword) => keyword.trim())?.toList(), + keywords: findElementOrNull(element, "itunes:keywords") + ?.text + ?.split(",") + ?.map((keyword) => keyword.trim()) + ?.toList(), image: RssItunesImage.parse(findElementOrNull(element, "itunes:image")), category: RssItunesCategory.parse( findElementOrNull(element, "itunes:category")), diff --git a/lib/domain/rss_itunes.dart b/lib/domain/rss_itunes.dart index c58ad66..e4e7685 100644 --- a/lib/domain/rss_itunes.dart +++ b/lib/domain/rss_itunes.dart @@ -1,7 +1,6 @@ +import 'package:webfeed/util/xml.dart'; import 'package:xml/xml.dart'; -import 'package:webfeed/util/helpers.dart'; - import 'rss_itunes_category.dart'; import 'rss_itunes_image.dart'; import 'rss_itunes_owner.dart'; @@ -66,4 +65,3 @@ class RssItunes { ); } } - diff --git a/lib/domain/rss_itunes_owner.dart b/lib/domain/rss_itunes_owner.dart index 4bcadc5..2d72294 100644 --- a/lib/domain/rss_itunes_owner.dart +++ b/lib/domain/rss_itunes_owner.dart @@ -1,6 +1,6 @@ import 'package:xml/xml.dart'; -import '../util/helpers.dart'; +import '../util/xml.dart'; class RssItunesOwner { final String name; diff --git a/lib/util/helpers.dart b/lib/util/xml.dart similarity index 100% rename from lib/util/helpers.dart rename to lib/util/xml.dart