From f0d36dfa7eb1b35b99c6c593d4e6e247868e09fe Mon Sep 17 00:00:00 2001 From: Fynn Godau Date: Sun, 22 Dec 2019 17:36:50 +0100 Subject: [PATCH] Bandcamp radio: proper name, date shortened --- .../extractors/BandcampRadioInfoItemExtractor.java | 8 ++------ .../bandcamp/extractors/BandcampRadioStreamExtractor.java | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioInfoItemExtractor.java index 7e701714..2aeb79af 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioInfoItemExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioInfoItemExtractor.java @@ -3,18 +3,14 @@ package org.schabi.newpipe.extractor.services.bandcamp.extractors; import org.json.JSONObject; -import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.exceptions.ParsingException; -import org.schabi.newpipe.extractor.exceptions.ReCaptchaException; import org.schabi.newpipe.extractor.localization.DateWrapper; import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor; import org.schabi.newpipe.extractor.stream.StreamType; import javax.annotation.Nullable; -import java.io.IOException; import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampChannelExtractor.getImageUrl; -import static org.schabi.newpipe.extractor.services.bandcamp.extractors.BandcampRadioStreamExtractor.query; public class BandcampRadioInfoItemExtractor implements StreamInfoItemExtractor { @@ -37,7 +33,7 @@ public class BandcampRadioInfoItemExtractor implements StreamInfoItemExtractor { @Nullable @Override public String getTextualUploadDate() { - return show.getString("date"); + return show.getString("date").replace(" 00:00:00 GMT", ""); } @Nullable @@ -48,7 +44,7 @@ public class BandcampRadioInfoItemExtractor implements StreamInfoItemExtractor { @Override public String getName() throws ParsingException { - return show.getString("date"); + return show.getString("subtitle"); } @Override diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java index 2449f572..82bd0d28 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/bandcamp/extractors/BandcampRadioStreamExtractor.java @@ -1,6 +1,5 @@ package org.schabi.newpipe.extractor.services.bandcamp.extractors; -import org.json.JSONArray; import org.json.JSONObject; import org.jsoup.Jsoup; import org.schabi.newpipe.extractor.MediaFormat; @@ -11,7 +10,6 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.exceptions.ParsingException; import org.schabi.newpipe.extractor.exceptions.ReCaptchaException; import org.schabi.newpipe.extractor.linkhandler.LinkHandler; -import org.schabi.newpipe.extractor.localization.DateWrapper; import org.schabi.newpipe.extractor.stream.AudioStream; import javax.annotation.Nonnull; @@ -76,7 +74,7 @@ public class BandcampRadioStreamExtractor extends BandcampStreamExtractor { @Nullable @Override public String getTextualUploadDate() { - return showInfo.getString("published_date"); + return showInfo.getString("published_date").replace(" 00:00:00 GMT", ""); } @Nonnull