Skip to content

Commit 8806fb4

Browse files
B0polStypox
B0pol
authored and
Stypox
committed
address reviews
1 parent c47cc54 commit 8806fb4

6 files changed

Lines changed: 41 additions & 153 deletions

File tree

‎extractor/src/main/java/org/schabi/newpipe/extractor/localization/Localization.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ public int hashCode() {
103103

104104
/**
105105
* Converts a three letter language code (ISO 639-2/T) to a Locale
106-
* in the limit of Java Locale class.
106+
* because limits of Java Locale class.
107107
*
108108
* @param code a three letter language code
109109
* @return the Locale corresponding
110110
*/
111111
public static Locale getLocaleFromThreeLetterCode(@Nonnull String code) throws ParsingException {
112-
String[] languages = Locale.getISOLanguages();
113-
Map<String, Locale> localeMap = new HashMap<>(languages.length);
112+
final String[] languages = Locale.getISOLanguages();
113+
final Map<String, Locale> localeMap = new HashMap<>(languages.length);
114114
for (String language : languages) {
115115
final Locale locale = new Locale(language);
116116
localeMap.put(locale.getISO3Language(), locale);

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ public Privacy getPrivacy() {
435435
case 4:
436436
return Privacy.INTERNAL;
437437
default:
438-
return null;
438+
return Privacy.OTHER;
439439
}
440440
}
441441

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ public String getHost() {
11091109
@Nonnull
11101110
@Override
11111111
public Privacy getPrivacy() {
1112-
boolean isUnlisted = playerResponse
1112+
final boolean isUnlisted = playerResponse
11131113
.getObject("microformat")
11141114
.getObject("playerMicroformatRenderer")
11151115
.getBoolean("isUnlisted");

‎extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,6 +513,7 @@ public enum Privacy {
513513
PUBLIC,
514514
UNLISTED,
515515
PRIVATE,
516-
INTERNAL
516+
INTERNAL,
517+
OTHER
517518
}
518519
}

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/media_ccc/MediaCCCStreamExtractorTest.java‎

Lines changed: 34 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -50,52 +50,19 @@ public static void setUp() throws Exception {
5050
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("SSH-Sessions", "\"Terminal Multiplexer\""); }
5151
@Override public long expectedLength() { return 3097; }
5252
@Override public long expectedViewCountAtLeast() { return 2380; }
53-
@Nullable
54-
@Override public String expectedUploadDate() { return "2018-05-11 00:00:00.000"; }
55-
@Nullable
56-
@Override
57-
public String expectedTextualUploadDate() {
58-
return "2018-05-11T02:00:00.000+02:00";
59-
}
60-
61-
@Override
62-
public long expectedLikeCountAtLeast() {
63-
return -1;
64-
}
65-
66-
@Override
67-
public long expectedDislikeCountAtLeast() {
68-
return -1;
69-
}
70-
71-
@Override
72-
public boolean expectedHasRelatedStreams() {
73-
return false;
74-
}
75-
76-
@Override
77-
public boolean expectedHasSubtitles() {
78-
return false;
79-
}
80-
81-
@Override
82-
public boolean expectedHasFrames() {
83-
return false;
84-
}
85-
86-
@Override
87-
public List<String> expectedTags() {
88-
return Arrays.asList("gpn18", "105");
89-
}
90-
91-
@Override
92-
public int expectedStreamSegmentsCount() {
93-
return 0;
94-
}
95-
96-
@Override
97-
@Test
98-
public void testThumbnailUrl() throws Exception {
53+
@Nullable @Override public String expectedUploadDate() { return "2018-05-11 00:00:00.000"; }
54+
@Nullable @Override public String expectedTextualUploadDate() { return "2018-05-11T02:00:00.000+02:00"; }
55+
@Override public long expectedLikeCountAtLeast() { return -1; }
56+
@Override public long expectedDislikeCountAtLeast() { return -1; }
57+
@Override public boolean expectedHasRelatedStreams() { return false; }
58+
@Override public boolean expectedHasSubtitles() { return false; }
59+
@Override public boolean expectedHasFrames() { return false; }
60+
@Override public List<String> expectedTags() { return Arrays.asList("gpn18", "105"); }
61+
@Override public int expectedStreamSegmentsCount() { return 0; }
62+
@Override public Locale expectedLanguageInfo() { return new Locale("de"); }
63+
64+
@Override
65+
@Test public void testThumbnailUrl() throws Exception {
9966
super.testThumbnailUrl();
10067
assertEquals("https://static.media.ccc.de/media/events/gpn/gpn18/105-hd.jpg", extractor.getThumbnailUrl());
10168
}
@@ -120,11 +87,6 @@ public void testAudioStreams() throws Exception {
12087
super.testAudioStreams();
12188
assertEquals(2, extractor.getAudioStreams().size());
12289
}
123-
124-
@Override
125-
public Locale expectedLanguageInfo() {
126-
return new Locale("de");
127-
}
12890
}
12991

13092
public static class _36c3PrivacyMessaging extends DefaultStreamExtractorTest {
@@ -139,111 +101,37 @@ public static void setUp() throws Exception {
139101
extractor.fetchPage();
140102
}
141103

142-
@Override
143-
public StreamExtractor extractor() {
104+
@Override public StreamExtractor extractor() {
144105
return extractor;
145106
}
146-
147-
@Override
148-
public StreamingService expectedService() {
107+
@Override public StreamingService expectedService() {
149108
return MediaCCC;
150109
}
151-
152-
@Override
153-
public String expectedName() {
110+
@Override public String expectedName() {
154111
return "What's left for private messaging?";
155112
}
156-
157-
@Override
158-
public String expectedId() {
113+
@Override public String expectedId() {
159114
return ID;
160115
}
116+
@Override public String expectedUrlContains() { return URL; }
117+
@Override public String expectedOriginalUrlContains() { return URL; }
118+
@Override public StreamType expectedStreamType() { return StreamType.VIDEO_STREAM; }
119+
@Override public String expectedUploaderName() { return "36c3"; }
120+
@Override public String expectedUploaderUrl() { return "https://media.ccc.de/c/36c3"; }
121+
@Override public List<String> expectedDescriptionContains() { return Arrays.asList("WhatsApp", "Signal"); }
122+
@Override public long expectedLength() { return 3603; }
123+
@Override public long expectedViewCountAtLeast() { return 2380; }
124+
@Nullable @Override public String expectedUploadDate() { return "2020-01-11 00:00:00.000"; }
125+
@Nullable @Override public String expectedTextualUploadDate() { return "2020-01-11T01:00:00.000+01:00"; }
126+
@Override public long expectedLikeCountAtLeast() { return -1; }
127+
@Override public long expectedDislikeCountAtLeast() { return -1; }
128+
@Override public boolean expectedHasRelatedStreams() { return false; }
129+
@Override public boolean expectedHasSubtitles() { return false; }
130+
@Override public boolean expectedHasFrames() { return false; }
131+
@Override public List<String> expectedTags() { return Arrays.asList("36c3", "10565", "2019", "Security", "Main"); }
161132

162133
@Override
163-
public String expectedUrlContains() {
164-
return URL;
165-
}
166-
167-
@Override
168-
public String expectedOriginalUrlContains() {
169-
return URL;
170-
}
171-
172-
@Override
173-
public StreamType expectedStreamType() {
174-
return StreamType.VIDEO_STREAM;
175-
}
176-
177-
@Override
178-
public String expectedUploaderName() {
179-
return "36c3";
180-
}
181-
182-
@Override
183-
public String expectedUploaderUrl() {
184-
return "https://media.ccc.de/c/36c3";
185-
}
186-
187-
@Override
188-
public List<String> expectedDescriptionContains() {
189-
return Arrays.asList("WhatsApp", "Signal");
190-
}
191-
192-
@Override
193-
public long expectedLength() {
194-
return 3603;
195-
}
196-
197-
@Override
198-
public long expectedViewCountAtLeast() {
199-
return 2380;
200-
}
201-
202-
@Nullable
203-
@Override
204-
public String expectedUploadDate() {
205-
return "2020-01-11 00:00:00.000";
206-
}
207-
208-
@Nullable
209-
@Override
210-
public String expectedTextualUploadDate() {
211-
return "2020-01-11T01:00:00.000+01:00";
212-
}
213-
214-
@Override
215-
public long expectedLikeCountAtLeast() {
216-
return -1;
217-
}
218-
219-
@Override
220-
public long expectedDislikeCountAtLeast() {
221-
return -1;
222-
}
223-
224-
@Override
225-
public boolean expectedHasRelatedStreams() {
226-
return false;
227-
}
228-
229-
@Override
230-
public boolean expectedHasSubtitles() {
231-
return false;
232-
}
233-
234-
@Override
235-
public boolean expectedHasFrames() {
236-
return false;
237-
}
238-
239-
@Override
240-
public List<String> expectedTags() {
241-
return Arrays.asList("36c3", "10565", "2019", "Security", "Main");
242-
}
243-
244-
@Override
245-
@Test
246-
public void testThumbnailUrl() throws Exception {
134+
@Test public void testThumbnailUrl() throws Exception {
247135
super.testThumbnailUrl();
248136
assertEquals("https://static.media.ccc.de/media/congress/2019/10565-hd.jpg", extractor.getThumbnailUrl());
249137
}

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorDefaultTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,6 @@ public void testGetUnlisted() {
432432
}
433433

434434
public static class CCLicensed {
435-
// StreamSegment example with macro-makers panel and transcription panel
436435
private static final String ID = "M4gD1WSo5mA";
437436
private static final String URL = BASE_URL + ID;
438437
private static StreamExtractor extractor;

0 commit comments

Comments
 (0)