Merge pull request #326 from wb9688/subchannel-parentchannel

Rename SubChannel in channels back to ParentChannel
TeamNewPipe · May 8, 2020 · 3ddd6e4 · 3ddd6e4
2 parents 44d382b + 7320108
commit 3ddd6e4
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 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
@@ -37,7 +37,7 @@ public ChannelExtractor(StreamingService service, ListLinkHandler linkHandler) {
     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
@@ -95,19 +95,19 @@ public static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
         }
 
         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 static ChannelInfo getInfo(ChannelExtractor extractor) throws IOException
     }
 
     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/...g/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java b/...g/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCConferenceExtractor.java
@@ -53,17 +53,17 @@ public String getDescription() {
     }
 
     @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/...a/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java b/...a/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeAccountExtractor.java
@@ -76,17 +76,17 @@ public String getDescription() throws ParsingException {
     }
 
     @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/...a/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java b/...a/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeChannelExtractor.java
@@ -76,17 +76,17 @@ public String getDescription() throws ParsingException {
     }
 
     @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/...g/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java b/...g/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java
@@ -84,17 +84,17 @@ public String getDescription() {
     }
 
     @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/...ava/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java b/...ava/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeChannelExtractor.java
@@ -213,17 +213,17 @@ public String getDescription() throws ParsingException {
     }
 
     @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/...est/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java b/...est/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelExtractorTest.java
@@ -85,13 +85,18 @@ public void testDescription() throws ParsingException {
         }
 
         @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 void testDescription() throws ParsingException {
         }
 
         @Test
-        public void testSubChannelName() throws ParsingException {
-            assertEquals("booteille", extractor.getSubChannelName());
+        public void testParentChannelName() throws ParsingException {
+            assertEquals("booteille", extractor.getParentChannelName());
+        }
+
+        @Test
+        public void testParentChannelUrl() throws ParsingException {
+            assertEquals("https://peertube.mastodon.host/accounts/booteille", extractor.getParentChannelUrl());
         }
 
         @Test
-        public void testSubChannelUrl() throws ParsingException {
-            assertEquals("https://peertube.mastodon.host/accounts/booteille", extractor.getSubChannelUrl());
+        public void testParentChannelAvatarUrl() throws ParsingException {
+            assertIsSecureUrl(extractor.getParentChannelAvatarUrl());
         }
 
         @Test