Rename SubChannel in channels back to ParentChannel

wb9688 · wb9688 · commit 7320108c661a · 2020-05-08T16:02:59.000+02:00
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/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 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/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 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/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 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/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 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/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 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/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 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

Original file line number	Diff line number	Diff line change
`@@ -53,17 +53,17 @@ public String getDescription() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
`56`		`- public String getSubChannelName() throws ParsingException {`
	`56`	`+ public String getParentChannelName() throws ParsingException {`
`57`	`57`	`return "";`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`		`- public String getSubChannelUrl() throws ParsingException {`
	`61`	`+ public String getParentChannelUrl() throws ParsingException {`
`62`	`62`	`return "";`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public String getSubChannelAvatarUrl() throws ParsingException {`
	`66`	`+ public String getParentChannelAvatarUrl() throws ParsingException {`
`67`	`67`	`return "";`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -76,17 +76,17 @@ public String getDescription() throws ParsingException {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Override`
`79`		`- public String getSubChannelName() throws ParsingException {`
	`79`	`+ public String getParentChannelName() throws ParsingException {`
`80`	`80`	`return "";`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`84`		`- public String getSubChannelUrl() throws ParsingException {`
	`84`	`+ public String getParentChannelUrl() throws ParsingException {`
`85`	`85`	`return "";`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public String getSubChannelAvatarUrl() throws ParsingException {`
	`89`	`+ public String getParentChannelAvatarUrl() throws ParsingException {`
`90`	`90`	`return "";`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -84,17 +84,17 @@ public String getDescription() {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
`87`		`- public String getSubChannelName() throws ParsingException {`
	`87`	`+ public String getParentChannelName() throws ParsingException {`
`88`	`88`	`return "";`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Override`
`92`		`- public String getSubChannelUrl() throws ParsingException {`
	`92`	`+ public String getParentChannelUrl() throws ParsingException {`
`93`	`93`	`return "";`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`@Override`
`97`		`- public String getSubChannelAvatarUrl() throws ParsingException {`
	`97`	`+ public String getParentChannelAvatarUrl() throws ParsingException {`
`98`	`98`	`return "";`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -213,17 +213,17 @@ public String getDescription() throws ParsingException {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`@Override`
`216`		`- public String getSubChannelName() throws ParsingException {`
	`216`	`+ public String getParentChannelName() throws ParsingException {`
`217`	`217`	`return "";`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`@Override`
`221`		`- public String getSubChannelUrl() throws ParsingException {`
	`221`	`+ public String getParentChannelUrl() throws ParsingException {`
`222`	`222`	`return "";`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`@Override`
`226`		`- public String getSubChannelAvatarUrl() throws ParsingException {`
	`226`	`+ public String getParentChannelAvatarUrl() throws ParsingException {`
`227`	`227`	`return "";`
`228`	`228`	`}`
`229`	`229`