Changed OPDS series labels back to Series [#2331]

mcpierce · mcpierce · commit 0a3dd3e972bd · 2025-02-02T08:58:22.000-05:00
diff --git a/comixed-opds/src/main/java/org/comixedproject/opds/service/OPDSNavigationService.java b/comixed-opds/src/main/java/org/comixedproject/opds/service/OPDSNavigationService.java
@@ -145,7 +145,7 @@ public OPDSNavigationFeed getLibraryFeed(final boolean unread) {
     response.getEntries().add(entry);
 
     log.trace("Adding series link");
-    entry = new OPDSNavigationFeedEntry("SeriesDetail", String.valueOf(SERIES_ID));
+    entry = new OPDSNavigationFeedEntry("Series", String.valueOf(SERIES_ID));
     entry.setContent(new OPDSNavigationFeedContent("All Series"));
     entry
         .getLinks()
@@ -301,7 +301,7 @@ public OPDSNavigationFeed getVolumeFeedForPublisherAndSeries(
     final String selfHref =
         String.format("%s?unread=%s", this.opdsUtils.urlEncodeString(series), unread);
     OPDSNavigationFeed result =
-        new OPDSNavigationFeed(String.format("SeriesDetail: %s", series), selfHref);
+        new OPDSNavigationFeed(String.format("Series: %s", series), selfHref);
     result.getLinks().add(new OPDSLink(NAVIGATION_FEED_LINK_TYPE, SELF, selfHref));
     this.comicDetailService
         .getAllVolumesForPublisherAndSeries(publisher, series, email, unread)
@@ -341,7 +341,7 @@ public OPDSNavigationFeed getVolumeFeedForPublisherAndSeries(
   public OPDSNavigationFeed getRootFeedForSeries(final String email, final boolean unread) {
     log.trace("Loading root feed for series");
     final String selfHref = String.format("series?unread=%s", unread);
-    final OPDSNavigationFeed feed = new OPDSNavigationFeed("SeriesDetail", selfHref);
+    final OPDSNavigationFeed feed = new OPDSNavigationFeed("Series", selfHref);
     feed.getLinks().add(new OPDSLink(NAVIGATION_FEED_LINK_TYPE, SELF, selfHref));
     this.comicDetailService.getAllSeries(email, unread).stream()
         .map(
@@ -386,8 +386,7 @@ public OPDSNavigationFeed getPublishersFeedForSeries(
     log.trace("Loading volumes feed for series: {}", name);
     final String selfHref =
         String.format("%s?unread=%s", this.opdsUtils.urlEncodeString(name), unread);
-    OPDSNavigationFeed result =
-        new OPDSNavigationFeed(String.format("SeriesDetail: %s", name), selfHref);
+    OPDSNavigationFeed result = new OPDSNavigationFeed(String.format("Series: %s", name), selfHref);
     result.getLinks().add(new OPDSLink(NAVIGATION_FEED_LINK_TYPE, SELF, selfHref));
     this.comicDetailService.getAllPublishersForSeries(name, email, unread).stream()
         .forEach(
diff --git a/comixed-opds/src/test/java/org/comixedproject/opds/rest/OPDSPublisherControllerTest.java b/comixed-opds/src/test/java/org/comixedproject/opds/rest/OPDSPublisherControllerTest.java
@@ -46,7 +46,7 @@ public class OPDSPublisherControllerTest {
   private static final String TEST_PUBLISHER_ENCODED = "The+Publisher";
   private static final String TEST_PUBLISHER = "The Publisher";
   private static final boolean TEST_UNREAD = RandomUtils.nextBoolean();
-  private static final String TEST_SERIES_ENCODED = "The+SeriesDetail+Name";
+  private static final String TEST_SERIES_ENCODED = "The+Series+Name";
   private static final String TEST_SERIES = "The Series Name";
   private static final String TEST_VOLUME_ENCODED = "The+Volume";
   private static final String TEST_VOLUME = "The Volume";
