Skip to content

Commit 636c430

Browse files
B0polB0pol
committed
refactor: create extractors and linkHandler packages for SoundCloud, move YoutubeParsingHelper to youtube package (not linkhandler anymore)
1 parent a5155fb commit 636c430

44 files changed

Lines changed: 80 additions & 67 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1616
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1717
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
18+
import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudChannelInfoItemExtractor;
19+
import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudStreamExtractor;
20+
import org.schabi.newpipe.extractor.services.soundcloud.extractors.SoundcloudStreamInfoItemExtractor;
1821
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
1922
import org.schabi.newpipe.extractor.utils.Parser;
2023
import org.schabi.newpipe.extractor.utils.Parser.RegexException;
@@ -85,7 +88,7 @@ static boolean checkIfHardcodedClientIdIsValid() {
8588
}
8689
}
8790

88-
static Calendar parseDate(String textualUploadDate) throws ParsingException {
91+
public static Calendar parseDate(String textualUploadDate) throws ParsingException {
8992
Date date;
9093
try {
9194
date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(textualUploadDate);
@@ -255,13 +258,13 @@ public static String getStreamsFromApi(StreamInfoItemsCollector collector, Strin
255258
}
256259

257260
@Nonnull
258-
static String getUploaderUrl(JsonObject object) {
261+
public static String getUploaderUrl(JsonObject object) {
259262
String url = object.getObject("user").getString("permalink_url", "");
260263
return replaceHttpWithHttps(url);
261264
}
262265

263266
@Nonnull
264-
static String getAvatarUrl(JsonObject object) {
267+
public static String getAvatarUrl(JsonObject object) {
265268
String url = object.getObject("user", new JsonObject()).getString("avatar_url", "");
266269
return replaceHttpWithHttps(url);
267270
}

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import org.schabi.newpipe.extractor.localization.ContentCountry;
1111
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
1212
import org.schabi.newpipe.extractor.search.SearchExtractor;
13+
import org.schabi.newpipe.extractor.services.soundcloud.extractors.*;
14+
import org.schabi.newpipe.extractor.services.soundcloud.linkHandler.*;
1315
import org.schabi.newpipe.extractor.stream.StreamExtractor;
1416
import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor;
1517

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelExtractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import com.grack.nanojson.JsonArray;
44
import com.grack.nanojson.JsonObject;
@@ -10,6 +10,7 @@
1010
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
1111
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1212
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
13+
import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
1314
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
1415
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
1516

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChannelInfoItemExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import com.grack.nanojson.JsonObject;
44
import org.schabi.newpipe.extractor.channel.ChannelInfoItemExtractor;

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudChartsExtractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import org.schabi.newpipe.extractor.StreamingService;
44
import org.schabi.newpipe.extractor.downloader.Downloader;
55
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
66
import org.schabi.newpipe.extractor.kiosk.KioskExtractor;
77
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
8+
import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
89
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
910
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
1011

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudPlaylistExtractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import com.grack.nanojson.JsonArray;
44
import com.grack.nanojson.JsonObject;
@@ -12,6 +12,7 @@
1212
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1313
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
1414
import org.schabi.newpipe.extractor.playlist.PlaylistExtractor;
15+
import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
1516
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
1617
import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector;
1718

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistInfoItemExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudPlaylistInfoItemExtractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import com.grack.nanojson.JsonObject;
44
import org.schabi.newpipe.extractor.exceptions.ParsingException;

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudSearchExtractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import com.grack.nanojson.JsonArray;
44
import com.grack.nanojson.JsonObject;
@@ -22,7 +22,7 @@
2222
import java.net.MalformedURLException;
2323
import java.net.URL;
2424

25-
import static org.schabi.newpipe.extractor.services.soundcloud.SoundcloudSearchQueryHandlerFactory.ITEMS_PER_PAGE;
25+
import static org.schabi.newpipe.extractor.services.soundcloud.linkHandler.SoundcloudSearchQueryHandlerFactory.ITEMS_PER_PAGE;
2626

2727
public class SoundcloudSearchExtractor extends SearchExtractor {
2828

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import com.grack.nanojson.JsonArray;
44
import com.grack.nanojson.JsonObject;
@@ -15,6 +15,7 @@
1515
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1616
import org.schabi.newpipe.extractor.linkhandler.LinkHandler;
1717
import org.schabi.newpipe.extractor.localization.DateWrapper;
18+
import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
1819
import org.schabi.newpipe.extractor.stream.AudioStream;
1920
import org.schabi.newpipe.extractor.stream.Description;
2021
import org.schabi.newpipe.extractor.stream.StreamExtractor;

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java renamed to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamInfoItemExtractor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.schabi.newpipe.extractor.services.soundcloud;
1+
package org.schabi.newpipe.extractor.services.soundcloud.extractors;
22

33
import com.grack.nanojson.JsonObject;
44
import org.schabi.newpipe.extractor.exceptions.ParsingException;
55
import org.schabi.newpipe.extractor.localization.DateWrapper;
6+
import org.schabi.newpipe.extractor.services.soundcloud.SoundcloudParsingHelper;
67
import org.schabi.newpipe.extractor.stream.StreamInfoItemExtractor;
78
import org.schabi.newpipe.extractor.stream.StreamType;
89

0 commit comments

Comments
 (0)