From 7320108c661ad029e7fecedabb3611143319c4c1 Mon Sep 17 00:00:00 2001 From: wb9688 Date: Fri, 8 May 2020 16:02:59 +0200 Subject: [PATCH] Rename SubChannel in channels back to ParentChannel --- .../extractor/channel/ChannelExtractor.java | 6 ++-- .../extractor/channel/ChannelInfo.java | 36 +++++++++---------- .../MediaCCCConferenceExtractor.java | 6 ++-- .../extractors/PeertubeAccountExtractor.java | 6 ++-- .../extractors/PeertubeChannelExtractor.java | 6 ++-- .../SoundcloudChannelExtractor.java | 6 ++-- .../extractors/YoutubeChannelExtractor.java | 6 ++-- .../PeertubeChannelExtractorTest.java | 26 +++++++++----- 8 files changed, 54 insertions(+), 44 deletions(-) diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java index 3d3b9b1ba..3f54f1c2c 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java @@ -37,7 +37,7 @@ public abstract class ChannelExtractor extends ListExtractor { public abstract String getFeedUrl() throws ParsingException; public abstract long getSubscriberCount() throws ParsingException; public abstract String getDescription() throws ParsingException; - public abstract String getSubChannelName() throws ParsingException; - public abstract String getSubChannelUrl() throws ParsingException; - public abstract String getSubChannelAvatarUrl() throws ParsingException; + public abstract String getParentChannelName() throws ParsingException; + public abstract String getParentChannelUrl() throws ParsingException; + public abstract String getParentChannelAvatarUrl() throws ParsingException; } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java index 874575308..52f18eadc 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java @@ -95,19 +95,19 @@ public class ChannelInfo extends ListInfo { } try { - info.setSubChannelName(extractor.getSubChannelName()); + info.setParentChannelName(extractor.getParentChannelName()); } catch (Exception e) { info.addError(e); } try { - info.setSubChannelUrl(extractor.getSubChannelUrl()); + info.setParentChannelUrl(extractor.getParentChannelUrl()); } catch (Exception e) { info.addError(e); } try { - info.setSubChannelAvatarUrl(extractor.getSubChannelAvatarUrl()); + info.setParentChannelAvatarUrl(extractor.getParentChannelAvatarUrl()); } catch (Exception e) { info.addError(e); } @@ -116,37 +116,37 @@ public class ChannelInfo extends ListInfo { } private String avatarUrl; - private String subChannelName; - private String subChannelUrl; - private String subChannelAvatarUrl; + private String parentChannelName; + private String parentChannelUrl; + private String parentChannelAvatarUrl; private String bannerUrl; private String feedUrl; private long subscriberCount = -1; private String description; private String[] donationLinks; - public String getSubChannelName() { - return subChannelName; + public String getParentChannelName() { + return parentChannelName; } - public void setSubChannelName(String subChannelName) { - this.subChannelName = subChannelName; + public void setParentChannelName(String parentChannelName) { + this.parentChannelName = parentChannelName; } - public String getSubChannelUrl() { - return subChannelUrl; + public String getParentChannelUrl() { + return parentChannelUrl; } - public void setSubChannelUrl(String subChannelUrl) { - this.subChannelUrl = subChannelUrl; + public void setParentChannelUrl(String parentChannelUrl) { + this.parentChannelUrl = parentChannelUrl; } - public String getSubChannelAvatarUrl() { - return subChannelAvatarUrl; + public String getParentChannelAvatarUrl() { + return parentChannelAvatarUrl; } - public void setSubChannelAvatarUrl(String subChannelAvatarUrl) { - this.subChannelAvatarUrl = subChannelAvatarUrl; + public void setParentChannelAvatarUrl(String parentChannelAvatarUrl) { + this.parentChannelAvatarUrl = parentChannelAvatarUrl; } public String getAvatarUrl() { diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java index 4ec6bb646..f11c13c22 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java @@ -53,17 +53,17 @@ public class MediaCCCConferenceExtractor extends ChannelExtractor { } @Override - public String getSubChannelName() throws ParsingException { + public String getParentChannelName() throws ParsingException { return ""; } @Override - public String getSubChannelUrl() throws ParsingException { + public String getParentChannelUrl() throws ParsingException { return ""; } @Override - public String getSubChannelAvatarUrl() throws ParsingException { + public String getParentChannelAvatarUrl() throws ParsingException { return ""; } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java index fd82e4304..d5bdacc6a 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java @@ -76,17 +76,17 @@ public class PeertubeAccountExtractor extends ChannelExtractor { } @Override - public String getSubChannelName() throws ParsingException { + public String getParentChannelName() throws ParsingException { return ""; } @Override - public String getSubChannelUrl() throws ParsingException { + public String getParentChannelUrl() throws ParsingException { return ""; } @Override - public String getSubChannelAvatarUrl() throws ParsingException { + public String getParentChannelAvatarUrl() throws ParsingException { return ""; } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java index ff0ff97df..c8f7f4cb3 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java @@ -76,17 +76,17 @@ public class PeertubeChannelExtractor extends ChannelExtractor { } @Override - public String getSubChannelName() throws ParsingException { + public String getParentChannelName() throws ParsingException { return JsonUtils.getString(json, "ownerAccount.name"); } @Override - public String getSubChannelUrl() throws ParsingException { + public String getParentChannelUrl() throws ParsingException { return JsonUtils.getString(json, "ownerAccount.url"); } @Override - public String getSubChannelAvatarUrl() throws ParsingException { + public String getParentChannelAvatarUrl() throws ParsingException { String value; try { value = JsonUtils.getString(json, "ownerAccount.avatar.path"); diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java index 13afc4c7f..1068b36f1 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java @@ -84,17 +84,17 @@ public class SoundcloudChannelExtractor extends ChannelExtractor { } @Override - public String getSubChannelName() throws ParsingException { + public String getParentChannelName() throws ParsingException { return ""; } @Override - public String getSubChannelUrl() throws ParsingException { + public String getParentChannelUrl() throws ParsingException { return ""; } @Override - public String getSubChannelAvatarUrl() throws ParsingException { + public String getParentChannelAvatarUrl() throws ParsingException { return ""; } diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java index 7b614bffa..0e5329425 100644 --- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java @@ -213,17 +213,17 @@ public class YoutubeChannelExtractor extends ChannelExtractor { } @Override - public String getSubChannelName() throws ParsingException { + public String getParentChannelName() throws ParsingException { return ""; } @Override - public String getSubChannelUrl() throws ParsingException { + public String getParentChannelUrl() throws ParsingException { return ""; } @Override - public String getSubChannelAvatarUrl() throws ParsingException { + public String getParentChannelAvatarUrl() throws ParsingException { return ""; } diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java index 77d0623e8..010dbd7b4 100644 --- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java @@ -85,13 +85,18 @@ public class PeertubeChannelExtractorTest { } @Test - public void testSubChannelName() throws ParsingException { - assertEquals("libux", extractor.getSubChannelName()); + public void testParentChannelName() throws ParsingException { + assertEquals("libux", extractor.getParentChannelName()); } @Test - public void testSubChannelUrl() throws ParsingException { - assertEquals("https://peertube.mastodon.host/accounts/libux", extractor.getSubChannelUrl()); + public void testParentChannelUrl() throws ParsingException { + assertEquals("https://peertube.mastodon.host/accounts/libux", extractor.getParentChannelUrl()); + } + + @Test + public void testParentChannelAvatarUrl() throws ParsingException { + assertIsSecureUrl(extractor.getParentChannelAvatarUrl()); } @Test @@ -192,13 +197,18 @@ public class PeertubeChannelExtractorTest { } @Test - public void testSubChannelName() throws ParsingException { - assertEquals("booteille", extractor.getSubChannelName()); + public void testParentChannelName() throws ParsingException { + assertEquals("booteille", extractor.getParentChannelName()); } @Test - public void testSubChannelUrl() throws ParsingException { - assertEquals("https://peertube.mastodon.host/accounts/booteille", extractor.getSubChannelUrl()); + public void testParentChannelUrl() throws ParsingException { + assertEquals("https://peertube.mastodon.host/accounts/booteille", extractor.getParentChannelUrl()); + } + + @Test + public void testParentChannelAvatarUrl() throws ParsingException { + assertIsSecureUrl(extractor.getParentChannelAvatarUrl()); } @Test