Rename some variables and methods

mauriciocolli · mauriciocolli · commit 5ebb5301c9db · 2017-08-08T18:36:11.000-03:00
diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java b/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java
@@ -21,7 +21,7 @@ protected UrlIdHandler getUrlIdHandler() throws ParsingException {
 
     public abstract String getPlaylistId() throws ParsingException;
     public abstract String getPlaylistName() throws ParsingException;
-    public abstract String getAvatarUrl() throws ParsingException;
+    public abstract String getThumbnailUrl() throws ParsingException;
     public abstract String getBannerUrl() throws ParsingException;
     public abstract String getUploaderUrl() throws ParsingException;
     public abstract String getUploaderName() throws ParsingException;
diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java b/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java
@@ -48,7 +48,7 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingEx
             info.errors.add(e);
         }
         try {
-            info.avatar_url = extractor.getAvatarUrl();
+            info.thumbnail_url = extractor.getThumbnailUrl();
         } catch (Exception e) {
             info.errors.add(e);
         }
@@ -88,7 +88,7 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingEx
         return info;
     }
 
-    public String avatar_url;
+    public String thumbnail_url;
     public String banner_url;
     public String uploader_url;
     public String uploader_name;
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java
@@ -52,7 +52,7 @@ public String getPlaylistName() {
     }
 
     @Override
