Some small fixes to media feeds

* Allow null author in mojo struct. Author is only needed for video
  type, not tv series/movie.
* Remove number of seasons.
* Remove number of episodes on media feed item, should only be embedded
  in the season now.
* Add type sort key in JS so more than one item can be displayed.
* Only get live data for movie/video. TV live data should be embedded
  in the episode (future CL).

Change-Id: I9dfa2fa0bd3b9a9dfa947669f455ecb57dd6f5c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2144673Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Sam Bowen <sgbowen@google.com>
Cr-Commit-Position: refs/heads/master@{#758911}

chrome/browser/media/feeds/media_feeds_converter.cc

@@ -677,11 +677,6 @@ void GetDataFeedItems(
       }
     }
 
-    if (!convert_property.Run(schema_org::property::kPublication, false,
-                              base::BindOnce(&GetLiveDetails))) {
-      continue;
-    }
-
     if (!convert_property.Run(
             schema_org::property::kIdentifier, false,
             base::BindOnce(&GetIdentifiers<mojom::MediaFeedItem>))) {
@@ -698,17 +693,16 @@ void GetDataFeedItems(
                                 base::BindOnce(&GetDuration))) {
         continue;
       }
-    }
-
-    if (converted_item->type == mojom::MediaFeedItemType::kTVSeries) {
-      auto* num_episodes =
-          GetProperty(item.get(), schema_org::property::kNumberOfEpisodes);
-      if (!num_episodes || !IsPositiveInteger(*num_episodes))
+      if (!convert_property.Run(schema_org::property::kPublication, false,
+                                base::BindOnce(&GetLiveDetails))) {
         continue;
-      auto* num_seasons =
-          GetProperty(item.get(), schema_org::property::kNumberOfSeasons);
-      if (!num_seasons || !IsPositiveInteger(*num_seasons))
+      }
+    } else if (converted_item->type == mojom::MediaFeedItemType::kMovie) {
+      if (!convert_property.Run(schema_org::property::kPublication, false,
+                                base::BindOnce(&GetLiveDetails))) {
         continue;
+      }
+    } else if (converted_item->type == mojom::MediaFeedItemType::kTVSeries) {
       if (!convert_property.Run(schema_org::property::kEpisode, false,
                                 base::BindOnce(&GetEpisode))) {
         continue;

chrome/browser/media/feeds/media_feeds_store.mojom

@@ -224,7 +224,7 @@ struct MediaFeedItem {
   mojo_base.mojom.String16 name;
 
   // The author that created the content.
-  Author author;
+  Author? author;
 
   // The date/time this feed item was published.
   mojo_base.mojom.Time date_published;

chrome/browser/resources/media/media_feeds.js

@@ -279,7 +279,8 @@ class MediaFeedsTableDelegate {
         sortKey === 'userStatus' || sortKey === 'lastFetchResult' ||
         sortKey === 'fetchFailedCount' || sortKey === 'lastFetchItemCount' ||
         sortKey === 'lastFetchPlayNextCount' ||
-        sortKey === 'lastFetchContentTypes' || sortKey === 'safeSearchResult') {
+        sortKey === 'lastFetchContentTypes' || sortKey === 'safeSearchResult' ||
+        sortKey === 'type') {
       return val1 > val2 ? 1 : -1;
     } else if (
         sortKey === 'lastDiscoveryTime' || sortKey === 'lastFetchTime' ||