Replace value with innerText when Strings are wanted

Feichtmeier · Feichtmeier · commit 120912dd9b82 · 2023-06-07T10:41:14.000+02:00
diff --git a/example/main.dart b/example/main.dart
@@ -17,7 +17,11 @@ void main() {
     return response.body;
   }).then((bodyString) {
     final channel = RssFeed.parse(bodyString);
-    print(channel);
+    print(channel.title);
+    print(channel.author);
+    print(channel.copyright);
+    print(channel.description);
+    print(channel.docs);
     return channel;
   });
 
@@ -28,7 +32,8 @@ void main() {
     return response.body;
   }).then((bodyString) {
     final feed = AtomFeed.parse(bodyString);
-    print(feed);
+    print(feed.title);
+
     return feed;
   });
 }
diff --git a/lib/domain/atom_feed.dart b/lib/domain/atom_feed.dart
@@ -48,9 +48,9 @@ class AtomFeed {
     }
 
     return AtomFeed(
-      id: findElementOrNull(feedElement, 'id')?.value,
-      title: findElementOrNull(feedElement, 'title')?.value,
-      updated: findElementOrNull(feedElement, 'updated')?.value,
+      id: findElementOrNull(feedElement, 'id')?.innerText,
+      title: findElementOrNull(feedElement, 'title')?.innerText,
+      updated: findElementOrNull(feedElement, 'updated')?.innerText,
       items: feedElement
           .findElements('entry')
           .map((element) => AtomItem.parse(element))
@@ -73,10 +73,10 @@ class AtomFeed {
           .toList(),
       generator:
           AtomGenerator.parse(findElementOrNull(feedElement, 'generator')),
-      icon: findElementOrNull(feedElement, 'icon')?.value,
-      logo: findElementOrNull(feedElement, 'logo')?.value,
-      rights: findElementOrNull(feedElement, 'rights')?.value,
-      subtitle: findElementOrNull(feedElement, 'subtitle')?.value,
+      icon: findElementOrNull(feedElement, 'icon')?.innerText,
+      logo: findElementOrNull(feedElement, 'logo')?.innerText,
+      rights: findElementOrNull(feedElement, 'rights')?.innerText,
+      subtitle: findElementOrNull(feedElement, 'subtitle')?.innerText,
     );
   }
 }
diff --git a/lib/domain/atom_generator.dart b/lib/domain/atom_generator.dart
@@ -13,7 +13,7 @@ class AtomGenerator {
     }
     final uri = element.getAttribute('uri');
     final version = element.getAttribute('version');
-    final value = element.value;
+    final value = element.innerText;
     return AtomGenerator(uri, version, value);
   }
 }