-    public String getAvatarUrl() {
+    public String getThumbnailUrl() {
         return playlist.optString("artwork_url");
     }
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java
@@ -57,7 +57,7 @@ public String getDescription() {
     }
 
     @Override
-    public String getUploader() {
+    public String getUploaderName() {
         return track.getJSONObject("user").getString("username");
     }
 
@@ -82,7 +82,7 @@ public String getThumbnailUrl() {
     }
 
     @Override
-    public String getUploaderThumbnailUrl() {
+    public String getUploaderAvatarUrl() {
         return track.getJSONObject("user").getString("avatar_url");
     }
 
@@ -170,11 +170,6 @@ public int getAgeLimit() {
         return 0;
     }
 
-    @Override
-    public String getAverageRating() {
-        return null;
-    }
-
     @Override
     public int getLikeCount() {
         return track.getInt("likes_count");
@@ -210,7 +205,7 @@ public StreamInfoItemCollector getRelatedVideos() throws IOException, Extraction
     }
 
     @Override
-    public String getUserUrl() {
+    public String getUploaderUrl() {
         return track.getJSONObject("user").getString("permalink_url");
     }
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java
@@ -64,11 +64,11 @@ public String getPlaylistName() throws ParsingException {
     }
 
     @Override
-    public String getAvatarUrl() throws ParsingException {
+    public String getThumbnailUrl() throws ParsingException {
         try {
             return doc.select("div[id=pl-header] div[class=pl-header-thumb] img").first().attr("abs:src");
         } catch (Exception e) {
-            throw new ParsingException("Could not get playlist avatar");
+            throw new ParsingException("Could not get playlist thumbnail");
         }
     }
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -127,7 +127,7 @@ public String getDescription() throws ParsingException {
     }
 
     @Override
-    public String getUploader() throws ParsingException {
+    public String getUploaderName() throws ParsingException {
         try {
             if (playerArgs == null) {
                 return videoInfoPage.get("author");
@@ -199,7 +199,7 @@ public String getThumbnailUrl() throws ParsingException {
     }
 
     @Override
-    public String getUploaderThumbnailUrl() throws ParsingException {
+    public String getUploaderAvatarUrl() throws ParsingException {
         try {
             return doc.select("a[class*=\"yt-user-photo\"]").first()
                     .select("img").first()
@@ -459,18 +459,6 @@ public int getAgeLimit() throws ParsingException {
         }
     }
 
-    @Override
-    public String getAverageRating() throws ParsingException {
-        try {
-            if (playerArgs == null) {
-                return videoInfoPage.get("avg_rating");
-            }
-            return playerArgs.getString("avg_rating");
-        } catch (JSONException e) {
-            throw new ParsingException("Could not get Average rating", e);
-        }
-    }
-
     @Override
     public int getLikeCount() throws ParsingException {
         String likesString = "";
@@ -542,7 +530,7 @@ public StreamInfoItemCollector getRelatedVideos() throws IOException, Extraction
     }
 
     @Override
-    public String getUserUrl() throws ParsingException {
+    public String getUploaderUrl() throws ParsingException {
         try {
             return doc.select("div[class=\"yt-user-info\"]").first().children()
                     .select("a").first().attr("abs:href");
diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserExtractor.java b/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeUserExtractor.java
@@ -124,7 +124,7 @@ public String getDescription() throws ParsingException {
         try {
             return doc.select("meta[name=\"description\"]").first().attr("content");
         } catch(Exception e) {
-            throw new ParsingException("Could not get channel name", e);
+            throw new ParsingException("Could not get channel description", e);
         }
     }
 
diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java b/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java
@@ -48,19 +48,18 @@ protected UrlIdHandler getUrlIdHandler() throws ParsingException {
     public abstract int getTimeStamp() throws ParsingException;
     public abstract String getTitle() throws ParsingException;
     public abstract String getDescription() throws ParsingException;
-    public abstract String getUploader() throws ParsingException;
-    public abstract String getUserUrl() throws ParsingException;
+    public abstract String getUploaderName() throws ParsingException;
+    public abstract String getUploaderUrl() throws ParsingException;
     public abstract int getLength() throws ParsingException;
     public abstract long getViewCount() throws ParsingException;
     public abstract String getUploadDate() throws ParsingException;
     public abstract String getThumbnailUrl() throws ParsingException;
-    public abstract String getUploaderThumbnailUrl() throws ParsingException;
+    public abstract String getUploaderAvatarUrl() throws ParsingException;
     public abstract List<AudioStream> getAudioStreams() throws IOException, ExtractionException;
     public abstract List<VideoStream> getVideoStreams() throws IOException, ExtractionException;
     public abstract List<VideoStream> getVideoOnlyStreams() throws IOException, ExtractionException;
     public abstract String getDashMpdUrl() throws ParsingException;
     public abstract int getAgeLimit() throws ParsingException;
-    public abstract String getAverageRating() throws ParsingException;
     public abstract int getLikeCount() throws ParsingException;
     public abstract int getDislikeCount() throws ParsingException;
     public abstract StreamInfoItemExtractor getNextVideo() throws IOException, ExtractionException;
diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java b/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java
@@ -190,12 +190,12 @@ private static StreamInfo extractOptionalData(StreamInfo streamInfo, StreamExtra
             streamInfo.addException(e);
         }
         try {
-            streamInfo.uploader = extractor.getUploader();
+            streamInfo.uploader_name = extractor.getUploaderName();
         } catch (Exception e) {
             streamInfo.addException(e);
         }
         try {
-            streamInfo.user_url = extractor.getUserUrl();
+            streamInfo.uploader_url = extractor.getUploaderUrl();
         } catch (Exception e) {
             streamInfo.addException(e);
         }
@@ -215,7 +215,7 @@ private static StreamInfo extractOptionalData(StreamInfo streamInfo, StreamExtra
             streamInfo.addException(e);
         }
         try {
-            streamInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
+            streamInfo.uploader_avatar_url = extractor.getUploaderAvatarUrl();
         } catch (Exception e) {
             streamInfo.addException(e);
         }
@@ -224,11 +224,6 @@ private static StreamInfo extractOptionalData(StreamInfo streamInfo, StreamExtra
         } catch (Exception e) {
             streamInfo.addException(e);
         }
-        try {
-            streamInfo.average_rating = extractor.getAverageRating();
-        } catch (Exception e) {
-            streamInfo.addException(e);
-        }
         try {
             streamInfo.like_count = extractor.getLikeCount();
         } catch (Exception e) {
@@ -269,14 +264,18 @@ public void addException(Exception e) {
     }
 
     public StreamType stream_type;
-    public String uploader;
     public String thumbnail_url;
     public String upload_date;
+    public int duration = -1;
+    public int age_limit = -1;
+
     public long view_count = -1;
+    public int like_count = -1;
+    public int dislike_count = -1;
 
-    public String uploader_thumbnail_url;
-    public String user_url;
-    public String description;
+    public String uploader_name;
+    public String uploader_url;
+    public String uploader_avatar_url;
 
     public List<VideoStream> video_streams;
     public List<AudioStream> audio_streams;
@@ -286,14 +285,10 @@ public void addException(Exception e) {
     // crawling such a file is not service dependent. Therefore getting audio only streams by yust
     // providing the dash mpd fille will be possible in the future.
     public String dashMpdUrl;
-    public int duration = -1;
 
-    public int age_limit = -1;
-    public int like_count = -1;
-    public int dislike_count = -1;
-    public String average_rating;
     public StreamInfoItem next_video;
     public List<InfoItem> related_streams;
     //in seconds. some metadata is not passed using a StreamInfo object!
     public int start_position = 0;
+    public String description = "";
 }
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java
@@ -39,8 +39,8 @@ public void testGetName() throws Exception {
     }
 
     @Test
-    public void testGetAvatarUrl() throws Exception {
-        assertEquals(extractor.getAvatarUrl(), "https://i1.sndcdn.com/artworks-000174203688-bweu12-large.jpg");
+    public void testGetThumbnailUrl() throws Exception {
+        assertEquals(extractor.getThumbnailUrl(), "https://i1.sndcdn.com/artworks-000174203688-bweu12-large.jpg");
     }
 
     @Test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java b/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java
@@ -50,8 +50,8 @@ public void testGetDescription() throws ParsingException {
     }
 
     @Test
-    public void testGetUploader() throws ParsingException {
-        assertEquals(extractor.getUploader(), "LIL UZI VERT");
+    public void testGetUploaderName() throws ParsingException {
+        assertEquals(extractor.getUploaderName(), "LIL UZI VERT");
     }
 
     @Test
@@ -71,8 +71,8 @@ public void testGetUploadDate() throws ParsingException {
     }
 
     @Test
-    public void testGetUserUrl() throws ParsingException {
-        assertEquals(extractor.getUserUrl(), "http://soundcloud.com/liluzivert");
+    public void testGetUploaderUrl() throws ParsingException {
+        assertEquals(extractor.getUploaderUrl(), "http://soundcloud.com/liluzivert");
     }
 
     @Test
@@ -81,8 +81,8 @@ public void testGetThumbnailUrl() throws ParsingException {
     }
 
     @Test
-    public void testGetUploaderThumbnailUrl() throws ParsingException {
-        assertEquals(extractor.getUploaderThumbnailUrl(), "https://a1.sndcdn.com/images/default_avatar_large.png");
+    public void testGetUploaderAvatarUrl() throws ParsingException {
+        assertEquals(extractor.getUploaderAvatarUrl(), "https://a1.sndcdn.com/images/default_avatar_large.png");
     }
 
     @Test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java
@@ -39,8 +39,8 @@ public void testGetName() throws Exception {
     }
 
     @Test
-    public void testGetAvatarUrl() throws Exception {
-        assertTrue(extractor.getAvatarUrl(), extractor.getAvatarUrl().contains("yt"));
+    public void testGetThumbnailUrl() throws Exception {
+        assertTrue(extractor.getThumbnailUrl(), extractor.getThumbnailUrl().contains("yt"));
     }
 
     @Test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java
@@ -74,8 +74,8 @@ public void testGetDescription() throws ParsingException {
     }
 
     @Test
-    public void testGetUploader() throws ParsingException {
-        assertTrue(!extractor.getUploader().isEmpty());
+    public void testGetUploaderName() throws ParsingException {
+        assertTrue(!extractor.getUploaderName().isEmpty());
     }
 
     @Test
@@ -95,8 +95,8 @@ public void testGetUploadDate() throws ParsingException {
     }
 
     @Test
-    public void testGetUserlUrl() throws ParsingException {
-        assertTrue(extractor.getUserUrl().length() > 0);
+    public void testGetUploaderUrl() throws ParsingException {
+        assertTrue(extractor.getUploaderUrl().length() > 0);
     }
 
     @Test
@@ -106,9 +106,9 @@ public void testGetThumbnailUrl() throws ParsingException {
     }
 
     @Test
-    public void testGetUploaderThumbnailUrl() throws ParsingException {
-        assertTrue(extractor.getUploaderThumbnailUrl(),
-                extractor.getUploaderThumbnailUrl().contains(HTTPS));
+    public void testGetUploaderAvatarUrl() throws ParsingException {
+        assertTrue(extractor.getUploaderAvatarUrl(),
+                extractor.getUploaderAvatarUrl().contains(HTTPS));
     }
 
     @Test
diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java b/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java
@@ -58,8 +58,8 @@ public void testGetDescription() throws ParsingException {
     }
 
     @Test
-    public void testGetUploader() throws ParsingException {
-        assertTrue(!extractor.getUploader().isEmpty());
+    public void testGetUploaderName() throws ParsingException {
+        assertTrue(!extractor.getUploaderName().isEmpty());
     }
 
     @Test
@@ -84,9 +84,9 @@ public void testGetThumbnailUrl() throws ParsingException {
     }
 
     @Test
-    public void testGetUploaderThumbnailUrl() throws ParsingException {
-        assertTrue(extractor.getUploaderThumbnailUrl(),
-                extractor.getUploaderThumbnailUrl().contains(HTTPS));
+    public void testGetUploaderAvatarUrl() throws ParsingException {
+        assertTrue(extractor.getUploaderAvatarUrl(),
+                extractor.getUploaderAvatarUrl().contains(HTTPS));
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingEx`
`48`	`48`	`info.errors.add(e);`
`49`	`49`	`}`
`50`	`50`	`try {`
`51`		`- info.avatar_url = extractor.getAvatarUrl();`
	`51`	`+ info.thumbnail_url = extractor.getThumbnailUrl();`
`52`	`52`	`} catch (Exception e) {`
`53`	`53`	`info.errors.add(e);`
`54`	`54`	`}`
`@@ -88,7 +88,7 @@ public static PlaylistInfo getInfo(PlaylistExtractor extractor) throws ParsingEx`
`88`	`88`	`return info;`
`89`	`89`	`}`
`90`	`90`
`91`		`- public String avatar_url;`
	`91`	`+ public String thumbnail_url;`
`92`	`92`	`public String banner_url;`
`93`	`93`	`public String uploader_url;`
`94`	`94`	`public String uploader_name;`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public String getPlaylistName() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`
`55`		`- public String getAvatarUrl() {`
	`55`	`+ public String getThumbnailUrl() {`
`56`	`56`	`return playlist.optString("artwork_url");`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public String getDescription() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`60`		`- public String getUploader() {`
	`60`	`+ public String getUploaderName() {`
`61`	`61`	`return track.getJSONObject("user").getString("username");`
`62`	`62`	`}`
`63`	`63`
`@@ -82,7 +82,7 @@ public String getThumbnailUrl() {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Override`
`85`		`- public String getUploaderThumbnailUrl() {`
	`85`	`+ public String getUploaderAvatarUrl() {`
`86`	`86`	`return track.getJSONObject("user").getString("avatar_url");`
`87`	`87`	`}`
`88`	`88`
`@@ -170,11 +170,6 @@ public int getAgeLimit() {`
`170`	`170`	`return 0;`
`171`	`171`	`}`
`172`	`172`
`173`		`- @Override`
`174`		`- public String getAverageRating() {`
`175`		`- return null;`
`176`		`- }`
`177`		`-`
`178`	`173`	`@Override`
`179`	`174`	`public int getLikeCount() {`
`180`	`175`	`return track.getInt("likes_count");`
`@@ -210,7 +205,7 @@ public StreamInfoItemCollector getRelatedVideos() throws IOException, Extraction`
`210`	`205`	`}`
`211`	`206`
`212`	`207`	`@Override`
`213`		`- public String getUserUrl() {`
	`208`	`+ public String getUploaderUrl() {`
`214`	`209`	`return track.getJSONObject("user").getString("permalink_url");`
`215`	`210`	`}`
`216`	`211`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ public String getPlaylistName() throws ParsingException {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
`67`		`- public String getAvatarUrl() throws ParsingException {`
	`67`	`+ public String getThumbnailUrl() throws ParsingException {`
`68`	`68`	`try {`
`69`	`69`	`return doc.select("div[id=pl-header] div[class=pl-header-thumb] img").first().attr("abs:src");`
`70`	`70`	`} catch (Exception e) {`
`71`		`- throw new ParsingException("Could not get playlist avatar");`
	`71`	`+ throw new ParsingException("Could not get playlist thumbnail");`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public String getDescription() throws ParsingException {`
`124`	`124`	`try {`
`125`	`125`	`return doc.select("meta[name=\"description\"]").first().attr("content");`
`126`	`126`	`} catch(Exception e) {`
`127`		`- throw new ParsingException("Could not get channel name", e);`
	`127`	`+ throw new ParsingException("Could not get channel description", e);`
`128`	`128`	`}`
`129`	`129`	`}`
`130`	`130`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ public void testGetName() throws Exception {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Test`
`42`		`- public void testGetAvatarUrl() throws Exception {`
`43`		`- assertEquals(extractor.getAvatarUrl(), "https://i1.sndcdn.com/artworks-000174203688-bweu12-large.jpg");`
	`42`	`+ public void testGetThumbnailUrl() throws Exception {`
	`43`	`+ assertEquals(extractor.getThumbnailUrl(), "https://i1.sndcdn.com/artworks-000174203688-bweu12-large.jpg");`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Test`