Add PC2.0 persons tag support; fix remaining .value references. All tests now pass.

Author: amugofjava

lib/domain/media/scene.dart

@@ -16,10 +16,10 @@ class Scene {
 
   factory Scene.parse(XmlElement element) {
     return Scene(
-      title: findElementOrNull(element, 'sceneTitle')?.value,
-      description: findElementOrNull(element, 'sceneDescription')?.value,
-      startTime: findElementOrNull(element, 'sceneStartTime')?.value,
-      endTime: findElementOrNull(element, 'sceneEndTime')?.value,
+      title: findElementOrNull(element, 'sceneTitle')?.innerText,
+      description: findElementOrNull(element, 'sceneDescription')?.innerText,
+      startTime: findElementOrNull(element, 'sceneStartTime')?.innerText,
+      endTime: findElementOrNull(element, 'sceneEndTime')?.innerText,
     );
   }
 }

lib/domain/podcast_index/rss_podcast_index.dart

@@ -1,14 +1,17 @@
 import 'package:rss_dart/domain/podcast_index/rss_podcast_index_funding.dart';
+import 'package:rss_dart/domain/podcast_index/rss_podcast_index_person.dart';
 import 'package:rss_dart/domain/podcast_index/rss_podcast_index_locked.dart';
 import 'package:rss_dart/util/helpers.dart';
 import 'package:xml/xml.dart';
 
 class RssPodcastIndex {
   final List<RssPodcastIndexFunding?>? funding;
+  final List<RssPodcastIndexPerson?>? persons;
   final RssPodcastIndexLocked? locked;
 
   RssPodcastIndex({
     this.funding,
+    this.persons,
     this.locked,
   });
 
@@ -21,6 +24,9 @@ class RssPodcastIndex {
       funding: element.findElements('podcast:funding').map((e) {
         return RssPodcastIndexFunding.parse(e);
       }).toList(),
+      persons: element.findElements('podcast:person').map((e) {
+        return RssPodcastIndexPerson.parse(e);
+      }).toList(),
       locked: RssPodcastIndexLocked.parse(
         findElementOrNull(element, 'podcast:locked'),
       ),

lib/domain/podcast_index/rss_podcast_index_person.dart

@@ -0,0 +1,28 @@
+import 'package:xml/xml.dart';
+
+class RssPodcastIndexPerson {
+  String name;
+  String? role;
+  String? group;
+  String? image;
+  String? link;
+
+  RssPodcastIndexPerson({
+    required this.name,
+    this.role,
+    this.group,
+    this.image,
+    this.link,
+  });
+
+  factory RssPodcastIndexPerson.parse(XmlElement element) {
+    final role = element.getAttribute('role');
+    final group = element.getAttribute('group');
+    final image = element.getAttribute('img');
+    final link = element.getAttribute('href');
+    final name = element.innerText.trim();
+
+    return RssPodcastIndexPerson(
+        name: name, role: role, group: group, image: image, link: link);
+  }
+}

lib/domain/rss_feed.dart

@@ -2,6 +2,7 @@ import 'dart:core';
 
 import 'package:rss_dart/domain/dublin_core/dublin_core.dart';
 import 'package:rss_dart/domain/podcast_index/rss_podcast_index.dart';
+import 'package:rss_dart/domain/podcast_index/rss_podcast_index_person.dart';
 import 'package:rss_dart/domain/rss_category.dart';
 import 'package:rss_dart/domain/rss_cloud.dart';
 import 'package:rss_dart/domain/rss_image.dart';
@@ -16,6 +17,7 @@ class RssFeed {
   final String? author;
   final String? description;
   final String? link;
+  final List<RssPodcastIndexPerson?>? persons;
   final List<RssItem> items;
 
   final RssImage? image;
@@ -59,6 +61,7 @@ class RssFeed {
     this.dc,
     this.itunes,
     this.podcastIndex,
+    this.persons,
   });
 
   factory RssFeed.parse(String xmlString) {
@@ -79,6 +82,10 @@ class RssFeed {
           .findElements('item')
           .map((element) => RssItem.parse(element))
           .toList(),
+      persons: channelElement
+          .findElements('person')
+          .map((element) => RssPodcastIndexPerson.parse(element))
+          .toList(),
       image: RssImage.parse(findElementOrNull(channelElement, 'image')),
       cloud: RssCloud.parse(findElementOrNull(channelElement, 'cloud')),
       categories: channelElement

lib/domain/rss_item_itunes.dart

@@ -57,8 +57,8 @@ class RssItemItunes {
       explicit: parseBoolLiteral(element, 'itunes:explicit'),
       subtitle: findElementOrNull(element, 'itunes:subtitle')?.innerText.trim(),
       keywords: findElementOrNull(element, 'itunes:keywords')
-              ?.value
-              ?.split(',')
+              ?.innerText
+              .split(',')
               .map((keyword) => keyword.trim())
               .toList() ??
           const <String>[],

lib/domain/rss_item_podcast_index.dart

@@ -1,4 +1,5 @@
 import 'package:rss_dart/domain/podcast_index/rss_podcast_index_chapters.dart';
+import 'package:rss_dart/domain/podcast_index/rss_podcast_index_person.dart';
 import 'package:rss_dart/domain/podcast_index/rss_podcast_index_soudbite.dart';
 import 'package:rss_dart/domain/podcast_index/rss_podcast_index_transcript.dart';
 import 'package:rss_dart/util/helpers.dart';
@@ -8,11 +9,13 @@ class RssItemPodcastIndex {
   final RssPodcastIndexChapters? chapters;
   final List<RssPodcastIndexTranscript?> transcripts;
   final List<RssPodcastIndexSoundbite?> soundbites;
+  final List<RssPodcastIndexPerson?> persons;
 
   RssItemPodcastIndex({
     this.chapters,
     this.transcripts = const <RssPodcastIndexTranscript>[],
     this.soundbites = const <RssPodcastIndexSoundbite>[],
+    this.persons = const <RssPodcastIndexPerson>[],
   });
 
   factory RssItemPodcastIndex.parse(XmlElement element) {
@@ -26,6 +29,9 @@ class RssItemPodcastIndex {
       soundbites: element.findElements('podcast:soundbite').map((e) {
         return RssPodcastIndexSoundbite.parse(e);
       }).toList(),
+      persons: element.findElements('podcast:person').map((e) {
+        return RssPodcastIndexPerson.parse(e);
+      }).toList(),
     );
   }
 }

lib/domain/rss_itunes_episode_type.dart

@@ -6,7 +6,7 @@ RssItunesEpisodeType? newRssItunesEpisodeType(XmlElement? element) {
   // "full" is default type
   if (element == null) return RssItunesEpisodeType.full;
 
-  switch (element.value) {
+  switch (element.innerText) {
     case 'full':
       return RssItunesEpisodeType.full;
     case 'trailer':

lib/domain/rss_source.dart

@@ -7,12 +7,12 @@ class RssSource {
   const RssSource(this.url, this.value);
 
   static RssSource? parse(XmlElement? element) {
-    if (element == null || element.value == null) {
+    if (element == null) {
       return null;
     }
     final url = element.getAttribute('url');
-    final value = element.value;
+    final value = element.innerText;
 
-    return RssSource(url, value!);
+    return RssSource(url, value);
   }
 }

lib/util/helpers.dart

@@ -2,17 +2,23 @@ import 'dart:core';
 
 import 'package:xml/xml.dart';
 
-XmlElement? findElementOrNull(XmlElement element, String name,
-    {String? namespace,}) {
+XmlElement? findElementOrNull(
+  XmlElement element,
+  String name, {
+  String? namespace,
+}) {
   try {
     return element.findAllElements(name, namespace: namespace).first;
   } on StateError {
     return null;
   }
 }
 
-List<XmlElement>? findAllDirectElementsOrNull(XmlElement element, String name,
-    {String? namespace,}) {
+List<XmlElement>? findAllDirectElementsOrNull(
+  XmlElement element,
+  String name, {
+  String? namespace,
+}) {
   try {
     return element.findElements(name, namespace: namespace).toList();
   } on StateError {
@@ -21,7 +27,7 @@ List<XmlElement>? findAllDirectElementsOrNull(XmlElement element, String name,
 }
 
 bool? parseBoolLiteral(XmlElement element, String tagName) {
-  final v = findElementOrNull(element, tagName)?.value?.toLowerCase().trim();
+  final v = findElementOrNull(element, tagName)?.innerText.toLowerCase().trim();
   if (v == null) return null;
   return ['yes', 'true'].contains(v);
 }