Skip to content

Commit e0b8e14

Browse files
B0polB0pol
committed
[PeerTube] Support /a/ and /c/ short links
1 parent 599a91c commit e0b8e14

2 files changed

Lines changed: 56 additions & 23 deletions

File tree

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/linkHandler/PeertubeChannelLinkHandlerFactory.java‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class PeertubeChannelLinkHandlerFactory extends ListLinkHandlerFactory {
1111

1212
private static final PeertubeChannelLinkHandlerFactory instance = new PeertubeChannelLinkHandlerFactory();
13-
private static final String ID_PATTERN = "(accounts|video-channels)/([^/?&#]*)";
13+
private static final String ID_PATTERN = "((accounts|a)|(video-channels|c))/([^/?&#]*)";
1414
public static final String API_ENDPOINT = "/api/v1/";
1515

1616
public static PeertubeChannelLinkHandlerFactory getInstance() {
@@ -19,7 +19,7 @@ public static PeertubeChannelLinkHandlerFactory getInstance() {
1919

2020
@Override
2121
public String getId(String url) throws ParsingException {
22-
return Parser.matchGroup(ID_PATTERN, url, 0);
22+
return fixId(Parser.matchGroup(ID_PATTERN, url, 0));
2323
}
2424

2525
@Override
@@ -31,7 +31,7 @@ public String getUrl(String id, List<String> contentFilters, String searchFilter
3131
public String getUrl(String id, List<String> contentFilter, String sortFilter, String baseUrl)
3232
throws ParsingException {
3333
if (id.matches(ID_PATTERN)) {
34-
return baseUrl + "/" + id;
34+
return baseUrl + "/" + fixId(id);
3535
} else {
3636
// This is needed for compatibility with older versions were we didn't support video channels yet
3737
return baseUrl + "/accounts/" + id;
@@ -40,6 +40,28 @@ public String getUrl(String id, List<String> contentFilter, String sortFilter, S
4040

4141
@Override
4242
public boolean onAcceptUrl(String url) {
43-
return url.contains("/accounts/") || url.contains("/video-channels/");
43+
return url.contains("/accounts/") || url.contains("/a/")
44+
|| url.contains("/video-channels/") || url.contains("/c/");
45+
}
46+
47+
/**
48+
* Fix id
49+
*
50+
* <p>
51+
* a/:accountName and c/:channelName ids are supported
52+
* by the PeerTube web client (>= v3.3.0)
53+
* but not by the API.
54+
* </p>
55+
*
56+
* @param id the id to fix
57+
* @return the fixed id
58+
*/
59+
private String fixId(String id) {
60+
if (id.startsWith("a/")) {
61+
id = "accounts" + id.substring(1);
62+
} else if (id.startsWith("c/")) {
63+
id = "video-channels" + id.substring(1);
64+
}
65+
return id;
4466
}
4567
}

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeChannelLinkHandlerFactoryTest.java‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,44 +20,55 @@ public class PeertubeChannelLinkHandlerFactoryTest {
2020

2121
@BeforeClass
2222
public static void setUp() {
23-
PeerTube.setInstance(new PeertubeInstance("https://peertube.mastodon.host", "PeerTube on Mastodon.host"));
23+
PeerTube.setInstance(new PeertubeInstance("https://peertube.stream", "PeerTube on peertube.stream"));
2424
linkHandler = PeertubeChannelLinkHandlerFactory.getInstance();
2525
NewPipe.init(DownloaderTestImpl.getInstance());
2626
}
2727

2828
@Test
2929
public void acceptUrlTest() throws ParsingException {
30-
assertTrue(linkHandler.acceptUrl("https://peertube.mastodon.host/accounts/kranti@videos.squat.net"));
31-
assertTrue(linkHandler.acceptUrl("https://peertube.mastodon.host/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa/videos"));
32-
assertTrue(linkHandler.acceptUrl("https://peertube.mastodon.host/api/v1/accounts/kranti@videos.squat.net/videos"));
33-
assertTrue(linkHandler.acceptUrl("https://peertube.mastodon.host/api/v1/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa"));
30+
assertTrue(linkHandler.acceptUrl("https://peertube.stream/accounts/kranti@videos.squat.net"));
31+
assertTrue(linkHandler.acceptUrl("https://peertube.stream/a/kranti@videos.squat.net"));
32+
assertTrue(linkHandler.acceptUrl("https://peertube.stream/api/v1/accounts/kranti@videos.squat.net/videos"));
33+
assertTrue(linkHandler.acceptUrl("https://peertube.stream/video-channels/kranti_channel@videos.squat.net/videos"));
34+
assertTrue(linkHandler.acceptUrl("https://peertube.stream/c/kranti_channel@videos.squat.net/videos"));
35+
assertTrue(linkHandler.acceptUrl("https://peertube.stream/api/v1/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa"));
3436
}
3537

3638
@Test
3739
public void getId() throws ParsingException {
3840
assertEquals("accounts/kranti@videos.squat.net",
39-
linkHandler.fromUrl("https://peertube.mastodon.host/accounts/kranti@videos.squat.net").getId());
41+
linkHandler.fromUrl("https://peertube.stream/accounts/kranti@videos.squat.net").getId());
4042
assertEquals("accounts/kranti@videos.squat.net",
41-
linkHandler.fromUrl("https://peertube.mastodon.host/accounts/kranti@videos.squat.net/videos").getId());
42-
assertEquals("video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa",
43-
linkHandler.fromUrl("https://peertube.mastodon.host/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa/videos").getId());
43+
linkHandler.fromUrl("https://peertube.stream/a/kranti@videos.squat.net").getId());
4444
assertEquals("accounts/kranti@videos.squat.net",
45-
linkHandler.fromUrl("https://peertube.mastodon.host/api/v1/accounts/kranti@videos.squat.net").getId());
45+
linkHandler.fromUrl("https://peertube.stream/accounts/kranti@videos.squat.net/videos").getId());
4646
assertEquals("accounts/kranti@videos.squat.net",
47-
linkHandler.fromUrl("https://peertube.mastodon.host/api/v1/accounts/kranti@videos.squat.net/videos").getId());
48-
assertEquals("video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa",
49-
linkHandler.fromUrl("https://peertube.mastodon.host/api/v1/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa").getId());
47+
linkHandler.fromUrl("https://peertube.stream/a/kranti@videos.squat.net/videos").getId());
48+
assertEquals("accounts/kranti@videos.squat.net",
49+
linkHandler.fromUrl("https://peertube.stream/api/v1/accounts/kranti@videos.squat.net").getId());
50+
assertEquals("accounts/kranti@videos.squat.net",
51+
linkHandler.fromUrl("https://peertube.stream/api/v1/accounts/kranti@videos.squat.net/videos").getId());
52+
53+
assertEquals("video-channels/kranti_channel@videos.squat.net",
54+
linkHandler.fromUrl("https://peertube.stream/video-channels/kranti_channel@videos.squat.net/videos").getId());
55+
assertEquals("video-channels/kranti_channel@videos.squat.net",
56+
linkHandler.fromUrl("https://peertube.stream/c/kranti_channel@videos.squat.net/videos").getId());
57+
assertEquals("video-channels/kranti_channel@videos.squat.net",
58+
linkHandler.fromUrl("https://peertube.stream/c/kranti_channel@videos.squat.net/video-playlists").getId());
59+
assertEquals("video-channels/kranti_channel@videos.squat.net",
60+
linkHandler.fromUrl("https://peertube.stream/api/v1/video-channels/kranti_channel@videos.squat.net").getId());
5061
}
5162

5263
@Test
5364
public void getUrl() throws ParsingException {
54-
assertEquals("https://peertube.mastodon.host/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa",
55-
linkHandler.fromId("video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa").getUrl());
56-
assertEquals("https://peertube.mastodon.host/accounts/kranti@videos.squat.net",
65+
assertEquals("https://peertube.stream/video-channels/kranti_channel@videos.squat.net",
66+
linkHandler.fromId("video-channels/kranti_channel@videos.squat.net").getUrl());
67+
assertEquals("https://peertube.stream/accounts/kranti@videos.squat.net",
5768
linkHandler.fromId("accounts/kranti@videos.squat.net").getUrl());
58-
assertEquals("https://peertube.mastodon.host/accounts/kranti@videos.squat.net",
69+
assertEquals("https://peertube.stream/accounts/kranti@videos.squat.net",
5970
linkHandler.fromId("kranti@videos.squat.net").getUrl());
60-
assertEquals("https://peertube.mastodon.host/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa",
61-
linkHandler.fromUrl("https://peertube.mastodon.host/api/v1/video-channels/7682d9f2-07be-4622-862e-93ec812e2ffa").getUrl());
71+
assertEquals("https://peertube.stream/video-channels/kranti_channel@videos.squat.net",
72+
linkHandler.fromUrl("https://peertube.stream/api/v1/video-channels/kranti_channel@videos.squat.net").getUrl());
6273
}
6374
}

0 commit comments

Comments
 (0)