Skip to content

fibi v1.0.1 (solution: fixed subtitle) #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heisfibi wants to merge 15 commits into
base: master
Choose a base branch
from
Open

fibi v1.0.1 (solution: fixed subtitle) #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
38d4be2
Update Extractor.java
heisfibi Nov 20, 2023
3b9d55a
Update ExtractorImpl.java
heisfibi Nov 20, 2023
8c7bd4a
Update ParserImpl.java
heisfibi Nov 20, 2023
358af88
Update pom.xml
heisfibi Nov 20, 2023
4bcf5c5
Update pom.xml
heisfibi Nov 20, 2023
a8a020d
Update README.md
heisfibi Nov 20, 2023
6fad708
Update ParserImpl.java
heisfibi Nov 20, 2023
331108f
Update ParserImpl.java
heisfibi Nov 22, 2023
1eb32e9
Update Extractor.java
heisfibi Nov 22, 2023
1b94923
Update ExtractorImpl.java
heisfibi Nov 22, 2023
ca0e679
Update pom.xml
heisfibi Nov 22, 2023
0c5838c
Update README.md
heisfibi Nov 22, 2023
bbc106c
Update README.md
heisfibi Nov 26, 2023
e87387c
Update README.md
heisfibi Nov 26, 2023
974eb94
Update README.md
heisfibi Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,4 +388,4 @@ android {
jvmTarget = "1.8"
}
}
```
```
14 changes: 10 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.ikiulian</groupId>
<groupId>com.github.kiulian</groupId>
<artifactId>java-youtube-downloader</artifactId>
<version>3.2.3</version>
<version>3.2.4</version>

<name>Java youtube video downloader</name>
<description>Java parser for retrieving youtube video meta info</description>
Expand Down Expand Up @@ -64,7 +64,13 @@
<version>1.2.83</version>
</dependency>

</dependencies>
<!-- text -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
Copy link
Copy Markdown
Owner

@sealedtx sealedtx Nov 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you implement StringEscapeUtils.unescapeJava() inside this project to avoid extra dependency?

<version>1.7</version>
</dependency>

</dependencies>

</project>
</project>
2 changes: 2 additions & 0 deletions src/main/java/com/github/kiulian/downloader/extractor/Extractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public interface Extractor {
JSONObject extractPlayerConfigFromHtml(String html) throws YoutubeException;

List<String> extractSubtitlesLanguagesFromXml(String xml) throws YoutubeException;

String extractSubtitleUrlFromHtml(String html, String videoId) throws YoutubeException;

String extractJsUrlFromConfig(JSONObject config, String videoId) throws YoutubeException;

Expand Down
19 changes: 18 additions & 1 deletion src/main/java/com/github/kiulian/downloader/extractor/ExtractorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.github.kiulian.downloader.downloader.Downloader;
import com.github.kiulian.downloader.downloader.request.RequestWebpage;
import com.github.kiulian.downloader.downloader.response.Response;
import org.apache.commons.text.StringEscapeUtils;

import java.util.*;
import java.util.regex.Matcher;
Expand All @@ -27,7 +28,7 @@ public class ExtractorImpl implements Extractor {
Pattern.compile("ytInitialData = (\\{.*?\\});")
);

private static final Pattern SUBTITLES_LANG_CODE_PATTERN = Pattern.compile("lang_code=\"(.{2,3})\"");
private static final Pattern SUBTITLES_LANG_CODE_PATTERN = Pattern.compile("lang=(.{2,3})");
private static final Pattern TEXT_NUMBER_REGEX = Pattern.compile("[0-9]+[0-9, ']*");
private static final Pattern ASSETS_JS_REGEX = Pattern.compile("\"assets\":.+?\"js\":\\s*\"([^\"]+)\"");
private static final Pattern EMB_JS_REGEX = Pattern.compile("\"jsUrl\":\\s*\"([^\"]+)\"");
Expand Down Expand Up @@ -101,6 +102,22 @@ public List<String> extractSubtitlesLanguagesFromXml(String xml) throws YoutubeE
return languages;
}

@Override
public String extractSubtitleUrlFromHtml(String html, String videoId) throws YoutubeException {
String pattern = "https://www\\.youtube\\.com/api/timedtext\\?v=" + videoId + "[^\"']+";
Pattern regex = Pattern.compile(pattern);
Matcher matcher = regex.matcher(html);

if (!matcher.find()) {
throw new YoutubeException.BadPageException("Could not any subtitle url in the html");
}

String escapeUrl = matcher.group(0);
String url = StringEscapeUtils.unescapeJava(escapeUrl);

return url;
}

@Override
public String extractJsUrlFromConfig(JSONObject config, String videoId) throws YoutubeException {
String js = null;
Expand Down
Loading