diff --git a/lib/domain/atom_item.dart b/lib/domain/atom_item.dart
@@ -40,9 +40,9 @@ class AtomItem {
 
   factory AtomItem.parse(XmlElement element) {
     return AtomItem(
-      id: findElementOrNull(element, 'id')?.value,
-      title: findElementOrNull(element, 'title')?.value,
-      updated: findElementOrNull(element, 'updated')?.value,
+      id: findElementOrNull(element, 'id')?.innerText,
+      title: findElementOrNull(element, 'title')?.innerText,
+      updated: findElementOrNull(element, 'updated')?.innerText,
       authors: element
           .findElements('author')
           .map((element) => AtomPerson.parse(element))
@@ -60,10 +60,10 @@ class AtomItem {
           .map((element) => AtomPerson.parse(element))
           .toList(),
       source: AtomSource.parse(findElementOrNull(element, 'source')),
-      published: findElementOrNull(element, 'published')?.value,
-      content: findElementOrNull(element, 'content')?.value,
-      summary: findElementOrNull(element, 'summary')?.value,
-      rights: findElementOrNull(element, 'rights')?.value,
+      published: findElementOrNull(element, 'published')?.innerText,
+      content: findElementOrNull(element, 'content')?.innerText,
+      summary: findElementOrNull(element, 'summary')?.innerText,
+      rights: findElementOrNull(element, 'rights')?.innerText,
       media: Media.parse(element),
     );
   }
diff --git a/lib/domain/atom_person.dart b/lib/domain/atom_person.dart
@@ -9,9 +9,9 @@ class AtomPerson {
   const AtomPerson(this.name, this.uri, this.email);
 
   factory AtomPerson.parse(XmlElement element) {
-    final name = findElementOrNull(element, 'name')?.value;
-    final uri = findElementOrNull(element, 'uri')?.value;
-    final email = findElementOrNull(element, 'email')?.value;
+    final name = findElementOrNull(element, 'name')?.innerText;
+    final uri = findElementOrNull(element, 'uri')?.innerText;
+    final email = findElementOrNull(element, 'email')?.innerText;
     return AtomPerson(name, uri, email);
   }
 }
diff --git a/lib/domain/atom_source.dart b/lib/domain/atom_source.dart
@@ -12,9 +12,9 @@ class AtomSource {
     if (element == null) {
       return null;
     }
-    final id = findElementOrNull(element, 'id')?.value;
-    final title = findElementOrNull(element, 'title')?.value;
-    final updated = findElementOrNull(element, 'updated')?.value;
+    final id = findElementOrNull(element, 'id')?.innerText;
+    final title = findElementOrNull(element, 'title')?.innerText;
+    final updated = findElementOrNull(element, 'updated')?.innerText;
     return AtomSource(id, title, updated);
   }
 }
diff --git a/lib/domain/dublin_core/dublin_core.dart b/lib/domain/dublin_core/dublin_core.dart
@@ -41,27 +41,24 @@ class DublinCore {
   factory DublinCore.parse(XmlElement element) {
     final subjects = findAllDirectElementsOrNull(element, 'dc:subject');
     return DublinCore(
-      title: findElementOrNull(element, 'dc:title')?.value,
-      description: findElementOrNull(element, 'dc:description')?.value,
-      creator: findElementOrNull(element, 'dc:creator')?.value,
-      subject: findElementOrNull(element, 'dc:subject')?.value,
+      title: findElementOrNull(element, 'dc:title')?.innerText,
+      description: findElementOrNull(element, 'dc:description')?.innerText,
+      creator: findElementOrNull(element, 'dc:creator')?.innerText,
+      subject: findElementOrNull(element, 'dc:subject')?.innerText,
       subjects: subjects == null
           ? <String>[]
-          : subjects
-              .where((element) => element.value != null)
-              .map((subjectElement) => subjectElement.value!)
-              .toList(),
-      publisher: findElementOrNull(element, 'dc:publisher')?.value,
-      contributor: findElementOrNull(element, 'dc:contributor')?.value,
-      date: findElementOrNull(element, 'dc:date')?.value,
-      type: findElementOrNull(element, 'dc:type')?.value,
-      format: findElementOrNull(element, 'dc:format')?.value,
-      identifier: findElementOrNull(element, 'dc:identifier')?.value,
-      source: findElementOrNull(element, 'dc:source')?.value,
-      language: findElementOrNull(element, 'dc:language')?.value,
-      relation: findElementOrNull(element, 'dc:relation')?.value,
-      coverage: findElementOrNull(element, 'dc:coverage')?.value,
-      rights: findElementOrNull(element, 'dc:rights')?.value,
+          : subjects.map((subjectElement) => subjectElement.innerText).toList(),
+      publisher: findElementOrNull(element, 'dc:publisher')?.innerText,
+      contributor: findElementOrNull(element, 'dc:contributor')?.innerText,
+      date: findElementOrNull(element, 'dc:date')?.innerText,
+      type: findElementOrNull(element, 'dc:type')?.innerText,
+      format: findElementOrNull(element, 'dc:format')?.innerText,
+      identifier: findElementOrNull(element, 'dc:identifier')?.innerText,
+      source: findElementOrNull(element, 'dc:source')?.innerText,
+      language: findElementOrNull(element, 'dc:language')?.innerText,
+      relation: findElementOrNull(element, 'dc:relation')?.innerText,
+      coverage: findElementOrNull(element, 'dc:coverage')?.innerText,
+      rights: findElementOrNull(element, 'dc:rights')?.innerText,
     );
   }
 }
diff --git a/lib/domain/media/category.dart b/lib/domain/media/category.dart
@@ -18,7 +18,7 @@ class Category {
     return Category(
       scheme: element.getAttribute('scheme'),
       label: element.getAttribute('label'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/copyright.dart b/lib/domain/media/copyright.dart
@@ -15,7 +15,7 @@ class Copyright {
     }
     return Copyright(
       url: element.getAttribute('url'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/credit.dart b/lib/domain/media/credit.dart
@@ -15,7 +15,7 @@ class Credit {
     return Credit(
       role: element.getAttribute('role'),
       scheme: element.getAttribute('scheme'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/description.dart b/lib/domain/media/description.dart
@@ -15,7 +15,7 @@ class Description {
     }
     return Description(
       type: element.getAttribute('type'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/hash.dart b/lib/domain/media/hash.dart
@@ -15,7 +15,7 @@ class Hash {
     }
     return Hash(
       algo: element.getAttribute('algo'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/license.dart b/lib/domain/media/license.dart
@@ -18,7 +18,7 @@ class License {
     return License(
       type: element.getAttribute('type'),
       href: element.getAttribute('href'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/media.dart b/lib/domain/media/media.dart
@@ -93,7 +93,7 @@ class Media {
       title: Title.parse(findElementOrNull(element, 'media:title')),
       description:
           Description.parse(findElementOrNull(element, 'media:description')),
-      keywords: findElementOrNull(element, 'media:keywords')?.value,
+      keywords: findElementOrNull(element, 'media:keywords')?.innerText,
       thumbnails: element
           .findElements('media:thumbnail')
           .map((e) => Thumbnail.parse(e))
@@ -107,20 +107,18 @@ class Media {
       community: Community.parse(findElementOrNull(element, 'media:community')),
       comments: findElementOrNull(element, 'media:comments')
               ?.findElements('media:comment')
-              .map((e) => e.value!)
+              .map((e) => e.innerText)
               .toList() ??
           <String>[],
       embed: Embed.parse(findElementOrNull(element, 'media:embed')),
       responses: findElementOrNull(element, 'media:responses')
               ?.findElements('media:response')
-              .where((e) => e.value != null)
-              .map((e) => e.value!)
+              .map((e) => e.innerText)
               .toList() ??
           <String>[],
       backLinks: findElementOrNull(element, 'media:backLinks')
               ?.findElements('media:backLink')
-              .where((e) => e.value != null)
-              .map((e) => e.value!)
+              .map((e) => e.innerText)
               .toList() ??
           <String>[],
       status: Status.parse(findElementOrNull(element, 'media:status')),
diff --git a/lib/domain/media/param.dart b/lib/domain/media/param.dart
@@ -12,7 +12,7 @@ class Param {
   factory Param.parse(XmlElement element) {
     return Param(
       name: element.getAttribute('name'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/peer_link.dart b/lib/domain/media/peer_link.dart
@@ -18,7 +18,7 @@ class PeerLink {
     return PeerLink(
       type: element.getAttribute('type'),
       href: element.getAttribute('href'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/player.dart b/lib/domain/media/player.dart
@@ -21,7 +21,7 @@ class Player {
       url: element.getAttribute('url'),
       width: int.tryParse(element.getAttribute('width') ?? '0') ?? 0,
       height: int.tryParse(element.getAttribute('height') ?? '0') ?? 0,
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/rating.dart b/lib/domain/media/rating.dart
@@ -15,7 +15,7 @@ class Rating {
     }
     return Rating(
       scheme: element.getAttribute('scheme'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/restriction.dart b/lib/domain/media/restriction.dart
@@ -18,7 +18,7 @@ class Restriction {
     return Restriction(
       relationship: element.getAttribute('relationship'),
       type: element.getAttribute('type'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/tags.dart b/lib/domain/media/tags.dart
@@ -14,7 +14,7 @@ class Tags {
       return null;
     }
     return Tags(
-      tags: element.value,
+      tags: element.innerText,
       weight: int.tryParse(element.getAttribute('weight') ?? '1') ?? 1,
     );
   }
diff --git a/lib/domain/media/text.dart b/lib/domain/media/text.dart
@@ -24,7 +24,7 @@ class Text {
       lang: element.getAttribute('lang'),
       start: element.getAttribute('start'),
       end: element.getAttribute('end'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/media/title.dart b/lib/domain/media/title.dart
@@ -15,7 +15,7 @@ class Title {
     }
     return Title(
       type: element.getAttribute('type'),
-      value: element.value,
+      value: element.innerText,
     );
   }
 }
diff --git a/lib/domain/podcast_index/rss_podcast_index_funding.dart b/lib/domain/podcast_index/rss_podcast_index_funding.dart
@@ -14,7 +14,7 @@ class RssPodcastIndexFunding {
 
     return RssPodcastIndexFunding(
       url: element.getAttribute('url'),
-      value: element.value?.trim(),
+      value: element.innerText.trim(),
     );
   }
 }
diff --git a/lib/domain/podcast_index/rss_podcast_index_locked.dart b/lib/domain/podcast_index/rss_podcast_index_locked.dart
@@ -14,7 +14,7 @@ class RssPodcastIndexLocked {
 
     return RssPodcastIndexLocked(
       owner: element.getAttribute('owner'),
-      locked: element.value == 'yes' ? true : false,
+      locked: element.innerText == 'yes' ? true : false,
     );
   }
 }
diff --git a/lib/domain/podcast_index/rss_podcast_index_soudbite.dart b/lib/domain/podcast_index/rss_podcast_index_soudbite.dart
@@ -19,7 +19,7 @@ class RssPodcastIndexSoundbite {
     return RssPodcastIndexSoundbite(
       startTime: double.parse(element.getAttribute('startTime') ?? '0.0'),
       duration: double.parse(element.getAttribute('duration') ?? '0.0'),
-      value: element.value?.trim(),
+      value: element.innerText.trim(),
     );
   }
 }
diff --git a/lib/domain/rss1_feed.dart b/lib/domain/rss1_feed.dart
@@ -64,22 +64,24 @@ class Rss1Feed {
 
     final channel = rdfElement.findElements('channel');
     return Rss1Feed(
-      title: findElementOrNull(rdfElement, 'title')?.value,
-      link: findElementOrNull(rdfElement, 'link')?.value,
-      description: findElementOrNull(rdfElement, 'description')?.value,
+      title: findElementOrNull(rdfElement, 'title')?.innerText,
+      link: findElementOrNull(rdfElement, 'link')?.innerText,
+      description: findElementOrNull(rdfElement, 'description')?.innerText,
       items: rdfElement
           .findElements('item')
           .map((element) => Rss1Item.parse(element))
           .toList(),
       image:
           findElementOrNull(rdfElement, 'image')?.getAttribute('rdf:resource'),
       updatePeriod: _parseUpdatePeriod(
-        findElementOrNull(rdfElement, 'sy:updatePeriod')?.value,
+        findElementOrNull(rdfElement, 'sy:updatePeriod')?.innerText,
+      ),
+      updateFrequency: parseInt(
+        findElementOrNull(rdfElement, 'sy:updateFrequency')?.innerText,
+      ),
+      updateBase: parseDateTime(
+        findElementOrNull(rdfElement, 'sy:updateBase')?.innerText,
       ),
-      updateFrequency:
-          parseInt(findElementOrNull(rdfElement, 'sy:updateFrequency')?.value),
-      updateBase:
-          parseDateTime(findElementOrNull(rdfElement, 'sy:updateBase')?.value),
       dc: channel.isEmpty
           ? null
           : DublinCore.parse(rdfElement.findElements('channel').first),
diff --git a/lib/domain/rss1_item.dart b/lib/domain/rss1_item.dart
@@ -21,9 +21,9 @@ class Rss1Item {
 
   factory Rss1Item.parse(XmlElement element) {
     return Rss1Item(
-      title: findElementOrNull(element, 'title')?.value,
-      description: findElementOrNull(element, 'description')?.value,
-      link: findElementOrNull(element, 'link')?.value,
+      title: findElementOrNull(element, 'title')?.innerText,
+      description: findElementOrNull(element, 'description')?.innerText,
+      link: findElementOrNull(element, 'link')?.innerText,
       dc: DublinCore.parse(element),
       content: RssContent.parse(findElementOrNull(element, 'content:encoded')),
     );
diff --git a/lib/domain/rss_category.dart b/lib/domain/rss_category.dart
@@ -8,7 +8,7 @@ class RssCategory {
 
   factory RssCategory.parse(XmlElement element) {
     final domain = element.getAttribute('domain');
-    final value = element.value;
+    final value = element.innerText;
     return RssCategory(domain, value);
   }
 }
diff --git a/lib/domain/rss_content.dart b/lib/domain/rss_content.dart
diff --git a/lib/domain/rss_feed.dart b/lib/domain/rss_feed.dart
diff --git a/lib/domain/rss_image.dart b/lib/domain/rss_image.dart
diff --git a/lib/domain/rss_item.dart b/lib/domain/rss_item.dart
diff --git a/lib/domain/rss_item_itunes.dart b/lib/domain/rss_item_itunes.dart
diff --git a/lib/domain/rss_itunes.dart b/lib/domain/rss_itunes.dart
diff --git a/lib/domain/rss_itunes_owner.dart b/lib/domain/rss_itunes_owner.dart
diff --git a/lib/domain/rss_itunes_type.dart b/lib/domain/rss_itunes_type.dart

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class AtomGenerator {`
`13`	`13`	`}`
`14`	`14`	`final uri = element.getAttribute('uri');`
`15`	`15`	`final version = element.getAttribute('version');`
`16`		`- final value = element.value;`
	`16`	`+ final value = element.innerText;`
`17`	`17`	`return AtomGenerator(uri, version, value);`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ class AtomPerson {`
`9`	`9`	`const AtomPerson(this.name, this.uri, this.email);`
`10`	`10`
`11`	`11`	`factory AtomPerson.parse(XmlElement element) {`
`12`		`- final name = findElementOrNull(element, 'name')?.value;`
`13`		`- final uri = findElementOrNull(element, 'uri')?.value;`
`14`		`- final email = findElementOrNull(element, 'email')?.value;`
	`12`	`+ final name = findElementOrNull(element, 'name')?.innerText;`
	`13`	`+ final uri = findElementOrNull(element, 'uri')?.innerText;`
	`14`	`+ final email = findElementOrNull(element, 'email')?.innerText;`
`15`	`15`	`return AtomPerson(name, uri, email);`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ class AtomSource {`
`12`	`12`	`if (element == null) {`
`13`	`13`	`return null;`
`14`	`14`	`}`
`15`		`- final id = findElementOrNull(element, 'id')?.value;`
`16`		`- final title = findElementOrNull(element, 'title')?.value;`
`17`		`- final updated = findElementOrNull(element, 'updated')?.value;`
	`15`	`+ final id = findElementOrNull(element, 'id')?.innerText;`
	`16`	`+ final title = findElementOrNull(element, 'title')?.innerText;`
	`17`	`+ final updated = findElementOrNull(element, 'updated')?.innerText;`
`18`	`18`	`return AtomSource(id, title, updated);`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class Category {`
`18`	`18`	`return Category(`
`19`	`19`	`scheme: element.getAttribute('scheme'),`
`20`	`20`	`label: element.getAttribute('label'),`
`21`		`- value: element.value,`
	`21`	`+ value: element.innerText,`
`22`	`22`	`);`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Copyright {`
`15`	`15`	`}`
`16`	`16`	`return Copyright(`
`17`	`17`	`url: element.getAttribute('url'),`
`18`		`- value: element.value,`
	`18`	`+ value: element.innerText,`
`19`	`19`	`);`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class Credit {`
`15`	`15`	`return Credit(`
`16`	`16`	`role: element.getAttribute('role'),`
`17`	`17`	`scheme: element.getAttribute('scheme'),`
`18`		`- value: element.value,`
	`18`	`+ value: element.innerText,`
`19`	`19`	`);`
`20`	`20`	`}`
`21`	`21`	`}`