Skip to content

Convert subtitles from MX Player Intents API to UTF-8 #663

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
wasky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert subtitles from MX Player Intents API to UTF-8 #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 21 additions & 11 deletions app/src/main/java/com/brouken/player/PlayerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,12 @@
import com.getkeepsafe.taptargetview.TapTarget;
import com.getkeepsafe.taptargetview.TapTargetView;
import com.google.android.material.snackbar.Snackbar;
import com.google.common.collect.Lists;

import java.io.File;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -289,17 +291,25 @@ protected void onCreate(Bundle savedInstanceState) {
defaultSub = (Uri) subsEnable[0];
}

Parcelable[] subs = bundle.getParcelableArray(API_SUBS);
Parcelable[] subParcelableArray = bundle.getParcelableArray(API_SUBS);
if (subParcelableArray == null) subParcelableArray = new Parcelable[0];

List<Uri> subUriList = new ArrayList<>(subParcelableArray.length);
for (Parcelable parcelable : subParcelableArray) {
Uri element = (Uri) parcelable;
subUriList.add(element);
}

List<Uri> subs = new SubtitleConverter().convertSubtitles(this, subUriList);
String[] subsName = bundle.getStringArray(API_SUBS_NAME);
if (subs != null && subs.length > 0) {
for (int i = 0; i < subs.length; i++) {
Uri sub = (Uri) subs[i];
String name = null;
if (subsName != null && subsName.length > i) {
name = subsName[i];
}
apiSubs.add(SubtitleUtils.buildSubtitle(this, sub, name, sub.equals(defaultSub)));

for (int i = 0; i < subs.size(); i++) {
Uri sub = subs.get(i);
String name = null;
if (subsName != null && subsName.length > i) {
name = subsName[i];
}
apiSubs.add(SubtitleUtils.buildSubtitle(this, sub, name, sub.equals(defaultSub)));
}
}

Expand Down Expand Up @@ -1297,7 +1307,7 @@ public void initializePlayer() {
if (apiTitle != null) {
title = apiTitle;
} else {
title = Utils.getFileName(PlayerActivity.this, mPrefs.mediaUri);
title = Utils.getFileName(PlayerActivity.this, mPrefs.mediaUri, false);
}
if (title != null) {
final MediaMetadata mediaMetadata = new MediaMetadata.Builder()
Expand Down Expand Up @@ -1336,7 +1346,7 @@ public void initializePlayer() {
if (apiTitle != null) {
titleView.setText(apiTitle);
} else {
titleView.setText(Utils.getFileName(this, mPrefs.mediaUri));
titleView.setText(Utils.getFileName(this, mPrefs.mediaUri, false));
}
titleView.setVisibility(View.VISIBLE);

Expand Down
122 changes: 122 additions & 0 deletions app/src/main/java/com/brouken/player/SubtitleConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
package com.brouken.player;

import android.content.Context;
import android.net.Uri;
import android.util.Log;

import com.sigpwned.chardet4j.Chardet;
import com.sigpwned.chardet4j.io.DecodedInputStreamReader;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CountDownLatch;

import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;

public class SubtitleConverter {

private volatile OkHttpClient okHttpClient;

public List<Uri> convertSubtitles(Context context, List<Uri> uris) {
CountDownLatch countDownLatch = new CountDownLatch(uris.size());
Uri[] results = new Uri[uris.size()];

for (int i = 0; i < uris.size(); i++) {
convertSubtitle(context, countDownLatch, results, i, uris.get(i));
}

try {
countDownLatch.await();
} catch (InterruptedException e) {
throw new AssertionError(e);
}

return Arrays.asList(results);
}

private void convertSubtitle(Context context, CountDownLatch countDownLatch, Uri[] results, int positionOnResults, Uri sourceUri) {
String scheme = sourceUri.getScheme();

if (scheme == null) {
results[positionOnResults] = sourceUri;
countDownLatch.countDown();
return;
}

if (scheme.equals("http") || scheme.equals("https")) {
convertSubtitleFromHttp(context, countDownLatch, results, positionOnResults, sourceUri);
} else {
results[positionOnResults] = sourceUri;
}
}

private void convertSubtitleFromHttp(Context context, CountDownLatch countDownLatch, Uri[] results, int positionOnResults, Uri sourceUri) {
new Thread(() -> {
OkHttpClient client = getOrCreateOkHttpClient();

Request request = new Request.Builder()
.url(sourceUri.toString())
.build();

Uri convertedUri = sourceUri;

try (Response response = client.newCall(request).execute()) {
if (response.isSuccessful()) {
ResponseBody responseBody = response.body();
//noinspection DataFlowIssue
try (DecodedInputStreamReader reader = Chardet.decode(responseBody.byteStream(), StandardCharsets.UTF_8)) {
File subtitleCacheDir = getSubtitleCacheDir(context);
String fileName = Utils.getFileName(context, sourceUri, true);
File subtitleFile = new File(subtitleCacheDir, fileName);
try (Writer writer = new FileWriter(subtitleFile)) {
char[] buffer = new char[4096];
int read;
while ((read = reader.read(buffer)) != -1) {
writer.write(buffer, 0, read);
}
writer.flush();
convertedUri = Uri.fromFile(subtitleFile);
}
}
}
} catch (IOException e) {
Log.w(Utils.TAG, e);
}

results[positionOnResults] = convertedUri;
countDownLatch.countDown();


}).start();
}

private OkHttpClient getOrCreateOkHttpClient() {
if (okHttpClient == null) {
synchronized (this) {
if (okHttpClient == null) {
okHttpClient = new OkHttpClient.Builder().build();
}
}
}
return okHttpClient;
}

private static synchronized File getSubtitleCacheDir(Context context) throws IOException {
File subtitleCacheDir = new File(context.getCacheDir(), "subtitles");
if (!subtitleCacheDir.exists()) {
if (!subtitleCacheDir.mkdirs()) {
throw new IOException("Couldn't create subtitles cache directory");
}
}
return subtitleCacheDir;
}

}
2 changes: 1 addition & 1 deletion app/src/main/java/com/brouken/player/SubtitleUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ public static MediaItem.SubtitleConfiguration buildSubtitle(Context context, Uri
final String subtitleMime = SubtitleUtils.getSubtitleMime(uri);
final String subtitleLanguage = SubtitleUtils.getSubtitleLanguage(uri);
if (subtitleLanguage == null && subtitleName == null)
subtitleName = Utils.getFileName(context, uri);
subtitleName = Utils.getFileName(context, uri, false);

MediaItem.SubtitleConfiguration.Builder subtitleConfigurationBuilder = new MediaItem.SubtitleConfiguration.Builder(uri)
.setMimeType(subtitleMime)
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/brouken/player/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@

class Utils {

public static final String TAG = "JustPlayer";

public static final String FEATURE_FIRE_TV = "amazon.hardware.fire_tv";

public static final String[] supportedExtensionsVideo = new String[] { "3gp", "m4v", "mkv", "mov", "mp4", "ts", "webm" };
Expand Down Expand Up @@ -155,7 +157,7 @@ public static void toggleSystemUi(final Activity activity, final CustomPlayerVie
}
}

public static String getFileName(Context context, Uri uri) {
public static String getFileName(Context context, Uri uri, boolean keepExtension) {
String result = null;
try {
if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
Expand All @@ -174,10 +176,11 @@ public static String getFileName(Context context, Uri uri) {
result = result.substring(cut + 1);
}
}
if (result.indexOf(".") > 0)
result = result.substring(0, result.lastIndexOf("."));
if (!keepExtension) {
if (result.indexOf(".") > 0) result = result.substring(0, result.lastIndexOf("."));
}
} catch (Exception e) {
e.printStackTrace();
Log.w(TAG, e);
}
return result;
}
Expand Down