diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 07cb9f66c..574c87ad3 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -5,11 +5,14 @@ PLEASE READ THESE GUIDELINES CAREFULLY BEFORE ANY CONTRIBUTION!
## Crash reporting
-Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
+Do not report crashes in the GitHub issue tracker. NewPipe has an automated crash report system that will ask you to
+send a report via e-mail when a crash occurs. This contains all the data we need for debugging, and allows you to even
+add a comment to it. You'll see exactly what is sent, the system is 100% transparent.
## Issue reporting/feature requests
-* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature hasn't been reported/requested before
+* Search the [existing issues](https://github.com/TeamNewPipe/NewPipe/issues) first to make sure your issue/feature
+hasn't been reported/requested before
* Check whether your issue/feature is already fixed/implemented
* Check if the issue still exists in the latest release/beta version
* If you are an Android/Java developer, you are always welcome to fix/implement an issue/a feature yourself. PRs welcome!
@@ -19,30 +22,47 @@ Do not report crashes in the GitHub issue tracker. NewPipe has an automated cras
* Issues that only contain a generated bug report, but no describtion might be closed.
## Bug Fixing
-* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request, register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
+* If you want to help NewPipe to become free of bugs (this is our utopic goal for NewPipe), you can send us an email to
+tnp@newpipe.schabi.org to let me know that you intend to help. We'll send you further instructions. You may, on request,
+register at our [Sentry](https://sentry.schabi.org) instance (see section "Crash reporting" for more information.
## Translation
-* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there with your GitHub account.
+* NewPipe can be translated via [Weblate](https://hosted.weblate.org/projects/newpipe/strings/). You can log in there
+with your GitHub account.
## Code contribution
* Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
-* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google libraries.
+* Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google
+ libraries.
* Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
-* When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
-* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
+* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You
+ may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might
+ not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
+* When submitting changes, you confirm that your code is licensed under the terms of the
+ [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
+* Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR
+ description. Untested code will **not** be merged!
* Try to figure out yourself why builds on our CI fail.
-* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job, but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the maintainers' jobs way easier.
-* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again about submission, or clearly state that in the description of your PR.
+* Make sure your PR is up-to-date with the rest of the code. Often, a simple click on "Update branch" will do the job,
+ but if not, you are asked to merge the master branch manually and resolve the problems on your own. That will make the
+ maintainers' jobs way easier.
+* Please show intention to maintain your features and code after you contributed it. Unmaintained code is a hassle for
+ the core developers, and just adds work. If you do not intend to maintain features you contributed, please think again
+ about submission, or clearly state that in the description of your PR.
* Respond yourselves if someone requests changes or otherwise raises issues about your PRs.
* Check if your contributions align with the [fdroid inclusion guidelines](https://f-droid.org/en/docs/Inclusion_Policy/).
* Check if your submission can be build with the current fdroid build server setup.
+* Send PR that only cover one specific issue/solution/bug. Do not send PRs that are huge and consists of multiple
+ independent solutions.
## Communication
* WE DO NOW HAVE A MAILING LIST: [newpipe@list.schabi.org](https://list.schabi.org/cgi-bin/mailman/listinfo/newpipe).
-* There is an IRC channel on Freenode which is regularly visited by the core team and other developers: [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
-* If you want to get in touch with the core team or one of our other contributors you can send an email to tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue tracker described above!
+* There is an IRC channel on Freenode which is regularly visited by the core team and other developers:
+ [#newpipe](irc:irc.freenode.net/newpipe). [Click here for Webchat](https://webchat.freenode.net/?channels=newpipe)!
+* If you want to get in touch with the core team or one of our other contributors you can send an email to
+ tnp(at)schabi.org. Please do not send issue reports, they will be ignored and remain unanswered! Use the GitHub issue
+ tracker described above!
* Feel free to post suggestions, changes, ideas etc. on GitHub, IRC or the mailing list!
diff --git a/.travis.yml b/.travis.yml
index d5d3aed9c..d6f97ab55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,13 @@ android:
components:
# The BuildTools version used by NewPipe
- tools
- - build-tools-27.0.3
+ - build-tools-28.0.3
# The SDK version used to compile NewPipe
- - android-27
+ - android-28
before_install:
- - yes | sdkmanager "platforms;android-27"
+ - yes | sdkmanager "platforms;android-28"
script: ./gradlew -Dorg.gradle.jvmargs=-Xmx1536m assembleDebug lintDebug testDebugUnitTest
licenses:
diff --git a/README.md b/README.md
index b154fad58..15ba3d04b 100644
--- a/README.md
+++ b/README.md
@@ -1,74 +1,77 @@
-
+
NewPipe
-
A free lightweight YouTube frontend for Android.
-
+
A libre lightweight streaming frontend for Android.
-
-WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
+
+
+WARNING: PUTTING NEWPIPE OR ANY FORK OF IT INTO GOOGLE PLAYSTORE VIOLATES THEIR TERMS OF CONDITIONS.
## Screenshots
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png)
-[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
[](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
## Description
-NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without Google Services installed. Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.
+NewPipe does not use any Google framework libraries, nor the YouTube API. Websites are only parsed to fetch required info, so this app can be used on devices without Google services installed. Also, you don't need a YouTube account to use NewPipe, which is copylefted libre software.
### Features
* Search videos
-* Display general information about a video
+* Display general info about videos
* Watch YouTube videos
* Listen to YouTube videos
* Popup mode (floating player)
-* Select the streaming player to watch the video with
-* Download videos
+* Select streaming player to watch video with
+* Download videos
* Download audio only
* Open a video in Kodi
-* Show Next/Related videos
+* Show next/related videos
* Search YouTube in a specific language
* Watch/Block age restricted material
-* Display general information about channels
+* Display general info about channels
* Search channels
* Watch videos from a channel
* Orbot/Tor support (not yet directly)
-* 1080p/2k/4k support
+* 1080p/2K/4K support
* View history
* Subscribe to channels
* Search history
-* Search/Watch Playlists
-* Watch as queues Playlists
-* Queuing videos
+* Search/watch playlists
+* Watch as enqueued playlists
+* Enqueue videos
* Local playlists
* Subtitles
-* Multi-service support (eg. SoundCloud in NewPipe Beta)
+* Multi-service support (e.g. SoundCloud \[beta\])
+* Livestream support
### Coming Features
-* Livestream support
* Cast to UPnP and Cast
* Show comments
-* ... and many more
+* … and many more
## Contribution
Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
@@ -77,26 +80,31 @@ The more is done the better it gets!
If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).
## Donate
-If you like NewPipe we'd be happy about a donation. You can either donate via Bitcoin, Bountysource or Liberapay. For further information about donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).
+If you like NewPipe we'd be happy about a donation. You can either send bitcoin or donate via Bountysource or Liberapay. For further info on donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).
-
-
+
+
16A9J59ahMRqkLSZjhYj33n9j3fMztFxnh
-
-
-
+
+
+
-
-
-
+
+
+
+## Privacy Policy
+
+The NewPipe project aims to provide a private, anonymous experience for using media web services.
+Therefore, the app does not collect any data without your consent. NewPipe's privacy policy explains in detail what data is sent and stored when you send a crash report, or comment in our blog. You can find the document [here](https://newpipe.schabi.org/legal/privacy/).
+
## License
[](http://www.gnu.org/licenses/gpl-3.0.en.html)
diff --git a/app/build.gradle b/app/build.gradle
index 7ba0ef803..31ec4776a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 27
- buildToolsVersion '27.0.3'
+ compileSdkVersion 28
+ buildToolsVersion '28.0.3'
defaultConfig {
applicationId "org.schabi.newpipe"
- minSdkVersion 15
- targetSdkVersion 27
- versionCode 68
- versionName "0.14.1"
+ minSdkVersion 19
+ targetSdkVersion 28
+ versionCode 69
+ versionName "0.14.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
@@ -22,7 +22,6 @@ android {
}
debug {
multiDexEnabled true
-
debuggable true
applicationIdSuffix ".debug"
}
@@ -41,62 +40,61 @@ android {
}
ext {
- supportLibVersion = '27.1.1'
- exoPlayerLibVersion = '2.8.2'
+ supportLibVersion = '28.0.0'
+ exoPlayerLibVersion = '2.8.4' //2.9.0
roomDbLibVersion = '1.1.1'
- leakCanaryLibVersion = '1.5.4'
- okHttpLibVersion = '3.10.0'
+ leakCanaryLibVersion = '1.5.4' //1.6.1
+ okHttpLibVersion = '3.11.0'
icepickLibVersion = '3.2.0'
stethoLibVersion = '1.5.0'
}
dependencies {
- androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
+ androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
exclude module: 'support-annotations'
- }
+ })
- implementation 'com.github.yausername:NewPipeExtractor:4883b6f'
+ implementation 'com.github.yausername:NewPipeExtractor:df0db84'
testImplementation 'junit:junit:4.12'
- testImplementation 'org.mockito:mockito-core:2.8.9'
+ testImplementation 'org.mockito:mockito-core:2.23.0'
- implementation "com.android.support:appcompat-v7:$supportLibVersion"
- implementation "com.android.support:support-v4:$supportLibVersion"
- implementation "com.android.support:design:$supportLibVersion"
- implementation "com.android.support:recyclerview-v7:$supportLibVersion"
- implementation "com.android.support:preference-v14:$supportLibVersion"
+ implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+ implementation "com.android.support:support-v4:${supportLibVersion}"
+ implementation "com.android.support:design:${supportLibVersion}"
+ implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
+ implementation "com.android.support:preference-v14:${supportLibVersion}"
+ implementation "com.android.support:cardview-v7:${supportLibVersion}"
+ implementation 'com.android.support.constraint:constraint-layout:1.1.3'
- implementation 'ch.acra:acra:4.9.2'
+ implementation 'ch.acra:acra:4.9.2' //4.11
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'de.hdodenhof:circleimageview:2.2.0'
implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1'
implementation 'com.nononsenseapps:filepicker:4.2.1'
- implementation "com.google.android.exoplayer:exoplayer:$exoPlayerLibVersion"
- implementation "com.google.android.exoplayer:extension-mediasession:$exoPlayerLibVersion"
+ implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}"
+ implementation "com.google.android.exoplayer:extension-mediasession:${exoPlayerLibVersion}"
- debugImplementation "com.facebook.stetho:stetho:$stethoLibVersion"
- debugImplementation "com.facebook.stetho:stetho-urlconnection:$stethoLibVersion"
+ debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}"
+ debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}"
debugImplementation 'com.android.support:multidex:1.0.3'
- implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
- implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+ implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
+ implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1'
- implementation "android.arch.persistence.room:runtime:$roomDbLibVersion"
- implementation "android.arch.persistence.room:rxjava2:$roomDbLibVersion"
- annotationProcessor "android.arch.persistence.room:compiler:$roomDbLibVersion"
+ implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}"
+ implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}"
+ annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}"
- implementation "frankiesardo:icepick:$icepickLibVersion"
- annotationProcessor "frankiesardo:icepick-processor:$icepickLibVersion"
+ implementation "frankiesardo:icepick:${icepickLibVersion}"
+ annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}"
- debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryLibVersion"
- releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryLibVersion"
+ debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakCanaryLibVersion}"
+ releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${leakCanaryLibVersion}"
-
- implementation "com.squareup.okhttp3:okhttp:$okHttpLibVersion"
- debugImplementation "com.facebook.stetho:stetho-okhttp3:$stethoLibVersion"
- implementation 'com.android.support.constraint:constraint-layout:1.1.2'
- implementation 'com.android.support:cardview-v7:27.1.1'
+ implementation "com.squareup.okhttp3:okhttp:${okHttpLibVersion}"
+ debugImplementation "com.facebook.stetho:stetho-okhttp3:${stethoLibVersion}"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e4d448184..1bc205f33 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
+
-
\ No newline at end of file
+
diff --git a/app/src/main/java/android/support/design/widget/FlingBehavior.java b/app/src/main/java/android/support/design/widget/FlingBehavior.java
new file mode 100644
index 000000000..59eb08294
--- /dev/null
+++ b/app/src/main/java/android/support/design/widget/FlingBehavior.java
@@ -0,0 +1,116 @@
+package android.support.design.widget;
+
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.design.animation.AnimationUtils;
+import android.util.AttributeSet;
+import android.view.View;
+
+// check this https://github.com/ToDou/appbarlayout-spring-behavior/blob/master/appbarspring/src/main/java/android/support/design/widget/AppBarFlingFixBehavior.java
+public final class FlingBehavior extends AppBarLayout.Behavior {
+
+ private ValueAnimator mOffsetAnimator;
+ private static final int MAX_OFFSET_ANIMATION_DURATION = 600; // ms
+
+ public FlingBehavior() {
+ }
+
+ public FlingBehavior(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child, View target, int dx, int dy, int[] consumed, int type) {
+ if (dy != 0) {
+ int val = child.getBottom();
+ if (val != 0) {
+ int min, max;
+ if (dy < 0) {
+ // We're scrolling down
+ } else {
+ // We're scrolling up
+ if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) {
+ mOffsetAnimator.cancel();
+ }
+ min = -child.getUpNestedPreScrollRange();
+ max = 0;
+ consumed[1] = scroll(coordinatorLayout, child, dy, min, max);
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean onNestedPreFling(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout child, @NonNull View target, float velocityX, float velocityY) {
+
+ if (velocityY != 0) {
+ if (velocityY < 0) {
+ // We're flinging down
+ int val = child.getBottom();
+ if (val != 0) {
+ final int targetScroll =
+ +child.getDownNestedPreScrollRange();
+ animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY);
+ }
+
+ } else {
+ // We're flinging up
+ int val = child.getBottom();
+ if (val != 0) {
+ final int targetScroll = -child.getUpNestedPreScrollRange();
+ if (getTopBottomOffsetForScrollingSibling() > targetScroll) {
+ animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY);
+ }
+ }
+ }
+ }
+
+ return super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY);
+ }
+
+ private void animateOffsetTo(final CoordinatorLayout coordinatorLayout,
+ final AppBarLayout child, final int offset, float velocity) {
+ final int distance = Math.abs(getTopBottomOffsetForScrollingSibling() - offset);
+
+ final int duration;
+ velocity = Math.abs(velocity);
+ if (velocity > 0) {
+ duration = 3 * Math.round(1000 * (distance / velocity));
+ } else {
+ final float distanceRatio = (float) distance / child.getHeight();
+ duration = (int) ((distanceRatio + 1) * 150);
+ }
+
+ animateOffsetWithDuration(coordinatorLayout, child, offset, duration);
+ }
+
+ private void animateOffsetWithDuration(final CoordinatorLayout coordinatorLayout,
+ final AppBarLayout child, final int offset, final int duration) {
+ final int currentOffset = getTopBottomOffsetForScrollingSibling();
+ if (currentOffset == offset) {
+ if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) {
+ mOffsetAnimator.cancel();
+ }
+ return;
+ }
+
+ if (mOffsetAnimator == null) {
+ mOffsetAnimator = new ValueAnimator();
+ mOffsetAnimator.setInterpolator(AnimationUtils.DECELERATE_INTERPOLATOR);
+ mOffsetAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+ @Override
+ public void onAnimationUpdate(ValueAnimator animator) {
+ setHeaderTopBottomOffset(coordinatorLayout, child,
+ (Integer) animator.getAnimatedValue());
+ }
+ });
+ } else {
+ mOffsetAnimator.cancel();
+ }
+
+ mOffsetAnimator.setDuration(Math.min(duration, MAX_OFFSET_ANIMATION_DURATION));
+ mOffsetAnimator.setIntValues(currentOffset, offset);
+ mOffsetAnimator.start();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index c0af70efb..314c95c8d 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -5,6 +5,7 @@ import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.os.Build;
+import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.util.Log;
@@ -66,7 +67,8 @@ public class App extends Application {
private RefWatcher refWatcher;
@SuppressWarnings("unchecked")
- private static final Class[] reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
+ private static final Class[]
+ reportSenderFactoryClasses = new Class[]{AcraReportSenderFactory.class};
@Override
protected void attachBaseContext(Context base) {
@@ -89,7 +91,8 @@ public class App extends Application {
// Initialize settings first because others inits can use its values
SettingsActivity.initSettings(this);
- NewPipe.init(getDownloader(), new Localization("GB", "en"));
+ NewPipe.init(getDownloader(),
+ org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(this));
StateSaver.init(this);
initNotificationChannel();
@@ -181,7 +184,11 @@ public class App extends Application {
ACRA.init(this, acraConfig);
} catch (ACRAConfigurationException ace) {
ace.printStackTrace();
- ErrorActivity.reportError(this, ace, null, null, ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
+ ErrorActivity.reportError(this,
+ ace,
+ null,
+ null,
+ ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none",
"Could not initialize ACRA crash report", R.string.app_ui_crash));
}
}
@@ -201,7 +208,8 @@ public class App extends Application {
NotificationChannel mChannel = new NotificationChannel(id, name, importance);
mChannel.setDescription(description);
- NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+ NotificationManager mNotificationManager =
+ (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationManager.createNotificationChannel(mChannel);
}
diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java
index 8ff2b839a..531a52b78 100644
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -10,7 +10,6 @@ import org.schabi.newpipe.extractor.utils.Localization;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -95,7 +94,8 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
.build();
response = client.newCall(request).execute();
- return Long.parseLong(response.header("Content-Length"));
+ String contentLength = response.header("Content-Length");
+ return contentLength == null ? -1 : Long.parseLong(contentLength);
} catch (NumberFormatException e) {
throw new IOException("Invalid content length", e);
} finally {
@@ -110,7 +110,7 @@ public class Downloader implements org.schabi.newpipe.extractor.Downloader {
* but set the HTTP header field "Accept-Language" to the supplied string.
*
* @param siteUrl the URL of the text file to return the contents of
- * @param localization the language and country (usually a 2-character code for both values)
+ * @param localization the language and country (usually a 2-character code) to set
* @return the contents of the specified text file
*/
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index e22e2f474..b8941670f 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -542,8 +542,7 @@ public class RouterActivity extends AppCompatActivity {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false);
- boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);
- boolean useOldVideoPlayer = PlayerHelper.isUsingOldPlayer(this);
+ boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);;
PlayQueue playQueue;
String playerChoice = choice.playerChoice;
@@ -555,9 +554,6 @@ public class RouterActivity extends AppCompatActivity {
} else if (playerChoice.equals(videoPlayerKey) && isExtVideoEnabled) {
NavigationHelper.playOnExternalVideoPlayer(this, (StreamInfo) info);
- } else if (playerChoice.equals(videoPlayerKey) && useOldVideoPlayer) {
- NavigationHelper.playOnOldVideoPlayer(this, (StreamInfo) info);
-
} else {
playQueue = new SinglePlayQueue((StreamInfo) info);
diff --git a/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java b/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java
deleted file mode 100644
index 5a2d4a486..000000000
--- a/app/src/main/java/org/schabi/newpipe/download/DeleteDownloadManager.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.schabi.newpipe.download;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BaseTransientBottomBar;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-
-import org.schabi.newpipe.R;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Completable;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import io.reactivex.subjects.PublishSubject;
-import us.shandian.giga.get.DownloadManager;
-import us.shandian.giga.get.DownloadMission;
-
-public class DeleteDownloadManager {
-
- private static final String KEY_STATE = "delete_manager_state";
-
- private final View mView;
- private final HashSet mPendingMap;
- private final List mDisposableList;
- private DownloadManager mDownloadManager;
- private final PublishSubject publishSubject = PublishSubject.create();
-
- DeleteDownloadManager(Activity activity) {
- mPendingMap = new HashSet<>();
- mDisposableList = new ArrayList<>();
- mView = activity.findViewById(android.R.id.content);
- }
-
- public Observable getUndoObservable() {
- return publishSubject;
- }
-
- public boolean contains(@NonNull DownloadMission mission) {
- return mPendingMap.contains(mission.url);
- }
-
- public void add(@NonNull DownloadMission mission) {
- mPendingMap.add(mission.url);
-
- if (mPendingMap.size() == 1) {
- showUndoDeleteSnackbar(mission);
- }
- }
-
- public void setDownloadManager(@NonNull DownloadManager downloadManager) {
- mDownloadManager = downloadManager;
-
- if (mPendingMap.size() < 1) return;
-
- showUndoDeleteSnackbar();
- }
-
- public void restoreState(@Nullable Bundle savedInstanceState) {
- if (savedInstanceState == null) return;
-
- List list = savedInstanceState.getStringArrayList(KEY_STATE);
- if (list != null) {
- mPendingMap.addAll(list);
- }
- }
-
- public void saveState(@Nullable Bundle outState) {
- if (outState == null) return;
-
- for (Disposable disposable : mDisposableList) {
- disposable.dispose();
- }
-
- outState.putStringArrayList(KEY_STATE, new ArrayList<>(mPendingMap));
- }
-
- private void showUndoDeleteSnackbar() {
- if (mPendingMap.size() < 1) return;
-
- String url = mPendingMap.iterator().next();
-
- for (int i = 0; i < mDownloadManager.getCount(); i++) {
- DownloadMission mission = mDownloadManager.getMission(i);
- if (url.equals(mission.url)) {
- showUndoDeleteSnackbar(mission);
- break;
- }
- }
- }
-
- private void showUndoDeleteSnackbar(@NonNull DownloadMission mission) {
- final Snackbar snackbar = Snackbar.make(mView, mission.name, Snackbar.LENGTH_INDEFINITE);
- final Disposable disposable = Observable.timer(3, TimeUnit.SECONDS)
- .subscribeOn(AndroidSchedulers.mainThread())
- .subscribe(l -> snackbar.dismiss());
-
- mDisposableList.add(disposable);
-
- snackbar.setAction(R.string.undo, v -> {
- mPendingMap.remove(mission.url);
- publishSubject.onNext(mission);
- disposable.dispose();
- snackbar.dismiss();
- });
-
- snackbar.addCallback(new BaseTransientBottomBar.BaseCallback() {
- @Override
- public void onDismissed(Snackbar transientBottomBar, int event) {
- if (!disposable.isDisposed()) {
- Completable.fromAction(() -> deletePending(mission))
- .subscribeOn(Schedulers.io())
- .subscribe();
- }
- mPendingMap.remove(mission.url);
- snackbar.removeCallback(this);
- mDisposableList.remove(disposable);
- showUndoDeleteSnackbar();
- }
- });
-
- snackbar.show();
- }
-
- public void deletePending() {
- if (mPendingMap.size() < 1) return;
-
- HashSet idSet = new HashSet<>();
- for (int i = 0; i < mDownloadManager.getCount(); i++) {
- if (contains(mDownloadManager.getMission(i))) {
- idSet.add(i);
- }
- }
-
- for (Integer id : idSet) {
- mDownloadManager.deleteMission(id);
- }
-
- mPendingMap.clear();
- }
-
- private void deletePending(@NonNull DownloadMission mission) {
- for (int i = 0; i < mDownloadManager.getCount(); i++) {
- if (mission.url.equals(mDownloadManager.getMission(i).url)) {
- mDownloadManager.deleteMission(i);
- break;
- }
- }
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
index 4a2c85149..251e4c730 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java
@@ -15,16 +15,12 @@ import org.schabi.newpipe.R;
import org.schabi.newpipe.settings.SettingsActivity;
import org.schabi.newpipe.util.ThemeHelper;
-import io.reactivex.Completable;
-import io.reactivex.schedulers.Schedulers;
import us.shandian.giga.service.DownloadManagerService;
-import us.shandian.giga.ui.fragment.AllMissionsFragment;
import us.shandian.giga.ui.fragment.MissionsFragment;
public class DownloadActivity extends AppCompatActivity {
private static final String MISSIONS_FRAGMENT_TAG = "fragment_tag";
- private DeleteDownloadManager mDeleteDownloadManager;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -47,32 +43,17 @@ public class DownloadActivity extends AppCompatActivity {
actionBar.setDisplayShowTitleEnabled(true);
}
- mDeleteDownloadManager = new DeleteDownloadManager(this);
- mDeleteDownloadManager.restoreState(savedInstanceState);
-
- MissionsFragment fragment = (MissionsFragment) getFragmentManager().findFragmentByTag(MISSIONS_FRAGMENT_TAG);
- if (fragment != null) {
- fragment.setDeleteManager(mDeleteDownloadManager);
- } else {
- getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
- @Override
- public void onGlobalLayout() {
- updateFragments();
- getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
- }
- });
- }
- }
-
- @Override
- protected void onSaveInstanceState(Bundle outState) {
- mDeleteDownloadManager.saveState(outState);
- super.onSaveInstanceState(outState);
+ getWindow().getDecorView().getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+ @Override
+ public void onGlobalLayout() {
+ updateFragments();
+ getWindow().getDecorView().getViewTreeObserver().removeGlobalOnLayoutListener(this);
+ }
+ });
}
private void updateFragments() {
- MissionsFragment fragment = new AllMissionsFragment();
- fragment.setDeleteManager(mDeleteDownloadManager);
+ MissionsFragment fragment = new MissionsFragment();
getFragmentManager().beginTransaction()
.replace(R.id.frame, fragment, MISSIONS_FRAGMENT_TAG)
@@ -99,7 +80,6 @@ public class DownloadActivity extends AppCompatActivity {
case R.id.action_settings: {
Intent intent = new Intent(this, SettingsActivity.class);
startActivity(intent);
- deletePending();
return true;
}
default:
@@ -108,14 +88,7 @@ public class DownloadActivity extends AppCompatActivity {
}
@Override
- public void onBackPressed() {
- super.onBackPressed();
- deletePending();
- }
-
- private void deletePending() {
- Completable.fromAction(mDeleteDownloadManager::deletePending)
- .subscribeOn(Schedulers.io())
- .subscribe();
+ public void onRestoreInstanceState(Bundle inState){
+ super.onRestoreInstanceState(inState);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
index 9bbda6032..4f98f7f28 100644
--- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
@@ -1,13 +1,17 @@
package org.schabi.newpipe.download;
import android.content.Context;
+import android.content.SharedPreferences;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import android.util.Log;
+import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -22,38 +26,55 @@ import android.widget.Toast;
import org.schabi.newpipe.MainActivity;
import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.NewPipe;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.Stream;
import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.extractor.utils.Localization;
import org.schabi.newpipe.settings.NewPipeSettings;
import org.schabi.newpipe.util.FilenameUtils;
import org.schabi.newpipe.util.ListHelper;
import org.schabi.newpipe.util.PermissionHelper;
+import org.schabi.newpipe.util.SecondaryStreamHelper;
import org.schabi.newpipe.util.StreamItemAdapter;
import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
import org.schabi.newpipe.util.ThemeHelper;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import icepick.Icepick;
import icepick.State;
import io.reactivex.disposables.CompositeDisposable;
+import us.shandian.giga.postprocessing.Postprocessing;
import us.shandian.giga.service.DownloadManagerService;
public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener {
private static final String TAG = "DialogFragment";
private static final boolean DEBUG = MainActivity.DEBUG;
- @State protected StreamInfo currentInfo;
- @State protected StreamSizeWrapper wrappedAudioStreams = StreamSizeWrapper.empty();
- @State protected StreamSizeWrapper wrappedVideoStreams = StreamSizeWrapper.empty();
- @State protected int selectedVideoIndex = 0;
- @State protected int selectedAudioIndex = 0;
+ @State
+ protected StreamInfo currentInfo;
+ @State
+ protected StreamSizeWrapper wrappedAudioStreams = StreamSizeWrapper.empty();
+ @State
+ protected StreamSizeWrapper wrappedVideoStreams = StreamSizeWrapper.empty();
+ @State
+ protected StreamSizeWrapper wrappedSubtitleStreams = StreamSizeWrapper.empty();
+ @State
+ protected int selectedVideoIndex = 0;
+ @State
+ protected int selectedAudioIndex = 0;
+ @State
+ protected int selectedSubtitleIndex = 0;
- private StreamItemAdapter audioStreamsAdapter;
- private StreamItemAdapter videoStreamsAdapter;
+ private StreamItemAdapter audioStreamsAdapter;
+ private StreamItemAdapter videoStreamsAdapter;
+ private StreamItemAdapter subtitleStreamsAdapter;
private final CompositeDisposable disposables = new CompositeDisposable();
@@ -63,6 +84,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
private TextView threadsCountTextView;
private SeekBar threadsSeekBar;
+ private SharedPreferences prefs;
+
public static DownloadDialog newInstance(StreamInfo info) {
DownloadDialog dialog = new DownloadDialog();
dialog.setInfo(info);
@@ -78,6 +101,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
instance.setVideoStreams(streamsList);
instance.setSelectedVideoStream(selectedStreamIndex);
instance.setAudioStreams(info.getAudioStreams());
+ instance.setSubtitleStreams(info.getSubtitles());
+
return instance;
}
@@ -86,7 +111,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
}
public void setAudioStreams(List audioStreams) {
- setAudioStreams(new StreamSizeWrapper<>(audioStreams));
+ setAudioStreams(new StreamSizeWrapper<>(audioStreams, getContext()));
}
public void setAudioStreams(StreamSizeWrapper wrappedAudioStreams) {
@@ -94,13 +119,21 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
}
public void setVideoStreams(List videoStreams) {
- setVideoStreams(new StreamSizeWrapper<>(videoStreams));
+ setVideoStreams(new StreamSizeWrapper<>(videoStreams, getContext()));
}
public void setVideoStreams(StreamSizeWrapper wrappedVideoStreams) {
this.wrappedVideoStreams = wrappedVideoStreams;
}
+ public void setSubtitleStreams(List subtitleStreams) {
+ setSubtitleStreams(new StreamSizeWrapper<>(subtitleStreams, getContext()));
+ }
+
+ public void setSubtitleStreams(StreamSizeWrapper wrappedSubtitleStreams) {
+ this.wrappedSubtitleStreams = wrappedSubtitleStreams;
+ }
+
public void setSelectedVideoStream(int selectedVideoIndex) {
this.selectedVideoIndex = selectedVideoIndex;
}
@@ -109,6 +142,10 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
this.selectedAudioIndex = selectedAudioIndex;
}
+ public void setSelectedSubtitleStream(int selectedSubtitleIndex) {
+ this.selectedSubtitleIndex = selectedSubtitleIndex;
+ }
+
/*//////////////////////////////////////////////////////////////////////////
// LifeCycle
//////////////////////////////////////////////////////////////////////////*/
@@ -116,7 +153,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
+ if (DEBUG)
+ Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
if (!PermissionHelper.checkStoragePermissions(getActivity(), PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) {
getDialog().dismiss();
return;
@@ -125,13 +163,29 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
setStyle(STYLE_NO_TITLE, ThemeHelper.getDialogTheme(getContext()));
Icepick.restoreInstanceState(this, savedInstanceState);
- this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, true);
+ SparseArray> secondaryStreams = new SparseArray<>(4);
+ List videoStreams = wrappedVideoStreams.getStreamsList();
+
+ for (int i = 0; i < videoStreams.size(); i++) {
+ if (!videoStreams.get(i).isVideoOnly()) continue;
+ AudioStream audioStream = SecondaryStreamHelper.getAudioStreamFor(wrappedAudioStreams.getStreamsList(), videoStreams.get(i));
+
+ if (audioStream != null) {
+ secondaryStreams.append(i, new SecondaryStreamHelper<>(wrappedAudioStreams, audioStream));
+ } else if (DEBUG) {
+ Log.w(TAG, "No audio stream candidates for video format " + videoStreams.get(i).getFormat().name());
+ }
+ }
+
+ this.videoStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedVideoStreams, secondaryStreams);
this.audioStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedAudioStreams);
+ this.subtitleStreamsAdapter = new StreamItemAdapter<>(getContext(), wrappedSubtitleStreams);
}
@Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- if (DEBUG) Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
+ if (DEBUG)
+ Log.d(TAG, "onCreateView() called with: inflater = [" + inflater + "], container = [" + container + "], savedInstanceState = [" + savedInstanceState + "]");
return inflater.inflate(R.layout.download_dialog, container);
}
@@ -142,6 +196,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
nameEditText.setText(FilenameUtils.createFilename(getContext(), currentInfo.getName()));
selectedAudioIndex = ListHelper.getDefaultAudioFormat(getContext(), currentInfo.getAudioStreams());
+ selectedSubtitleIndex = getSubtitleIndexBy(subtitleStreamsAdapter.getAll());
+
streamsSpinner = view.findViewById(R.id.quality_spinner);
streamsSpinner.setOnItemSelectedListener(this);
@@ -154,14 +210,18 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
initToolbar(view.findViewById(R.id.toolbar));
setupDownloadOptions();
- int def = 3;
- threadsCountTextView.setText(String.valueOf(def));
- threadsSeekBar.setProgress(def - 1);
+ prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+ int threads = prefs.getInt(getString(R.string.default_download_threads), 3);
+ threadsCountTextView.setText(String.valueOf(threads));
+ threadsSeekBar.setProgress(threads - 1);
threadsSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekbar, int progress, boolean fromUser) {
- threadsCountTextView.setText(String.valueOf(progress + 1));
+ progress++;
+ prefs.edit().putInt(getString(R.string.default_download_threads), progress).apply();
+ threadsCountTextView.setText(String.valueOf(progress));
}
@Override
@@ -189,6 +249,11 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
setupAudioSpinner();
}
}));
+ disposables.add(StreamSizeWrapper.fetchSizeForWrapper(wrappedSubtitleStreams).subscribe(result -> {
+ if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+ setupSubtitleSpinner();
+ }
+ }));
}
@Override
@@ -216,7 +281,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
toolbar.setOnMenuItemClickListener(item -> {
if (item.getItemId() == R.id.okay) {
- downloadSelected();
+ prepareSelectedDownload();
return true;
}
return false;
@@ -239,13 +304,24 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
setRadioButtonsState(true);
}
+ private void setupSubtitleSpinner() {
+ if (getContext() == null) return;
+
+ streamsSpinner.setAdapter(subtitleStreamsAdapter);
+ streamsSpinner.setSelection(selectedSubtitleIndex);
+ setRadioButtonsState(true);
+ }
+
/*//////////////////////////////////////////////////////////////////////////
// Radio group Video&Audio options - Listener
//////////////////////////////////////////////////////////////////////////*/
@Override
public void onCheckedChanged(RadioGroup group, @IdRes int checkedId) {
- if (DEBUG) Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+ if (DEBUG)
+ Log.d(TAG, "onCheckedChanged() called with: group = [" + group + "], checkedId = [" + checkedId + "]");
+ boolean flag = true;
+
switch (checkedId) {
case R.id.audio_button:
setupAudioSpinner();
@@ -253,7 +329,13 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
case R.id.video_button:
setupVideoSpinner();
break;
+ case R.id.subtitle_button:
+ setupSubtitleSpinner();
+ flag = false;
+ break;
}
+
+ threadsSeekBar.setEnabled(flag);
}
/*//////////////////////////////////////////////////////////////////////////
@@ -262,7 +344,8 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
@Override
public void onItemSelected(AdapterView parent, View view, int position, long id) {
- if (DEBUG) Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
+ if (DEBUG)
+ Log.d(TAG, "onItemSelected() called with: parent = [" + parent + "], view = [" + view + "], position = [" + position + "], id = [" + id + "]");
switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
case R.id.audio_button:
selectedAudioIndex = position;
@@ -270,6 +353,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
case R.id.video_button:
selectedVideoIndex = position;
break;
+ case R.id.subtitle_button:
+ selectedSubtitleIndex = position;
+ break;
}
}
@@ -286,11 +372,14 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
final RadioButton audioButton = radioVideoAudioGroup.findViewById(R.id.audio_button);
final RadioButton videoButton = radioVideoAudioGroup.findViewById(R.id.video_button);
+ final RadioButton subtitleButton = radioVideoAudioGroup.findViewById(R.id.subtitle_button);
final boolean isVideoStreamsAvailable = videoStreamsAdapter.getCount() > 0;
final boolean isAudioStreamsAvailable = audioStreamsAdapter.getCount() > 0;
+ final boolean isSubtitleStreamsAvailable = subtitleStreamsAdapter.getCount() > 0;
audioButton.setVisibility(isAudioStreamsAvailable ? View.VISIBLE : View.GONE);
videoButton.setVisibility(isVideoStreamsAvailable ? View.VISIBLE : View.GONE);
+ subtitleButton.setVisibility(isSubtitleStreamsAvailable ? View.VISIBLE : View.GONE);
if (isVideoStreamsAvailable) {
videoButton.setChecked(true);
@@ -298,6 +387,9 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
} else if (isAudioStreamsAvailable) {
audioButton.setChecked(true);
setupAudioSpinner();
+ } else if (isSubtitleStreamsAvailable) {
+ subtitleButton.setChecked(true);
+ setupSubtitleSpinner();
} else {
Toast.makeText(getContext(), R.string.no_streams_available_download, Toast.LENGTH_SHORT).show();
getDialog().dismiss();
@@ -307,28 +399,144 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheck
private void setRadioButtonsState(boolean enabled) {
radioVideoAudioGroup.findViewById(R.id.audio_button).setEnabled(enabled);
radioVideoAudioGroup.findViewById(R.id.video_button).setEnabled(enabled);
+ radioVideoAudioGroup.findViewById(R.id.subtitle_button).setEnabled(enabled);
}
- private void downloadSelected() {
- Stream stream;
- String location;
+ private int getSubtitleIndexBy(List streams) {
+ Localization loc = NewPipe.getPreferredLocalization();
- String fileName = nameEditText.getText().toString().trim();
- if (fileName.isEmpty()) fileName = FilenameUtils.createFilename(getContext(), currentInfo.getName());
-
- boolean isAudio = radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.audio_button;
- if (isAudio) {
- stream = audioStreamsAdapter.getItem(selectedAudioIndex);
- location = NewPipeSettings.getAudioDownloadPath(getContext());
- } else {
- stream = videoStreamsAdapter.getItem(selectedVideoIndex);
- location = NewPipeSettings.getVideoDownloadPath(getContext());
+ for (int i = 0; i < streams.size(); i++) {
+ Locale streamLocale = streams.get(i).getLocale();
+ String tag = streamLocale.getLanguage().concat("-").concat(streamLocale.getCountry());
+ if (tag.equalsIgnoreCase(loc.getLanguage())) {
+ return i;
+ }
}
- String url = stream.getUrl();
- fileName += "." + stream.getFormat().getSuffix();
+ // fallback
+ // 1st loop match country & language
+ // 2nd loop match language only
+ int index = loc.getLanguage().indexOf("-");
+ String lang = index > 0 ? loc.getLanguage().substring(0, index) : loc.getLanguage();
+
+ for (int j = 0; j < 2; j++) {
+ for (int i = 0; i < streams.size(); i++) {
+ Locale streamLocale = streams.get(i).getLocale();
+
+ if (streamLocale.getLanguage().equalsIgnoreCase(lang)) {
+ if (j > 0 || streamLocale.getCountry().equalsIgnoreCase(loc.getCountry())) {
+ return i;
+ }
+ }
+ }
+ }
+
+ return 0;
+ }
+
+ private void prepareSelectedDownload() {
+ final Context context = getContext();
+ Stream stream;
+ String location;
+ char kind;
+
+ String fileName = nameEditText.getText().toString().trim();
+ if (fileName.isEmpty())
+ fileName = FilenameUtils.createFilename(context, currentInfo.getName());
+
+ switch (radioVideoAudioGroup.getCheckedRadioButtonId()) {
+ case R.id.audio_button:
+ stream = audioStreamsAdapter.getItem(selectedAudioIndex);
+ location = NewPipeSettings.getAudioDownloadPath(context);
+ kind = 'a';
+ break;
+ case R.id.video_button:
+ stream = videoStreamsAdapter.getItem(selectedVideoIndex);
+ location = NewPipeSettings.getVideoDownloadPath(context);
+ kind = 'v';
+ break;
+ case R.id.subtitle_button:
+ stream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex);
+ location = NewPipeSettings.getVideoDownloadPath(context);// assume that subtitle & video go together
+ kind = 's';
+ break;
+ default:
+ return;
+ }
+
+ int threads;
+
+ if (radioVideoAudioGroup.getCheckedRadioButtonId() == R.id.subtitle_button) {
+ threads = 1;// use unique thread for subtitles due small file size
+ fileName += ".srt";// final subtitle format
+ } else {
+ threads = threadsSeekBar.getProgress() + 1;
+ fileName += "." + stream.getFormat().getSuffix();
+ }
+
+ final String finalFileName = fileName;
+
+ DownloadManagerService.checkForRunningMission(context, location, fileName, (listed, finished) -> {
+ // should be safe run the following code without "getActivity().runOnUiThread()"
+ if (listed) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(context);
+ builder.setTitle(R.string.download_dialog_title)
+ .setMessage(finished ? R.string.overwrite_warning : R.string.download_already_running)
+ .setPositiveButton(
+ finished ? R.string.overwrite : R.string.generate_unique_name,
+ (dialog, which) -> downloadSelected(context, stream, location, finalFileName, kind, threads)
+ )
+ .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+ dialog.cancel();
+ })
+ .create()
+ .show();
+ } else {
+ downloadSelected(context, stream, location, finalFileName, kind, threads);
+ }
+ });
+ }
+
+ private void downloadSelected(Context context, Stream selectedStream, String location, String fileName, char kind, int threads) {
+ String[] urls;
+ String psName = null;
+ String[] psArgs = null;
+ String secondaryStreamUrl = null;
+ long nearLength = 0;
+
+ if (selectedStream instanceof VideoStream) {
+ SecondaryStreamHelper secondaryStream = videoStreamsAdapter
+ .getAllSecondary()
+ .get(wrappedVideoStreams.getStreamsList().indexOf(selectedStream));
+
+ if (secondaryStream != null) {
+ secondaryStreamUrl = secondaryStream.getStream().getUrl();
+ psName = selectedStream.getFormat() == MediaFormat.MPEG_4 ? Postprocessing.ALGORITHM_MP4_DASH_MUXER : Postprocessing.ALGORITHM_WEBM_MUXER;
+ psArgs = null;
+ long videoSize = wrappedVideoStreams.getSizeInBytes((VideoStream) selectedStream);
+
+ // set nearLength, only, if both sizes are fetched or known. this probably does not work on weak internet connections
+ if (secondaryStream.getSizeInBytes() > 0 && videoSize > 0) {
+ nearLength = secondaryStream.getSizeInBytes() + videoSize;
+ }
+ }
+ } else if ((selectedStream instanceof SubtitlesStream) && selectedStream.getFormat() == MediaFormat.TTML) {
+ psName = Postprocessing.ALGORITHM_TTML_CONVERTER;
+ psArgs = new String[]{
+ selectedStream.getFormat().getSuffix(),
+ "false",// ignore empty frames
+ "false",// detect youtube duplicate lines
+ };
+ }
+
+ if (secondaryStreamUrl == null) {
+ urls = new String[]{selectedStream.getUrl()};
+ } else {
+ urls = new String[]{selectedStream.getUrl(), secondaryStreamUrl};
+ }
+
+ DownloadManagerService.startMission(context, urls, location, fileName, kind, threads, currentInfo.getUrl(), psName, psArgs, nearLength);
- DownloadManagerService.startMission(getContext(), url, location, fileName, isAudio, threadsSeekBar.getProgress() + 1);
getDialog().dismiss();
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java
index 2dd7071be..27cc3ec8a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java
@@ -1,10 +1,9 @@
package org.schabi.newpipe.fragments.detail;
-import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.PagerAdapter;
+import android.view.ViewGroup;
import java.util.ArrayList;
import java.util.List;
@@ -13,10 +12,11 @@ public class TabAdaptor extends FragmentPagerAdapter {
private final List mFragmentList = new ArrayList<>();
private final List mFragmentTitleList = new ArrayList<>();
- int baseId = 0;
+ private final FragmentManager fragmentManager;
public TabAdaptor(FragmentManager fm) {
super(fm);
+ this.fragmentManager = fm;
}
@Override
@@ -29,18 +29,6 @@ public class TabAdaptor extends FragmentPagerAdapter {
return mFragmentList.size();
}
- @Nullable
- @Override
- public CharSequence getPageTitle(int position) {
- return mFragmentTitleList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- // give an ID different from position when position has been changed
- return baseId + position;
- }
-
public void addFragment(Fragment fragment, String title) {
mFragmentList.add(fragment);
mFragmentTitleList.add(title);
@@ -73,19 +61,13 @@ public class TabAdaptor extends FragmentPagerAdapter {
else return POSITION_NONE;
}
- /**
- * Notify that the position of a fragment has been changed.
- * Create a new ID for each position to force recreation of the fragment
- * @param n number of items which have been changed
- */
- public void notifyChangeInPosition(int n) {
- // shift the ID returned by getItemId outside the range of all previous fragments
- // https://stackoverflow.com/questions/10396321/remove-fragment-page-from-viewpager-in-android
- baseId += getCount() + n;
- }
-
public void notifyDataSetUpdate(){
- notifyChangeInPosition(1);
notifyDataSetChanged();
}
+
+ @Override
+ public void destroyItem(ViewGroup container, int position, Object object) {
+ fragmentManager.beginTransaction().remove((Fragment) object).commitNowAllowingStateLoss();
+ }
+
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 76047b725..c007789e5 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -10,7 +10,6 @@ import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.DrawableRes;
-import android.support.annotation.FloatRange;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
@@ -18,7 +17,6 @@ import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
@@ -29,7 +27,6 @@ import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
import android.util.DisplayMetrics;
import android.util.Log;
-import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
@@ -39,7 +36,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.FrameLayout;
-import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
@@ -56,8 +52,6 @@ import org.schabi.newpipe.ReCaptchaActivity;
import org.schabi.newpipe.download.DownloadDialog;
import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.comments.CommentsInfo;
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
import org.schabi.newpipe.extractor.exceptions.ParsingException;
@@ -72,18 +66,16 @@ import org.schabi.newpipe.fragments.BackPressable;
import org.schabi.newpipe.fragments.BaseStateFragment;
import org.schabi.newpipe.fragments.list.comments.CommentsFragment;
import org.schabi.newpipe.fragments.list.videos.RelatedVideosFragment;
-import org.schabi.newpipe.info_list.InfoItemBuilder;
import org.schabi.newpipe.info_list.InfoItemDialog;
import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
import org.schabi.newpipe.local.history.HistoryRecordManager;
import org.schabi.newpipe.player.MainVideoPlayer;
import org.schabi.newpipe.player.PopupVideoPlayer;
-import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
import org.schabi.newpipe.report.ErrorActivity;
import org.schabi.newpipe.report.UserAction;
+import org.schabi.newpipe.util.AnimationUtils;
import org.schabi.newpipe.util.Constants;
import org.schabi.newpipe.util.ExtractorHelper;
import org.schabi.newpipe.util.ImageDisplayConstants;
@@ -91,11 +83,9 @@ import org.schabi.newpipe.util.InfoCache;
import org.schabi.newpipe.util.ListHelper;
import org.schabi.newpipe.util.Localization;
import org.schabi.newpipe.util.NavigationHelper;
-import org.schabi.newpipe.util.OnClickGesture;
import org.schabi.newpipe.util.PermissionHelper;
import org.schabi.newpipe.util.StreamItemAdapter;
import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
-import org.schabi.newpipe.util.ThemeHelper;
import java.io.Serializable;
import java.util.Collection;
@@ -192,6 +182,7 @@ public class VideoDetailFragment
private ViewPager viewPager;
private TabAdaptor pageAdapter;
private TabLayout tabLayout;
+ private FrameLayout relatedStreamsLayout;
/*////////////////////////////////////////////////////////////////////////*/
@@ -383,14 +374,14 @@ public class VideoDetailFragment
Log.w(TAG, "Can't open channel because we got no channel URL");
} else {
try {
- NavigationHelper.openChannelFragment(
- getFragmentManager(),
- currentInfo.getServiceId(),
- currentInfo.getUploaderUrl(),
- currentInfo.getUploaderName());
+ NavigationHelper.openChannelFragment(
+ getFragmentManager(),
+ currentInfo.getServiceId(),
+ currentInfo.getUploaderUrl(),
+ currentInfo.getUploaderName());
} catch (Exception e) {
ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
- }
+ }
}
break;
case R.id.detail_thumbnail_root_layout:
@@ -489,6 +480,8 @@ public class VideoDetailFragment
tabLayout = rootView.findViewById(R.id.tablayout);
tabLayout.setupWithViewPager(viewPager);
+ relatedStreamsLayout = rootView.findViewById(R.id.relatedStreamsLayout);
+
setHeightThumbnail();
@@ -588,6 +581,7 @@ public class VideoDetailFragment
}
}
+
/*//////////////////////////////////////////////////////////////////////////
// Menu
//////////////////////////////////////////////////////////////////////////*/
@@ -676,7 +670,7 @@ public class VideoDetailFragment
sortedVideoStreams = ListHelper.getSortedStreamVideosList(activity, info.getVideoStreams(), info.getVideoOnlyStreams(), false);
selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(activity, sortedVideoStreams);
- final StreamItemAdapter streamsAdapter = new StreamItemAdapter<>(activity, new StreamSizeWrapper<>(sortedVideoStreams), isExternalPlayerEnabled);
+ final StreamItemAdapter streamsAdapter = new StreamItemAdapter<>(activity, new StreamSizeWrapper<>(sortedVideoStreams, activity), isExternalPlayerEnabled);
spinnerToolbar.setAdapter(streamsAdapter);
spinnerToolbar.setSelection(selectedVideoStreamIndex);
spinnerToolbar.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -771,11 +765,9 @@ public class VideoDetailFragment
initTabs();
if (scrollToTop) appBarLayout.setExpanded(true, true);
- animateView(contentRootLayoutHiding,
- false, 0, 0, () -> {
- handleResult(info);
- showContentWithAnimation(120, 0, .01f);
- });
+ handleResult(info);
+ showContent();
+
}
protected void prepareAndLoadInfo() {
@@ -798,8 +790,8 @@ public class VideoDetailFragment
.subscribe((@NonNull StreamInfo result) -> {
isLoading.set(false);
currentInfo = result;
- showContentWithAnimation(120, 0, 0);
handleResult(result);
+ showContent();
}, (@NonNull Throwable throwable) -> {
isLoading.set(false);
onError(throwable);
@@ -814,7 +806,7 @@ public class VideoDetailFragment
pageAdapter.addFragment(CommentsFragment.getInstance(serviceId, url, name), COMMENTS_TAB_TAG);
}
- if(showRelatedStreams){
+ if(showRelatedStreams && null == relatedStreamsLayout){
//temp empty fragment. will be updated in handleResult
pageAdapter.addFragment(new Fragment(), RELATED_TAB_TAG);
}
@@ -879,7 +871,7 @@ public class VideoDetailFragment
.getBoolean(this.getString(R.string.use_external_video_player_key), false)) {
startOnExternalPlayer(activity, currentInfo, selectedVideoStream);
} else {
- openNormalPlayer(selectedVideoStream);
+ openNormalPlayer();
}
}
@@ -892,24 +884,13 @@ public class VideoDetailFragment
}
}
- private void openNormalPlayer(VideoStream selectedVideoStream) {
+ private void openNormalPlayer() {
Intent mIntent;
- boolean useOldPlayer = PlayerHelper.isUsingOldPlayer(activity) || (Build.VERSION.SDK_INT < 16);
- if (!useOldPlayer) {
- // ExoPlayer
- final PlayQueue playQueue = new SinglePlayQueue(currentInfo);
- mIntent = NavigationHelper.getPlayerIntent(activity,
- MainVideoPlayer.class,
- playQueue,
- getSelectedVideoStream().getResolution());
- } else {
- // Internal Player
- mIntent = new Intent(activity, PlayVideoActivity.class)
- .putExtra(PlayVideoActivity.VIDEO_TITLE, currentInfo.getName())
- .putExtra(PlayVideoActivity.STREAM_URL, selectedVideoStream.getUrl())
- .putExtra(PlayVideoActivity.VIDEO_URL, currentInfo.getUrl())
- .putExtra(PlayVideoActivity.START_POSITION, currentInfo.getStartPosition());
- }
+ final PlayQueue playQueue = new SinglePlayQueue(currentInfo);
+ mIntent = NavigationHelper.getPlayerIntent(activity,
+ MainVideoPlayer.class,
+ playQueue,
+ getSelectedVideoStream().getResolution());
startActivity(mIntent);
}
@@ -964,24 +945,6 @@ public class VideoDetailFragment
}));
}
- private View getSeparatorView() {
- View separator = new View(activity);
- LinearLayout.LayoutParams params =
- new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1);
- int m8 = (int) TypedValue.applyDimension(
- TypedValue.COMPLEX_UNIT_DIP, 8, getResources().getDisplayMetrics());
- int m5 = (int) TypedValue.applyDimension(
- TypedValue.COMPLEX_UNIT_DIP, 5, getResources().getDisplayMetrics());
- params.setMargins(m8, m5, m8, m5);
- separator.setLayoutParams(params);
-
- TypedValue typedValue = new TypedValue();
- activity.getTheme().resolveAttribute(R.attr.separator_color, typedValue, true);
- separator.setBackgroundColor(typedValue.data);
-
- return separator;
- }
-
private void setHeightThumbnail() {
final DisplayMetrics metrics = getResources().getDisplayMetrics();
boolean isPortrait = metrics.heightPixels > metrics.widthPixels;
@@ -993,36 +956,8 @@ public class VideoDetailFragment
thumbnailImageView.setMinimumHeight(height);
}
- private void showContentWithAnimation(long duration,
- long delay,
- @FloatRange(from = 0.0f, to = 1.0f) float translationPercent) {
- int translationY = (int) (getResources().getDisplayMetrics().heightPixels *
- (translationPercent > 0.0f ? translationPercent : .06f));
-
- contentRootLayoutHiding.animate().setListener(null).cancel();
- contentRootLayoutHiding.setAlpha(0f);
- contentRootLayoutHiding.setTranslationY(translationY);
- contentRootLayoutHiding.setVisibility(View.VISIBLE);
- contentRootLayoutHiding.animate()
- .alpha(1f)
- .translationY(0)
- .setStartDelay(delay)
- .setDuration(duration)
- .setInterpolator(new FastOutSlowInInterpolator())
- .start();
-
- uploaderRootLayout.animate().setListener(null).cancel();
- uploaderRootLayout.setAlpha(0f);
- uploaderRootLayout.setTranslationY(translationY);
- uploaderRootLayout.setVisibility(View.VISIBLE);
- uploaderRootLayout.animate()
- .alpha(1f)
- .translationY(0)
- .setStartDelay((long) (duration * .5f) + delay)
- .setDuration(duration)
- .setInterpolator(new FastOutSlowInInterpolator())
- .start();
-
+ private void showContent() {
+ AnimationUtils.slideUp(contentRootLayoutHiding,120, 96, 0.06f);
}
protected void setInitialData(int serviceId, String url, String name) {
@@ -1057,7 +992,7 @@ public class VideoDetailFragment
public void showLoading() {
super.showLoading();
- animateView(contentRootLayoutHiding, false, 200);
+ contentRootLayoutHiding.setVisibility(View.INVISIBLE);
animateView(spinnerToolbar, false, 200);
animateView(thumbnailPlayButton, false, 50);
animateView(detailDurationView, false, 100);
@@ -1071,6 +1006,14 @@ public class VideoDetailFragment
videoTitleToggleArrow.setVisibility(View.GONE);
videoTitleRoot.setClickable(false);
+ if(relatedStreamsLayout != null){
+ if(showRelatedStreams){
+ relatedStreamsLayout.setVisibility(View.INVISIBLE);
+ }else{
+ relatedStreamsLayout.setVisibility(View.GONE);
+ }
+ }
+
imageLoader.cancelDisplayTask(thumbnailImageView);
imageLoader.cancelDisplayTask(uploaderThumb);
thumbnailImageView.setImageBitmap(null);
@@ -1084,8 +1027,15 @@ public class VideoDetailFragment
setInitialData(info.getServiceId(), info.getOriginalUrl(), info.getName());
if(showRelatedStreams){
- pageAdapter.updateItem(RELATED_TAB_TAG, RelatedVideosFragment.getInstance(currentInfo));
- pageAdapter.notifyDataSetUpdate();
+ if(null == relatedStreamsLayout){ //phone
+ pageAdapter.updateItem(RELATED_TAB_TAG, RelatedVideosFragment.getInstance(currentInfo));
+ pageAdapter.notifyDataSetUpdate();
+ }else{ //tablet
+ getChildFragmentManager().beginTransaction()
+ .replace(R.id.relatedStreamsLayout, RelatedVideosFragment.getInstance(currentInfo))
+ .commitNow();
+ relatedStreamsLayout.setVisibility(View.VISIBLE);
+ }
}
pushToStack(serviceId, url, name);
@@ -1149,10 +1099,10 @@ public class VideoDetailFragment
detailDurationView.setVisibility(View.GONE);
}
+ videoDescriptionView.setVisibility(View.GONE);
videoTitleRoot.setClickable(true);
videoTitleToggleArrow.setVisibility(View.VISIBLE);
videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
- videoDescriptionView.setVisibility(View.GONE);
videoDescriptionRootLayout.setVisibility(View.GONE);
if (!TextUtils.isEmpty(info.getUploadDate())) {
videoUploadDateView.setText(Localization.localizeDate(activity, info.getUploadDate()));
@@ -1205,6 +1155,7 @@ public class VideoDetailFragment
downloadDialog.setVideoStreams(sortedVideoStreams);
downloadDialog.setAudioStreams(currentInfo.getAudioStreams());
downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+ downloadDialog.setSubtitleStreams(currentInfo.getSubtitles());
downloadDialog.show(activity.getSupportFragmentManager(), "downloadDialog");
} catch (Exception e) {
@@ -1253,4 +1204,4 @@ public class VideoDetailFragment
showError(getString(R.string.blocked_by_gema), false, R.drawable.gruese_die_gema);
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
index cd557c931..b61fe0d02 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
@@ -3,10 +3,15 @@ package org.schabi.newpipe.fragments.list;
import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
@@ -22,9 +27,9 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.fragments.BaseStateFragment;
import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
import org.schabi.newpipe.info_list.InfoItemDialog;
import org.schabi.newpipe.info_list.InfoListAdapter;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
import org.schabi.newpipe.report.ErrorActivity;
import org.schabi.newpipe.util.NavigationHelper;
@@ -37,7 +42,7 @@ import java.util.Queue;
import static org.schabi.newpipe.util.AnimationUtils.animateView;
-public abstract class BaseListFragment extends BaseStateFragment implements ListViewContract, StateSaver.WriteRead {
+public abstract class BaseListFragment extends BaseStateFragment implements ListViewContract, StateSaver.WriteRead, SharedPreferences.OnSharedPreferenceChangeListener {
/*//////////////////////////////////////////////////////////////////////////
// Views
@@ -45,6 +50,9 @@ public abstract class BaseListFragment extends BaseStateFragment implem
protected InfoListAdapter infoListAdapter;
protected RecyclerView itemsList;
+ private int updateFlags = 0;
+
+ private static final int LIST_MODE_UPDATE_FLAG = 0x32;
/*//////////////////////////////////////////////////////////////////////////
// LifeCycle
@@ -60,12 +68,31 @@ public abstract class BaseListFragment extends BaseStateFragment implem
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
+ PreferenceManager.getDefaultSharedPreferences(activity)
+ .registerOnSharedPreferenceChangeListener(this);
}
@Override
public void onDestroy() {
super.onDestroy();
StateSaver.onDestroy(savedState);
+ PreferenceManager.getDefaultSharedPreferences(activity)
+ .unregisterOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+
+ if (updateFlags != 0) {
+ if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+ final boolean useGrid = isGridLayout();
+ itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+ infoListAdapter.setGridItemVariants(useGrid);
+ infoListAdapter.notifyDataSetChanged();
+ }
+ updateFlags = 0;
+ }
}
/*//////////////////////////////////////////////////////////////////////////
@@ -120,13 +147,25 @@ public abstract class BaseListFragment extends BaseStateFragment implem
return new LinearLayoutManager(activity);
}
+ protected RecyclerView.LayoutManager getGridLayoutManager() {
+ final Resources resources = activity.getResources();
+ int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+ width += (24 * resources.getDisplayMetrics().density);
+ final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+ final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+ lm.setSpanSizeLookup(infoListAdapter.getSpanSizeLookup(spanCount));
+ return lm;
+ }
+
@Override
protected void initViews(View rootView, Bundle savedInstanceState) {
super.initViews(rootView, savedInstanceState);
+ final boolean useGrid = isGridLayout();
itemsList = rootView.findViewById(R.id.items_list);
- itemsList.setLayoutManager(getListLayoutManager());
+ itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+ infoListAdapter.setGridItemVariants(useGrid);
infoListAdapter.setFooter(getListFooter());
infoListAdapter.setHeader(getListHeader());
@@ -185,7 +224,7 @@ public abstract class BaseListFragment extends BaseStateFragment implem
infoListAdapter.setOnCommentsSelectedListener(new OnClickGesture() {
@Override
public void selected(CommentsInfoItem selectedItem) {
- //Log.d("comments" , "this comment was clicked" + selectedItem.getCommentText());
+ onItemSelected(selectedItem);
}
});
@@ -316,4 +355,22 @@ public abstract class BaseListFragment extends BaseStateFragment implem
public void handleNextItems(N result) {
isLoading.set(false);
}
+
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ if (key.equals(getString(R.string.list_view_mode_key))) {
+ updateFlags |= LIST_MODE_UPDATE_FLAG;
+ }
+ }
+
+ protected boolean isGridLayout() {
+ final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+ if ("auto".equals(list_mode)) {
+ final Configuration configuration = getResources().getConfiguration();
+ return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+ && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+ } else {
+ return "grid".equals(list_mode);
+ }
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
index e7778c905..956e6c1c8 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
@@ -1,72 +1,26 @@
package org.schabi.newpipe.fragments.list.comments;
-import android.app.Activity;
import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.text.TextUtils;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
-import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.jakewharton.rxbinding2.view.RxView;
import org.schabi.newpipe.R;
-import org.schabi.newpipe.database.subscription.SubscriptionEntity;
-import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.ListExtractor;
import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.channel.ChannelInfo;
import org.schabi.newpipe.extractor.comments.CommentsInfo;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.fragments.detail.VideoDetailFragment;
import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
-import org.schabi.newpipe.info_list.InfoItemDialog;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.subscription.SubscriptionService;
-import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
-import org.schabi.newpipe.player.playqueue.PlayQueue;
-import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
import org.schabi.newpipe.report.UserAction;
import org.schabi.newpipe.util.AnimationUtils;
import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.Localization;
-import org.schabi.newpipe.util.NavigationHelper;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.Observable;
import io.reactivex.Single;
-import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
-import io.reactivex.schedulers.Schedulers;
-
-import static org.schabi.newpipe.util.AnimationUtils.animateBackgroundColor;
-import static org.schabi.newpipe.util.AnimationUtils.animateTextColor;
-import static org.schabi.newpipe.util.AnimationUtils.animateView;
public class CommentsFragment extends BaseListInfoFragment {
@@ -139,6 +93,8 @@ public class CommentsFragment extends BaseListInfoFragment {
public void handleResult(@NonNull CommentsInfo result) {
super.handleResult(result);
+ AnimationUtils.slideUp(getView(),120, 96, 0.06f);
+
if (!result.getErrors().isEmpty()) {
showSnackBarError(result.getErrors(), UserAction.REQUESTED_COMMENTS, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
}
@@ -167,6 +123,7 @@ public class CommentsFragment extends BaseListInfoFragment {
protected boolean onError(Throwable exception) {
if (super.onError(exception)) return true;
+ hideLoading();
showSnackBarError(exception, UserAction.REQUESTED_COMMENTS, NewPipe.getNameOfService(serviceId), url, R.string.error_unable_to_load_comments);
return true;
}
@@ -184,4 +141,9 @@ public class CommentsFragment extends BaseListInfoFragment {
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
return;
}
+
+ @Override
+ protected boolean isGridLayout() {
+ return false;
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
index 92138f7db..7d4500691 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
@@ -128,26 +128,16 @@ public class KioskFragment extends BaseListInfoFragment {
@Override
public Single loadResult(boolean forceReload) {
- String contentCountry = PreferenceManager
- .getDefaultSharedPreferences(activity)
- .getString(getString(R.string.content_country_key),
- getString(R.string.default_country_value));
return ExtractorHelper.getKioskInfo(serviceId,
url,
- contentCountry,
forceReload);
}
@Override
public Single loadMoreItemsLogic() {
- String contentCountry = PreferenceManager
- .getDefaultSharedPreferences(activity)
- .getString(getString(R.string.content_country_key),
- getString(R.string.default_country_value));
return ExtractorHelper.getMoreKioskItems(serviceId,
url,
- currentNextPageUrl,
- contentCountry);
+ currentNextPageUrl);
}
/*//////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 19c7d463e..2833abb8d 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -626,7 +626,7 @@ public class SearchFragment
}
final Observable> network = ExtractorHelper
- .suggestionsFor(serviceId, query, contentCountry)
+ .suggestionsFor(serviceId, query)
.toObservable()
.map(strings -> {
List result = new ArrayList<>();
@@ -726,8 +726,7 @@ public class SearchFragment
searchDisposable = ExtractorHelper.searchFor(serviceId,
searchString,
Arrays.asList(contentFilter),
- sortFilter,
- contentCountry)
+ sortFilter)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.doOnEvent((searchResult, throwable) -> isLoading.set(false))
@@ -745,8 +744,7 @@ public class SearchFragment
searchString,
asList(contentFilter),
sortFilter,
- nextPageUrl,
- contentCountry)
+ nextPageUrl)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.doOnEvent((nextItemsResult, throwable) -> isLoading.set(false))
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
index 08a6a3bc3..c8fc2197a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java
@@ -1,7 +1,9 @@
package org.schabi.newpipe.fragments.list.videos;
import android.content.Context;
+import android.content.SharedPreferences;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
@@ -9,36 +11,32 @@ import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.Switch;
import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.ListExtractor;
-import org.schabi.newpipe.extractor.ListInfo;
import org.schabi.newpipe.extractor.NewPipe;
-import org.schabi.newpipe.extractor.comments.CommentsInfo;
-import org.schabi.newpipe.extractor.exceptions.ExtractionException;
-import org.schabi.newpipe.extractor.kiosk.KioskInfo;
import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
import org.schabi.newpipe.report.UserAction;
-import org.schabi.newpipe.util.ExtractorHelper;
+import org.schabi.newpipe.util.AnimationUtils;
import org.schabi.newpipe.util.RelatedStreamInfo;
-import java.util.List;
+import java.io.Serializable;
import io.reactivex.Single;
import io.reactivex.disposables.CompositeDisposable;
-public class RelatedVideosFragment extends BaseListInfoFragment {
+public class RelatedVideosFragment extends BaseListInfoFragment implements SharedPreferences.OnSharedPreferenceChangeListener{
private CompositeDisposable disposables = new CompositeDisposable();
private RelatedStreamInfo relatedStreamInfo;
/*//////////////////////////////////////////////////////////////////////////
// Views
//////////////////////////////////////////////////////////////////////////*/
-
-
+ private View headerRootLayout;
+ private Switch aSwitch;
private boolean mIsVisibleToUser = false;
@@ -74,6 +72,28 @@ public class RelatedVideosFragment extends BaseListInfoFragment loadMoreItemsLogic() {
return Single.fromCallable(() -> ListExtractor.InfoItemsPage.emptyPage());
@@ -91,12 +111,17 @@ public class RelatedVideosFragment extends BaseListInfoFragment infoItemList;
private boolean useMiniVariant = false;
+ private boolean useGridVariant = false;
private boolean showFooter = false;
private View header = null;
private View footer = null;
@@ -103,6 +111,10 @@ public class InfoListAdapter extends RecyclerView.Adapter data) {
if (data != null) {
if (DEBUG) {
@@ -215,11 +227,11 @@ public class InfoListAdapter extends RecyclerView.Adapter {
+ if (itemBuilder.getOnChannelSelectedListener() != null) {
+ itemBuilder.getOnChannelSelectedListener().held(item);
+ }
+ return true;
+ });
}
protected String getDetailLine(final ChannelInfoItem item) {
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
index 046cadc3f..c2bc86691 100644
--- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.info_list.holder;
import android.support.v7.app.AppCompatActivity;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
@@ -13,7 +12,6 @@ import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
import org.schabi.newpipe.info_list.InfoItemBuilder;
import org.schabi.newpipe.report.ErrorActivity;
import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.Localization;
import org.schabi.newpipe.util.NavigationHelper;
import de.hdodenhof.circleimageview.CircleImageView;
@@ -23,6 +21,7 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
private final TextView itemContentView;
private final TextView itemLikesCountView;
private final TextView itemDislikesCountView;
+ private final TextView itemPublishedTime;
private static final int commentDefaultLines = 2;
private static final int commentExpandedLines = 1000;
@@ -31,9 +30,10 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
super(infoItemBuilder, layoutId, parent);
itemThumbnailView = itemView.findViewById(R.id.itemThumbnailView);
- itemContentView = itemView.findViewById(R.id.itemCommentContentView);
itemLikesCountView = itemView.findViewById(R.id.detail_thumbs_up_count_view);
itemDislikesCountView = itemView.findViewById(R.id.detail_thumbs_down_count_view);
+ itemPublishedTime = itemView.findViewById(R.id.itemPublishedTime);
+ itemContentView = itemView.findViewById(R.id.itemCommentContentView);
}
public CommentsMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
@@ -66,10 +66,17 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
}
});
+ // ellipsize if not already ellipsized
+ if (null == itemContentView.getEllipsize()) {
+ itemContentView.setEllipsize(TextUtils.TruncateAt.END);
+ itemContentView.setMaxLines(commentDefaultLines);
+ }
+
itemContentView.setText(item.getCommentText());
if (null != item.getLikeCount()) {
itemLikesCountView.setText(String.valueOf(item.getLikeCount()));
}
+ itemPublishedTime.setText(item.getPublishedTime());
itemView.setOnClickListener(view -> {
toggleEllipsize(item.getCommentText());
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
new file mode 100644
index 000000000..96b9c90a7
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class PlaylistGridInfoItemHolder extends PlaylistMiniInfoItemHolder {
+
+ public PlaylistGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+ super(infoItemBuilder, R.layout.list_playlist_grid_item, parent);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
new file mode 100644
index 000000000..a2e585857
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamGridInfoItemHolder.java
@@ -0,0 +1,13 @@
+package org.schabi.newpipe.info_list.holder;
+
+import android.view.ViewGroup;
+
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.info_list.InfoItemBuilder;
+
+public class StreamGridInfoItemHolder extends StreamMiniInfoItemHolder {
+
+ public StreamGridInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) {
+ super(infoItemBuilder, R.layout.list_stream_grid_item, parent);
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
index 5192aa2ab..abdf82353 100644
--- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
@@ -1,8 +1,13 @@
package org.schabi.newpipe.local;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.content.res.Resources;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBar;
+import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
@@ -25,7 +30,7 @@ import static org.schabi.newpipe.util.AnimationUtils.animateView;
* called and is memory efficient when in backstack.
* */
public abstract class BaseLocalListFragment extends BaseStateFragment
- implements ListViewContract {
+ implements ListViewContract, SharedPreferences.OnSharedPreferenceChangeListener {
/*//////////////////////////////////////////////////////////////////////////
// Views
@@ -36,6 +41,9 @@ public abstract class BaseLocalListFragment extends BaseStateFragment
protected LocalItemListAdapter itemListAdapter;
protected RecyclerView itemsList;
+ private int updateFlags = 0;
+
+ private static final int LIST_MODE_UPDATE_FLAG = 0x32;
/*//////////////////////////////////////////////////////////////////////////
// Lifecycle - Creation
@@ -45,6 +53,29 @@ public abstract class BaseLocalListFragment extends BaseStateFragment
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
+ PreferenceManager.getDefaultSharedPreferences(activity)
+ .registerOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ PreferenceManager.getDefaultSharedPreferences(activity)
+ .unregisterOnSharedPreferenceChangeListener(this);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (updateFlags != 0) {
+ if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
+ final boolean useGrid = isGridLayout();
+ itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+ itemListAdapter.setGridItemVariants(useGrid);
+ itemListAdapter.notifyDataSetChanged();
+ }
+ updateFlags = 0;
+ }
}
/*//////////////////////////////////////////////////////////////////////////
@@ -59,6 +90,16 @@ public abstract class BaseLocalListFragment extends BaseStateFragment
return activity.getLayoutInflater().inflate(R.layout.pignate_footer, itemsList, false);
}
+ protected RecyclerView.LayoutManager getGridLayoutManager() {
+ final Resources resources = activity.getResources();
+ int width = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width);
+ width += (24 * resources.getDisplayMetrics().density);
+ final int spanCount = (int) Math.floor(resources.getDisplayMetrics().widthPixels / (double)width);
+ final GridLayoutManager lm = new GridLayoutManager(activity, spanCount);
+ lm.setSpanSizeLookup(itemListAdapter.getSpanSizeLookup(spanCount));
+ return lm;
+ }
+
protected RecyclerView.LayoutManager getListLayoutManager() {
return new LinearLayoutManager(activity);
}
@@ -67,10 +108,13 @@ public abstract class BaseLocalListFragment extends BaseStateFragment
protected void initViews(View rootView, Bundle savedInstanceState) {
super.initViews(rootView, savedInstanceState);
- itemsList = rootView.findViewById(R.id.items_list);
- itemsList.setLayoutManager(getListLayoutManager());
-
itemListAdapter = new LocalItemListAdapter(activity);
+
+ final boolean useGrid = isGridLayout();
+ itemsList = rootView.findViewById(R.id.items_list);
+ itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
+
+ itemListAdapter.setGridItemVariants(useGrid);
itemListAdapter.setHeader(headerRootView = getListHeader());
itemListAdapter.setFooter(footerRootView = getListFooter());
@@ -174,4 +218,22 @@ public abstract class BaseLocalListFragment extends BaseStateFragment
resetFragment();
return super.onError(exception);
}
+
+ @Override
+ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+ if (key.equals(getString(R.string.list_view_mode_key))) {
+ updateFlags |= LIST_MODE_UPDATE_FLAG;
+ }
+ }
+
+ protected boolean isGridLayout() {
+ final String list_mode = PreferenceManager.getDefaultSharedPreferences(activity).getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value));
+ if ("auto".equals(list_mode)) {
+ final Configuration configuration = getResources().getConfiguration();
+ return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+ && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+ } else {
+ return "grid".equals(list_mode);
+ }
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
index 99937b58c..e298dedd3 100644
--- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java
@@ -1,18 +1,21 @@
package org.schabi.newpipe.local;
import android.app.Activity;
+import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import org.schabi.newpipe.database.LocalItem;
-import org.schabi.newpipe.local.HeaderFooterHolder;
-import org.schabi.newpipe.local.LocalItemBuilder;
import org.schabi.newpipe.local.holder.LocalItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder;
import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
+import org.schabi.newpipe.local.holder.LocalPlaylistStreamGridItemHolder;
import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
+import org.schabi.newpipe.local.holder.LocalStatisticStreamGridItemHolder;
import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
+import org.schabi.newpipe.local.holder.RemotePlaylistGridItemHolder;
import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
import org.schabi.newpipe.util.FallbackViewHolder;
import org.schabi.newpipe.util.Localization;
@@ -52,14 +55,19 @@ public class LocalItemListAdapter extends RecyclerView.Adapter localItems;
private final DateFormat dateFormat;
private boolean showFooter = false;
+ private boolean useGridVariant = false;
private View header = null;
private View footer = null;
@@ -134,6 +142,10 @@ public class LocalItemListAdapter extends RecyclerView.Adapter> {
+public class SubscriptionFragment extends BaseStateFragment> implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final int REQUEST_EXPORT_CODE = 666;
private static final int REQUEST_IMPORT_CODE = 667;
@@ -78,6 +89,9 @@ public class SubscriptionFragment extends BaseStateFragment() {
- @Override
+
public void selected(ChannelInfoItem selectedItem) {
final FragmentManager fragmentManager = getFM();
NavigationHelper.openChannelFragment(fragmentManager,
@@ -326,6 +369,11 @@ public class SubscriptionFragment extends BaseStateFragment importExportOptions.switchState());
}
+ private void showLongTapDialog(ChannelInfoItem selectedItem) {
+ final Context context = getContext();
+ final Activity activity = getActivity();
+ if (context == null || context.getResources() == null || getActivity() == null) return;
+
+ final String[] commands = new String[]{
+ context.getResources().getString(R.string.share),
+ context.getResources().getString(R.string.unsubscribe)
+ };
+
+ final DialogInterface.OnClickListener actions = (dialogInterface, i) -> {
+ switch (i) {
+ case 0:
+ shareChannel(selectedItem);
+ break;
+ case 1:
+ deleteChannel(selectedItem);
+ break;
+ default:
+ break;
+ }
+ };
+
+ final View bannerView = View.inflate(activity, R.layout.dialog_title, null);
+ bannerView.setSelected(true);
+
+ TextView titleView = bannerView.findViewById(R.id.itemTitleView);
+ titleView.setText(selectedItem.getName());
+
+ TextView detailsView = bannerView.findViewById(R.id.itemAdditionalDetails);
+ detailsView.setVisibility(View.GONE);
+
+ new AlertDialog.Builder(activity)
+ .setCustomTitle(bannerView)
+ .setItems(commands, actions)
+ .create()
+ .show();
+
+ }
+
+ private void shareChannel (ChannelInfoItem selectedItem) {
+ shareUrl(selectedItem.getName(), selectedItem.getUrl());
+ }
+
+ @SuppressLint("CheckResult")
+ private void deleteChannel (ChannelInfoItem selectedItem) {
+ subscriptionService.subscriptionTable()
+ .getSubscription(selectedItem.getServiceId(), selectedItem.getUrl())
+ .toObservable()
+ .observeOn(Schedulers.io())
+ .subscribe(getDeleteObserver());
+
+ Toast.makeText(activity, getString(R.string.channel_unsubscribed), Toast.LENGTH_SHORT).show();
+ }
+
+
+
+ private Observer> getDeleteObserver(){
+ return new Observer>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ disposables.add(d);
+ }
+
+ @Override
+ public void onNext(List subscriptionEntities) {
+ subscriptionService.subscriptionTable().delete(subscriptionEntities);
+ }
+
+ @Override
+ public void onError(Throwable exception) {
+ SubscriptionFragment.this.onError(exception);
+ }
+
+ @Override
+ public void onComplete() { }
+ };
+ }
+
private void resetFragment() {
if (disposables != null) disposables.clear();
if (infoListAdapter != null) infoListAdapter.clearStreamItemList();
@@ -445,4 +572,22 @@ public class SubscriptionFragment extends BaseStateFragment 0) {
playQueue.setIndex(sizeBeforeAppend);
}
@@ -296,7 +322,6 @@ public abstract class BasePlayer implements
databaseUpdateReactor.clear();
progressUpdateReactor.set(null);
- simpleExoPlayer = null;
}
/*//////////////////////////////////////////////////////////////////////////
@@ -424,13 +449,15 @@ public abstract class BasePlayer implements
if (!isProgressLoopRunning()) startProgressLoop();
}
- public void onBuffering() {}
+ public void onBuffering() {
+ }
public void onPaused() {
if (isProgressLoopRunning()) stopProgressLoop();
}
- public void onPausedSeek() {}
+ public void onPausedSeek() {
+ }
public void onCompleted() {
if (DEBUG) Log.d(TAG, "onCompleted() called");
@@ -601,19 +628,19 @@ public abstract class BasePlayer implements
/**
* Processes the exceptions produced by {@link com.google.android.exoplayer2.ExoPlayer ExoPlayer}.
* There are multiple types of errors:
* If the renderer failed, treat the error as unrecoverable.
*
* @see #processSourceError(IOException)
* @see Player.EventListener#onPlayerError(ExoPlaybackException)
- * */
+ */
@Override
public void onPlayerError(ExoPlaybackException error) {
if (DEBUG) Log.d(TAG, "ExoPlayer - onPlayerError() called with: " +
@@ -899,8 +926,8 @@ public abstract class BasePlayer implements
if (DEBUG) Log.d(TAG, "onPlayPrevious() called");
/* If current playback has run for PLAY_PREV_ACTIVATION_LIMIT_MILLIS milliseconds,
- * restart current track. Also restart the track if the current track
- * is the first in a queue.*/
+ * restart current track. Also restart the track if the current track
+ * is the first in a queue.*/
if (simpleExoPlayer.getCurrentPosition() > PLAY_PREV_ACTIVATION_LIMIT_MILLIS ||
playQueue.getIndex() == 0) {
seekToDefault();
@@ -1009,8 +1036,8 @@ public abstract class BasePlayer implements
try {
metadata = (MediaSourceTag) simpleExoPlayer.getCurrentTag();
} catch (IndexOutOfBoundsException | ClassCastException error) {
- if(DEBUG) Log.d(TAG, "Could not update metadata: " + error.getMessage());
- if(DEBUG) error.printStackTrace();
+ if (DEBUG) Log.d(TAG, "Could not update metadata: " + error.getMessage());
+ if (DEBUG) error.printStackTrace();
return;
}
@@ -1074,7 +1101,9 @@ public abstract class BasePlayer implements
currentThumbnail;
}
- /** Checks if the current playback is a livestream AND is playing at or beyond the live edge */
+ /**
+ * Checks if the current playback is a livestream AND is playing at or beyond the live edge
+ */
@SuppressWarnings("BooleanMethodIsAlwaysInverted")
public boolean isLiveEdge() {
if (simpleExoPlayer == null || !isLive()) return false;
@@ -1098,13 +1127,14 @@ public abstract class BasePlayer implements
} catch (@NonNull IndexOutOfBoundsException ignored) {
// Why would this even happen =(
// But lets log it anyway. Save is save
- if(DEBUG) Log.d(TAG, "Could not update metadata: " + ignored.getMessage());
- if(DEBUG) ignored.printStackTrace();
+ if (DEBUG) Log.d(TAG, "Could not update metadata: " + ignored.getMessage());
+ if (DEBUG) ignored.printStackTrace();
return false;
}
}
public boolean isPlaying() {
+ if (simpleExoPlayer == null) return false;
final int state = simpleExoPlayer.getPlaybackState();
return (state == Player.STATE_READY || state == Player.STATE_BUFFERING)
&& simpleExoPlayer.getPlayWhenReady();
@@ -1112,7 +1142,9 @@ public abstract class BasePlayer implements
@Player.RepeatMode
public int getRepeatMode() {
- return simpleExoPlayer == null ? Player.REPEAT_MODE_OFF : simpleExoPlayer.getRepeatMode();
+ return simpleExoPlayer == null
+ ? Player.REPEAT_MODE_OFF
+ : simpleExoPlayer.getRepeatMode();
}
public void setRepeatMode(@Player.RepeatMode final int repeatMode) {
@@ -1178,4 +1210,8 @@ public abstract class BasePlayer implements
if (DEBUG) Log.d(TAG, "Setting recovery, queue: " + queuePos + ", pos: " + windowPos);
playQueue.setRecovery(queuePos, windowPos);
}
+
+ public boolean gotDestroyed() {
+ return simpleExoPlayer == null;
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
index 4e8398ff2..f4fea5165 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java
@@ -175,6 +175,10 @@ public final class MainVideoPlayer extends AppCompatActivity
setLandscape(lastOrientationWasLandscape);
}
+ final int lastResizeMode = defaultPreferences.getInt(
+ getString(R.string.last_resize_mode), AspectRatioFrameLayout.RESIZE_MODE_FIT);
+ playerImpl.setResizeMode(lastResizeMode);
+
// Upon going in or out of multiwindow mode, isInMultiWindow will always be false,
// since the first onResume needs to restore the player.
// Subsequent onResume calls while multiwindow mode remains the same and the player is
@@ -213,10 +217,9 @@ public final class MainVideoPlayer extends AppCompatActivity
if (playerImpl == null) return;
playerImpl.setRecovery();
- playerState = new PlayerState(playerImpl.getPlayQueue(), playerImpl.getRepeatMode(),
- playerImpl.getPlaybackSpeed(), playerImpl.getPlaybackPitch(),
- playerImpl.getPlaybackQuality(), playerImpl.getPlaybackSkipSilence(),
- playerImpl.isPlaying());
+ if(!playerImpl.gotDestroyed()) {
+ playerState = createPlayerState();
+ }
StateSaver.tryToSave(isChangingConfigurations(), null, outState, this);
}
@@ -231,6 +234,7 @@ public final class MainVideoPlayer extends AppCompatActivity
if (!isBackPressed) {
playerImpl.minimize();
}
+ playerState = createPlayerState();
playerImpl.destroy();
isInMultiWindow = false;
@@ -241,6 +245,13 @@ public final class MainVideoPlayer extends AppCompatActivity
// State Saving
//////////////////////////////////////////////////////////////////////////*/
+ private PlayerState createPlayerState() {
+ return new PlayerState(playerImpl.getPlayQueue(), playerImpl.getRepeatMode(),
+ playerImpl.getPlaybackSpeed(), playerImpl.getPlaybackPitch(),
+ playerImpl.getPlaybackQuality(), playerImpl.getPlaybackSkipSilence(),
+ playerImpl.isPlaying());
+ }
+
@Override
public String generateSuffix() {
return "." + UUID.randomUUID().toString() + ".player";
@@ -705,14 +716,27 @@ public final class MainVideoPlayer extends AppCompatActivity
@Override
protected int nextResizeMode(int currentResizeMode) {
+ final int newResizeMode;
switch (currentResizeMode) {
case AspectRatioFrameLayout.RESIZE_MODE_FIT:
- return AspectRatioFrameLayout.RESIZE_MODE_FILL;
+ newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FILL;
+ break;
case AspectRatioFrameLayout.RESIZE_MODE_FILL:
- return AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+ newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+ break;
default:
- return AspectRatioFrameLayout.RESIZE_MODE_FIT;
+ newResizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
+ break;
}
+
+ storeResizeMode(newResizeMode);
+ return newResizeMode;
+ }
+
+ private void storeResizeMode(@AspectRatioFrameLayout.ResizeMode int resizeMode) {
+ defaultPreferences.edit()
+ .putInt(getString(R.string.last_resize_mode), resizeMode)
+ .apply();
}
@Override
@@ -876,6 +900,11 @@ public final class MainVideoPlayer extends AppCompatActivity
public void onMove(int sourceIndex, int targetIndex) {
if (playQueue != null) playQueue.move(sourceIndex, targetIndex);
}
+
+ @Override
+ public void onSwiped(int index) {
+ if(index != -1) playQueue.remove(index);
+ }
};
}
@@ -989,12 +1018,14 @@ public final class MainVideoPlayer extends AppCompatActivity
private static final int MOVEMENT_THRESHOLD = 40;
- private final boolean isPlayerGestureEnabled = PlayerHelper.isPlayerGestureEnabled(getApplicationContext());
+ private final boolean isVolumeGestureEnabled = PlayerHelper.isVolumeGestureEnabled(getApplicationContext());
+ private final boolean isBrightnessGestureEnabled = PlayerHelper.isBrightnessGestureEnabled(getApplicationContext());
+
private final int maxVolume = playerImpl.getAudioReactor().getMaxVolume();
@Override
public boolean onScroll(MotionEvent initialEvent, MotionEvent movingEvent, float distanceX, float distanceY) {
- if (!isPlayerGestureEnabled) return false;
+ if (!isVolumeGestureEnabled && !isBrightnessGestureEnabled) return false;
//noinspection PointlessBooleanExpression
if (DEBUG && false) Log.d(TAG, "MainVideoPlayer.onScroll = " +
@@ -1010,7 +1041,11 @@ public final class MainVideoPlayer extends AppCompatActivity
isMoving = true;
- if (initialEvent.getX() > playerImpl.getRootView().getWidth() / 2) {
+ boolean acceptAnyArea = isVolumeGestureEnabled != isBrightnessGestureEnabled;
+ boolean acceptVolumeArea = acceptAnyArea || initialEvent.getX() > playerImpl.getRootView().getWidth() / 2;
+ boolean acceptBrightnessArea = acceptAnyArea || !acceptVolumeArea;
+
+ if (isVolumeGestureEnabled && acceptVolumeArea) {
playerImpl.getVolumeProgressBar().incrementProgressBy((int) distanceY);
float currentProgressPercent =
(float) playerImpl.getVolumeProgressBar().getProgress() / playerImpl.getMaxGestureLength();
@@ -1035,7 +1070,7 @@ public final class MainVideoPlayer extends AppCompatActivity
if (playerImpl.getBrightnessRelativeLayout().getVisibility() == View.VISIBLE) {
playerImpl.getBrightnessRelativeLayout().setVisibility(View.GONE);
}
- } else {
+ } else if (isBrightnessGestureEnabled && acceptBrightnessArea) {
playerImpl.getBrightnessProgressBar().incrementProgressBy((int) distanceY);
float currentProgressPercent =
(float) playerImpl.getBrightnessProgressBar().getProgress() / playerImpl.getMaxGestureLength();
diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
index a36a0576c..f5c731ed9 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java
@@ -68,7 +68,6 @@ import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.player.event.PlayerEventListener;
import org.schabi.newpipe.player.helper.LockManager;
import org.schabi.newpipe.player.helper.PlayerHelper;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
import org.schabi.newpipe.player.resolver.MediaSourceTag;
import org.schabi.newpipe.player.resolver.VideoPlaybackResolver;
import org.schabi.newpipe.util.ListHelper;
@@ -80,7 +79,6 @@ import java.util.List;
import static org.schabi.newpipe.player.BasePlayer.STATE_PLAYING;
import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_DURATION;
import static org.schabi.newpipe.player.VideoPlayer.DEFAULT_CONTROLS_HIDE_TIME;
-import static org.schabi.newpipe.player.helper.PlayerHelper.isUsingOldPlayer;
import static org.schabi.newpipe.util.AnimationUtils.animateView;
/**
@@ -554,27 +552,17 @@ public final class PopupVideoPlayer extends Service {
if (DEBUG) Log.d(TAG, "onFullScreenButtonClicked() called");
setRecovery();
- Intent intent;
- if (!isUsingOldPlayer(getApplicationContext())) {
- intent = NavigationHelper.getPlayerIntent(
- context,
- MainVideoPlayer.class,
- this.getPlayQueue(),
- this.getRepeatMode(),
- this.getPlaybackSpeed(),
- this.getPlaybackPitch(),
- this.getPlaybackSkipSilence(),
- this.getPlaybackQuality()
- );
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- } else {
- intent = new Intent(PopupVideoPlayer.this, PlayVideoActivity.class)
- .putExtra(PlayVideoActivity.VIDEO_TITLE, getVideoTitle())
- .putExtra(PlayVideoActivity.STREAM_URL, getSelectedVideoStream().getUrl())
- .putExtra(PlayVideoActivity.VIDEO_URL, getVideoUrl())
- .putExtra(PlayVideoActivity.START_POSITION, Math.round(getPlayer().getCurrentPosition() / 1000f));
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- }
+ final Intent intent = NavigationHelper.getPlayerIntent(
+ context,
+ MainVideoPlayer.class,
+ this.getPlayQueue(),
+ this.getRepeatMode(),
+ this.getPlaybackSpeed(),
+ this.getPlaybackPitch(),
+ this.getPlaybackSkipSilence(),
+ this.getPlaybackQuality()
+ );
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
closePopup();
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
index 94305e6c4..2ec4275fc 100644
--- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java
@@ -375,6 +375,11 @@ public abstract class ServicePlayerActivity extends AppCompatActivity
public void onMove(int sourceIndex, int targetIndex) {
if (player != null) player.getPlayQueue().move(sourceIndex, targetIndex);
}
+
+ @Override
+ public void onSwiped(int index) {
+ if (index != -1) player.getPlayQueue().remove(index);
+ }
};
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
index 8e7db0dae..d30d9b8be 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java
@@ -683,12 +683,17 @@ public abstract class VideoPlayer extends BasePlayer
if (getAspectRatioFrameLayout() != null) {
final int currentResizeMode = getAspectRatioFrameLayout().getResizeMode();
final int newResizeMode = nextResizeMode(currentResizeMode);
- getAspectRatioFrameLayout().setResizeMode(newResizeMode);
- getResizeView().setText(PlayerHelper.resizeTypeOf(context, newResizeMode));
+ setResizeMode(newResizeMode);
}
}
+ protected void setResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode) {
+ getAspectRatioFrameLayout().setResizeMode(resizeMode);
+ getResizeView().setText(PlayerHelper.resizeTypeOf(context, resizeMode));
+ }
+
protected abstract int nextResizeMode(@AspectRatioFrameLayout.ResizeMode final int resizeMode);
+
/*//////////////////////////////////////////////////////////////////////////
// SeekBar Listener
//////////////////////////////////////////////////////////////////////////*/
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index 05afe2859..e1960247e 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -19,11 +19,11 @@ import com.google.android.exoplayer2.util.MimeTypes;
import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.InfoItem;
-import org.schabi.newpipe.extractor.Subtitles;
+import org.schabi.newpipe.extractor.MediaFormat;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
-import org.schabi.newpipe.extractor.stream.SubtitlesFormat;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
@@ -45,7 +45,9 @@ import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MOD
import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
import static java.lang.annotation.RetentionPolicy.SOURCE;
-import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.*;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_BACKGROUND;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_NONE;
+import static org.schabi.newpipe.player.helper.PlayerHelper.MinimizeMode.MINIMIZE_ON_EXIT_MODE_POPUP;
public class PlayerHelper {
private PlayerHelper() {}
@@ -87,7 +89,7 @@ public class PlayerHelper {
return pitchFormatter.format(pitch);
}
- public static String mimeTypesOf(final SubtitlesFormat format) {
+ public static String subtitleMimeTypesOf(final MediaFormat format) {
switch (format) {
case VTT: return MimeTypes.TEXT_VTT;
case TTML: return MimeTypes.APPLICATION_TTML;
@@ -97,8 +99,8 @@ public class PlayerHelper {
@NonNull
public static String captionLanguageOf(@NonNull final Context context,
- @NonNull final Subtitles subtitles) {
- final String displayName = subtitles.getLocale().getDisplayName(subtitles.getLocale());
+ @NonNull final SubtitlesStream subtitles) {
+ final String displayName = subtitles.getDisplayLanguageName();
return displayName + (subtitles.isAutoGenerated() ? " (" + context.getString(R.string.caption_auto_generated)+ ")" : "");
}
@@ -145,7 +147,7 @@ public class PlayerHelper {
final StreamInfoItem nextVideo = info.getNextVideo();
if (nextVideo != null && !urls.contains(nextVideo.getUrl())) {
- return new SinglePlayQueue(nextVideo);
+ return getAutoQueuedSinglePlayQueue(nextVideo);
}
final List relatedItems = info.getRelatedStreams();
@@ -158,7 +160,7 @@ public class PlayerHelper {
}
}
Collections.shuffle(autoQueueItems);
- return autoQueueItems.isEmpty() ? null : new SinglePlayQueue(autoQueueItems.get(0));
+ return autoQueueItems.isEmpty() ? null : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));
}
////////////////////////////////////////////////////////////////////////////
@@ -169,12 +171,12 @@ public class PlayerHelper {
return isResumeAfterAudioFocusGain(context, false);
}
- public static boolean isPlayerGestureEnabled(@NonNull final Context context) {
- return isPlayerGestureEnabled(context, true);
+ public static boolean isVolumeGestureEnabled(@NonNull final Context context) {
+ return isVolumeGestureEnabled(context, true);
}
- public static boolean isUsingOldPlayer(@NonNull final Context context) {
- return isUsingOldPlayer(context, false);
+ public static boolean isBrightnessGestureEnabled(@NonNull final Context context) {
+ return isBrightnessGestureEnabled(context, true);
}
public static boolean isRememberingPopupDimensions(@NonNull final Context context) {
@@ -306,12 +308,12 @@ public class PlayerHelper {
return getPreferences(context).getBoolean(context.getString(R.string.resume_on_audio_focus_gain_key), b);
}
- private static boolean isPlayerGestureEnabled(@NonNull final Context context, final boolean b) {
- return getPreferences(context).getBoolean(context.getString(R.string.player_gesture_controls_key), b);
+ private static boolean isVolumeGestureEnabled(@NonNull final Context context, final boolean b) {
+ return getPreferences(context).getBoolean(context.getString(R.string.volume_gesture_control_key), b);
}
- private static boolean isUsingOldPlayer(@NonNull final Context context, final boolean b) {
- return getPreferences(context).getBoolean(context.getString(R.string.use_old_player_key), b);
+ private static boolean isBrightnessGestureEnabled(@NonNull final Context context, final boolean b) {
+ return getPreferences(context).getBoolean(context.getString(R.string.brightness_gesture_control_key), b);
}
private static boolean isRememberingPopupDimensions(@NonNull final Context context, final boolean b) {
@@ -350,4 +352,10 @@ public class PlayerHelper {
return getPreferences(context).getString(context.getString(R.string.minimize_on_exit_key),
key);
}
+
+ private static SinglePlayQueue getAutoQueuedSinglePlayQueue(StreamInfoItem streamInfoItem) {
+ SinglePlayQueue singlePlayQueue = new SinglePlayQueue(streamInfoItem);
+ singlePlayQueue.getItem().setAutoQueued(true);
+ return singlePlayQueue;
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/old/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/player/old/PlayVideoActivity.java
deleted file mode 100644
index 092f82aad..000000000
--- a/app/src/main/java/org/schabi/newpipe/player/old/PlayVideoActivity.java
+++ /dev/null
@@ -1,369 +0,0 @@
-package org.schabi.newpipe.player.old;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.Display;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.MediaController;
-import android.widget.ProgressBar;
-import android.widget.VideoView;
-
-import org.schabi.newpipe.R;
-
-/*
- * Copyright (C) Christian Schabesberger 2015
- * PlayVideoActivity.java is part of NewPipe.
- *
- * NewPipe is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * NewPipe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with NewPipe. If not, see .
- */
-
-public class PlayVideoActivity extends AppCompatActivity {
-
- //// TODO: 11.09.15 add "choose stream" menu
-
- private static final String TAG = PlayVideoActivity.class.toString();
- public static final String VIDEO_URL = "video_url";
- public static final String STREAM_URL = "stream_url";
- public static final String VIDEO_TITLE = "video_title";
- private static final String POSITION = "position";
- public static final String START_POSITION = "start_position";
-
- private static final long HIDING_DELAY = 3000;
-
- private String videoUrl = "";
-
- private ActionBar actionBar;
- private VideoView videoView;
- private int position;
- private MediaController mediaController;
- private ProgressBar progressBar;
- private View decorView;
- private boolean uiIsHidden;
- private static long lastUiShowTime;
- private boolean isLandscape = true;
- private boolean hasSoftKeys;
-
- private SharedPreferences prefs;
- private static final String PREF_IS_LANDSCAPE = "is_landscape";
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.activity_play_video);
- setVolumeControlStream(AudioManager.STREAM_MUSIC);
-
- //set background arrow style
- getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_arrow_back_white_24dp);
-
- isLandscape = checkIfLandscape();
- hasSoftKeys = checkIfHasSoftKeys();
-
- actionBar = getSupportActionBar();
- assert actionBar != null;
- actionBar.setDisplayHomeAsUpEnabled(true);
- Intent intent = getIntent();
- if(mediaController == null) {
- //prevents back button hiding media controller controls (after showing them)
- //instead of exiting video
- //see http://stackoverflow.com/questions/6051825
- //also solves https://github.com/theScrabi/NewPipe/issues/99
- mediaController = new MediaController(this) {
- @Override
- public boolean dispatchKeyEvent(KeyEvent event) {
- int keyCode = event.getKeyCode();
- final boolean uniqueDown = event.getRepeatCount() == 0
- && event.getAction() == KeyEvent.ACTION_DOWN;
- if (keyCode == KeyEvent.KEYCODE_BACK) {
- if (uniqueDown)
- {
- if (isShowing()) {
- finish();
- } else {
- hide();
- }
- }
- return true;
- }
- return super.dispatchKeyEvent(event);
- }
- };
- }
-
- position = intent.getIntExtra(START_POSITION, 0)*1000;//convert from seconds to milliseconds
-
- videoView = findViewById(R.id.video_view);
- progressBar = findViewById(R.id.play_video_progress_bar);
- try {
- videoView.setMediaController(mediaController);
- videoView.setVideoURI(Uri.parse(intent.getStringExtra(STREAM_URL)));
- } catch (Exception e) {
- e.printStackTrace();
- }
- videoView.requestFocus();
- videoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
- @Override
- public void onPrepared(MediaPlayer mp) {
- progressBar.setVisibility(View.GONE);
- videoView.seekTo(position);
- if (position <= 0) {
- videoView.start();
- showUi();
- } else {
- videoView.pause();
- }
- }
- });
- videoUrl = intent.getStringExtra(VIDEO_URL);
-
- Button button = findViewById(R.id.content_button);
- button.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if(uiIsHidden) {
- showUi();
- } else {
- hideUi();
- }
- }
- });
- decorView = getWindow().getDecorView();
- decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
- @Override
- public void onSystemUiVisibilityChange(int visibility) {
- if (visibility == View.VISIBLE && uiIsHidden) {
- showUi();
- }
- }
- });
-
- if (android.os.Build.VERSION.SDK_INT >= 17) {
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
- }
-
- prefs = getPreferences(Context.MODE_PRIVATE);
- if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
- toggleOrientation();
- }
- }
-
- @Override
- public boolean onCreatePanelMenu(int featured, Menu menu) {
- super.onCreatePanelMenu(featured, menu);
- MenuInflater inflater = getMenuInflater();
- inflater.inflate(R.menu.video_player, menu);
-
- return true;
- }
-
- @Override
- public void onPause() {
- super.onPause();
- videoView.pause();
- }
-
- @Override
- public void onResume() {
- super.onResume();
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- prefs = getPreferences(Context.MODE_PRIVATE);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- int id = item.getItemId();
- switch(id) {
- case android.R.id.home:
- finish();
- break;
- case R.id.menu_item_share:
- Intent intent = new Intent();
- intent.setAction(Intent.ACTION_SEND);
- intent.putExtra(Intent.EXTRA_TEXT, videoUrl);
- intent.setType("text/plain");
- startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
- break;
- case R.id.menu_item_screen_rotation:
- toggleOrientation();
- break;
- default:
- Log.e(TAG, "Error: MenuItem not known");
- return false;
- }
- return true;
- }
-
- @Override
- public void onConfigurationChanged(Configuration config) {
- super.onConfigurationChanged(config);
-
- if (config.orientation == Configuration.ORIENTATION_LANDSCAPE) {
- isLandscape = true;
- adjustMediaControlMetrics();
- } else if (config.orientation == Configuration.ORIENTATION_PORTRAIT){
- isLandscape = false;
- adjustMediaControlMetrics();
- }
- }
-
- @Override
- public void onSaveInstanceState(Bundle savedInstanceState) {
- super.onSaveInstanceState(savedInstanceState);
- //savedInstanceState.putInt(POSITION, videoView.getCurrentPosition());
- //videoView.pause();
- }
-
- @Override
- public void onRestoreInstanceState(Bundle savedInstanceState) {
- super.onRestoreInstanceState(savedInstanceState);
- position = savedInstanceState.getInt(POSITION);
- //videoView.seekTo(position);
- }
-
- private void showUi() {
- try {
- uiIsHidden = false;
- mediaController.show(100000);
- actionBar.show();
- adjustMediaControlMetrics();
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
- Handler handler = new Handler();
- handler.postDelayed(new Runnable() {
- @Override
- public void run() {
- if ((System.currentTimeMillis() - lastUiShowTime) >= HIDING_DELAY) {
- hideUi();
- }
- }
- }, HIDING_DELAY);
- lastUiShowTime = System.currentTimeMillis();
- }catch(Exception e) {
- e.printStackTrace();
- }
- }
-
- private void hideUi() {
- uiIsHidden = true;
- actionBar.hide();
- mediaController.hide();
- if (android.os.Build.VERSION.SDK_INT >= 17) {
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
- | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_FULLSCREEN
- | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
- }
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
- WindowManager.LayoutParams.FLAG_FULLSCREEN);
- }
-
- private void adjustMediaControlMetrics() {
- MediaController.LayoutParams mediaControllerLayout
- = new MediaController.LayoutParams(MediaController.LayoutParams.MATCH_PARENT,
- MediaController.LayoutParams.WRAP_CONTENT);
-
- if(!hasSoftKeys) {
- mediaControllerLayout.setMargins(20, 0, 20, 20);
- } else {
- int width = getNavigationBarWidth();
- int height = getNavigationBarHeight();
- mediaControllerLayout.setMargins(width + 20, 0, width + 20, height + 20);
- }
- mediaController.setLayoutParams(mediaControllerLayout);
- }
-
- private boolean checkIfHasSoftKeys(){
- return Build.VERSION.SDK_INT >= 17 ||
- getNavigationBarHeight() != 0 ||
- getNavigationBarWidth() != 0;
- }
-
- private int getNavigationBarHeight() {
- if(Build.VERSION.SDK_INT >= 17) {
- Display d = getWindowManager().getDefaultDisplay();
-
- DisplayMetrics realDisplayMetrics = new DisplayMetrics();
- d.getRealMetrics(realDisplayMetrics);
- DisplayMetrics displayMetrics = new DisplayMetrics();
- d.getMetrics(displayMetrics);
-
- int realHeight = realDisplayMetrics.heightPixels;
- int displayHeight = displayMetrics.heightPixels;
- return realHeight - displayHeight;
- } else {
- return 50;
- }
- }
-
- private int getNavigationBarWidth() {
- if(Build.VERSION.SDK_INT >= 17) {
- Display d = getWindowManager().getDefaultDisplay();
-
- DisplayMetrics realDisplayMetrics = new DisplayMetrics();
- d.getRealMetrics(realDisplayMetrics);
- DisplayMetrics displayMetrics = new DisplayMetrics();
- d.getMetrics(displayMetrics);
-
- int realWidth = realDisplayMetrics.widthPixels;
- int displayWidth = displayMetrics.widthPixels;
- return realWidth - displayWidth;
- } else {
- return 50;
- }
- }
-
- private boolean checkIfLandscape() {
- DisplayMetrics displayMetrics = new DisplayMetrics();
- getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
- return displayMetrics.heightPixels < displayMetrics.widthPixels;
- }
-
- private void toggleOrientation() {
- if(isLandscape) {
- isLandscape = false;
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
- } else {
- isLandscape = true;
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
- }
- SharedPreferences.Editor editor = prefs.edit();
- editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
- editor.apply();
- }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
index c9e07c96a..2a7c9f127 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java
@@ -233,6 +233,9 @@ public abstract class PlayQueue implements Serializable {
backup.addAll(itemList);
Collections.shuffle(itemList);
}
+ if (!streams.isEmpty() && streams.get(streams.size() - 1).isAutoQueued() && !itemList.get(0).isAutoQueued()) {
+ streams.remove(streams.size() - 1);
+ }
streams.addAll(itemList);
broadcast(new AppendEvent(itemList.size()));
@@ -314,7 +317,9 @@ public abstract class PlayQueue implements Serializable {
queueIndex.incrementAndGet();
}
- streams.add(target, streams.remove(source));
+ PlayQueueItem playQueueItem = streams.remove(source);
+ playQueueItem.setAutoQueued(false);
+ streams.add(target, playQueueItem);
broadcast(new MoveEvent(source, target));
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
index 8cbc3ed1c..bd0218454 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java
@@ -25,9 +25,10 @@ public class PlayQueueItem implements Serializable {
@NonNull final private String uploader;
@NonNull final private StreamType streamType;
+ private boolean isAutoQueued;
+
private long recoveryPosition;
private Throwable error;
-
PlayQueueItem(@NonNull final StreamInfo info) {
this(info.getName(), info.getUrl(), info.getServiceId(), info.getDuration(),
info.getThumbnailUrl(), info.getUploaderName(), info.getStreamType());
@@ -105,6 +106,14 @@ public class PlayQueueItem implements Serializable {
.doOnError(throwable -> error = throwable);
}
+ public boolean isAutoQueued() {
+ return isAutoQueued;
+ }
+
+ public void setAutoQueued(boolean autoQueued) {
+ isAutoQueued = autoQueued;
+ }
+
////////////////////////////////////////////////////////////////////////////
// Item States, keep external access out
////////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
index 6edeff670..26be83b98 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java
@@ -8,11 +8,13 @@ public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleC
private static final int MAXIMUM_INITIAL_DRAG_VELOCITY = 25;
public PlayQueueItemTouchCallback() {
- super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0);
+ super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.RIGHT);
}
public abstract void onMove(final int sourceIndex, final int targetIndex);
+ public abstract void onSwiped(int index);
+
@Override
public int interpolateOutOfBoundsScroll(RecyclerView recyclerView, int viewSize,
int viewSizeOutOfBounds, int totalSize,
@@ -44,9 +46,11 @@ public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleC
@Override
public boolean isItemViewSwipeEnabled() {
- return false;
+ return true;
}
@Override
- public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {}
+ public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {
+ onSwiped(viewHolder.getAdapterPosition());
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
index 8f91f4886..2dcf4a6ec 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
@@ -10,9 +10,10 @@ import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MergingMediaSource;
import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.Subtitles;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.player.helper.PlayerDataSource;
import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -93,8 +94,8 @@ public class VideoPlaybackResolver implements PlaybackResolver {
// Below are auxiliary media sources
// Create subtitle sources
- for (final Subtitles subtitle : info.getSubtitles()) {
- final String mimeType = PlayerHelper.mimeTypesOf(subtitle.getFileType());
+ for (final SubtitlesStream subtitle : info.getSubtitles()) {
+ final String mimeType = PlayerHelper.subtitleMimeTypesOf(subtitle.getFormat());
if (mimeType == null) continue;
final Format textFormat = Format.createTextSampleFormat(null, mimeType,
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index 5c54fa735..82604f7da 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -17,6 +17,8 @@ import com.nononsenseapps.filepicker.Utils;
import com.nostra13.universalimageloader.core.ImageLoader;
import org.schabi.newpipe.R;
+import org.schabi.newpipe.extractor.NewPipe;
+import org.schabi.newpipe.extractor.utils.Localization;
import org.schabi.newpipe.report.ErrorActivity;
import org.schabi.newpipe.report.UserAction;
import org.schabi.newpipe.util.FilePickerActivityHelper;
@@ -106,6 +108,20 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
startActivityForResult(i, REQUEST_EXPORT_PATH);
return true;
});
+
+ Preference setPreferredLanguage = findPreference(getString(R.string.content_language_key));
+ setPreferredLanguage.setOnPreferenceChangeListener((Preference p, Object newLanguage) -> {
+ Localization oldLocal = org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(getActivity());
+ NewPipe.setLocalization(new Localization(oldLocal.getCountry(), (String) newLanguage));
+ return true;
+ });
+
+ Preference setPreferredCountry = findPreference(getString(R.string.content_country_key));
+ setPreferredCountry.setOnPreferenceChangeListener((Preference p, Object newCountry) -> {
+ Localization oldLocal = org.schabi.newpipe.util.Localization.getPreferredExtractorLocal(getActivity());
+ NewPipe.setLocalization(new Localization((String) newCountry, oldLocal.getLanguage()));
+ return true;
+ });
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/streams/DataReader.java b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
new file mode 100644
index 000000000..d0e946eb7
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/DataReader.java
@@ -0,0 +1,103 @@
+package org.schabi.newpipe.streams;
+
+import java.io.EOFException;
+import java.io.IOException;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ * @author kapodamy
+ */
+public class DataReader {
+
+ public final static int SHORT_SIZE = 2;
+ public final static int LONG_SIZE = 8;
+ public final static int INTEGER_SIZE = 4;
+ public final static int FLOAT_SIZE = 4;
+
+ private long pos;
+ public final SharpStream stream;
+ private final boolean rewind;
+
+ public DataReader(SharpStream stream) {
+ this.rewind = stream.canRewind();
+ this.stream = stream;
+ this.pos = 0L;
+ }
+
+ public long position() {
+ return pos;
+ }
+
+ public final int readInt() throws IOException {
+ primitiveRead(INTEGER_SIZE);
+ return primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+ }
+
+ public final int read() throws IOException {
+ int value = stream.read();
+ if (value == -1) {
+ throw new EOFException();
+ }
+
+ pos++;
+ return value;
+ }
+
+ public final long skipBytes(long amount) throws IOException {
+ amount = stream.skip(amount);
+ pos += amount;
+ return amount;
+ }
+
+ public final long readLong() throws IOException {
+ primitiveRead(LONG_SIZE);
+ long high = primitive[0] << 24 | primitive[1] << 16 | primitive[2] << 8 | primitive[3];
+ long low = primitive[4] << 24 | primitive[5] << 16 | primitive[6] << 8 | primitive[7];
+ return high << 32 | low;
+ }
+
+ public final short readShort() throws IOException {
+ primitiveRead(SHORT_SIZE);
+ return (short) (primitive[0] << 8 | primitive[1]);
+ }
+
+ public final int read(byte[] buffer) throws IOException {
+ return read(buffer, 0, buffer.length);
+ }
+
+ public final int read(byte[] buffer, int offset, int count) throws IOException {
+ int res = stream.read(buffer, offset, count);
+ pos += res;
+
+ return res;
+ }
+
+ public final boolean available() {
+ return stream.available() > 0;
+ }
+
+ public void rewind() throws IOException {
+ stream.rewind();
+ pos = 0;
+ }
+
+ public boolean canRewind() {
+ return rewind;
+ }
+
+ private short[] primitive = new short[LONG_SIZE];
+
+ private void primitiveRead(int amount) throws IOException {
+ byte[] buffer = new byte[amount];
+ int read = stream.read(buffer, 0, amount);
+ pos += read;
+ if (read != amount) {
+ throw new EOFException("Truncated data, missing " + String.valueOf(amount - read) + " bytes");
+ }
+
+ for (int i = 0; i < buffer.length; i++) {
+ primitive[i] = (short) (buffer[i] & 0xFF);// the "byte" datatype is signed and is very annoying
+ }
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
new file mode 100644
index 000000000..271929d47
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashReader.java
@@ -0,0 +1,817 @@
+package org.schabi.newpipe.streams;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+
+import java.nio.ByteBuffer;
+
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ * @author kapodamy
+ */
+public class Mp4DashReader {
+
+ //
+ private static final int ATOM_MOOF = 0x6D6F6F66;
+ private static final int ATOM_MFHD = 0x6D666864;
+ private static final int ATOM_TRAF = 0x74726166;
+ private static final int ATOM_TFHD = 0x74666864;
+ private static final int ATOM_TFDT = 0x74666474;
+ private static final int ATOM_TRUN = 0x7472756E;
+ private static final int ATOM_MDIA = 0x6D646961;
+ private static final int ATOM_FTYP = 0x66747970;
+ private static final int ATOM_SIDX = 0x73696478;
+ private static final int ATOM_MOOV = 0x6D6F6F76;
+ private static final int ATOM_MDAT = 0x6D646174;
+ private static final int ATOM_MVHD = 0x6D766864;
+ private static final int ATOM_TRAK = 0x7472616B;
+ private static final int ATOM_MVEX = 0x6D766578;
+ private static final int ATOM_TREX = 0x74726578;
+ private static final int ATOM_TKHD = 0x746B6864;
+ private static final int ATOM_MFRA = 0x6D667261;
+ private static final int ATOM_TFRA = 0x74667261;
+ private static final int ATOM_MDHD = 0x6D646864;
+ private static final int BRAND_DASH = 0x64617368;
+ //
+
+ private final DataReader stream;
+
+ private Mp4Track[] tracks = null;
+
+ private Box box;
+ private Moof moof;
+
+ private boolean chunkZero = false;
+
+ private int selectedTrack = -1;
+
+ public enum TrackKind {
+ Audio, Video, Other
+ }
+
+ public Mp4DashReader(SharpStream source) {
+ this.stream = new DataReader(source);
+ }
+
+ public void parse() throws IOException, NoSuchElementException {
+ if (selectedTrack > -1) {
+ return;
+ }
+
+ box = readBox(ATOM_FTYP);
+ if (parse_ftyp() != BRAND_DASH) {
+ throw new NoSuchElementException("Main Brand is not dash");
+ }
+
+ Moov moov = null;
+ int i;
+
+ while (box.type != ATOM_MOOF) {
+ ensure(box);
+ box = readBox();
+
+ switch (box.type) {
+ case ATOM_MOOV:
+ moov = parse_moov(box);
+ break;
+ case ATOM_SIDX:
+ break;
+ case ATOM_MFRA:
+ break;
+ case ATOM_MDAT:
+ throw new IOException("Expected moof, found mdat");
+ }
+ }
+
+ if (moov == null) {
+ throw new IOException("The provided Mp4 doesn't have the 'moov' box");
+ }
+
+ tracks = new Mp4Track[moov.trak.length];
+
+ for (i = 0; i < tracks.length; i++) {
+ tracks[i] = new Mp4Track();
+ tracks[i].trak = moov.trak[i];
+
+ if (moov.mvex_trex != null) {
+ for (Trex mvex_trex : moov.mvex_trex) {
+ if (tracks[i].trak.tkhd.trackId == mvex_trex.trackId) {
+ tracks[i].trex = mvex_trex;
+ }
+ }
+ }
+
+ if (moov.trak[i].tkhd.bHeight == 0 && moov.trak[i].tkhd.bWidth == 0) {
+ tracks[i].kind = moov.trak[i].tkhd.bVolume == 0 ? TrackKind.Other : TrackKind.Audio;
+ } else {
+ tracks[i].kind = TrackKind.Video;
+ }
+ }
+ }
+
+ public Mp4Track selectTrack(int index) {
+ selectedTrack = index;
+ return tracks[index];
+ }
+
+ /**
+ * Count all fragments present. This operation requires a seekable stream
+ *
+ * @return list with a basic info
+ * @throws IOException if the source stream is not seekeable
+ */
+ public int getFragmentsCount() throws IOException {
+ if (selectedTrack < 0) {
+ throw new IllegalStateException("track no selected");
+ }
+ if (!stream.canRewind()) {
+ throw new IOException("The provided stream doesn't allow seek");
+ }
+
+ Box tmp;
+ int count = 0;
+ long orig_offset = stream.position();
+
+ if (box.type == ATOM_MOOF) {
+ tmp = box;
+ } else {
+ ensure(box);
+ tmp = readBox();
+ }
+
+ do {
+ if (tmp.type == ATOM_MOOF) {
+ ensure(readBox(ATOM_MFHD));
+ Box traf;
+ while ((traf = untilBox(tmp, ATOM_TRAF)) != null) {
+ Box tfhd = readBox(ATOM_TFHD);
+ if (parse_tfhd(tracks[selectedTrack].trak.tkhd.trackId) != null) {
+ count++;
+ break;
+ }
+ ensure(tfhd);
+ ensure(traf);
+ }
+ }
+ ensure(tmp);
+ } while (stream.available() && (tmp = readBox()) != null);
+
+ stream.rewind();
+ stream.skipBytes((int) orig_offset);
+
+ return count;
+ }
+
+ public Mp4Track[] getAvailableTracks() {
+ return tracks;
+ }
+
+ public Mp4TrackChunk getNextChunk() throws IOException {
+ Mp4Track track = tracks[selectedTrack];
+
+ while (stream.available()) {
+
+ if (chunkZero) {
+ ensure(box);
+ if (!stream.available()) {
+ break;
+ }
+ box = readBox();
+ } else {
+ chunkZero = true;
+ }
+
+ switch (box.type) {
+ case ATOM_MOOF:
+ if (moof != null) {
+ throw new IOException("moof found without mdat");
+ }
+
+ moof = parse_moof(box, track.trak.tkhd.trackId);
+
+ if (moof.traf != null) {
+
+ if (hasFlag(moof.traf.trun.bFlags, 0x0001)) {
+ moof.traf.trun.dataOffset -= box.size + 8;
+ if (moof.traf.trun.dataOffset < 0) {
+ throw new IOException("trun box has wrong data offset, points outside of concurrent mdat box");
+ }
+ }
+
+ if (moof.traf.trun.chunkSize < 1) {
+ if (hasFlag(moof.traf.tfhd.bFlags, 0x10)) {
+ moof.traf.trun.chunkSize = moof.traf.tfhd.defaultSampleSize * moof.traf.trun.entryCount;
+ } else {
+ moof.traf.trun.chunkSize = box.size - 8;
+ }
+ }
+ if (!hasFlag(moof.traf.trun.bFlags, 0x900) && moof.traf.trun.chunkDuration == 0) {
+ if (hasFlag(moof.traf.tfhd.bFlags, 0x20)) {
+ moof.traf.trun.chunkDuration = moof.traf.tfhd.defaultSampleDuration * moof.traf.trun.entryCount;
+ }
+ }
+ }
+ break;
+ case ATOM_MDAT:
+ if (moof == null) {
+ throw new IOException("mdat found without moof");
+ }
+
+ if (moof.traf == null) {
+ moof = null;
+ continue;// find another chunk
+ }
+
+ Mp4TrackChunk chunk = new Mp4TrackChunk();
+ chunk.moof = moof;
+ chunk.data = new TrackDataChunk(stream, moof.traf.trun.chunkSize);
+ moof = null;
+
+ stream.skipBytes(chunk.moof.traf.trun.dataOffset);
+ return chunk;
+ default:
+ }
+ }
+
+ return null;
+ }
+
+ //
+ private long readUint() throws IOException {
+ return stream.readInt() & 0xffffffffL;
+ }
+
+ public static boolean hasFlag(int flags, int mask) {
+ return (flags & mask) == mask;
+ }
+
+ private String boxName(Box ref) {
+ return boxName(ref.type);
+ }
+
+ private String boxName(int type) {
+ try {
+ return new String(ByteBuffer.allocate(4).putInt(type).array(), "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ return "0x" + Integer.toHexString(type);
+ }
+ }
+
+ private Box readBox() throws IOException {
+ Box b = new Box();
+ b.offset = stream.position();
+ b.size = stream.readInt();
+ b.type = stream.readInt();
+
+ return b;
+ }
+
+ private Box readBox(int expected) throws IOException {
+ Box b = readBox();
+ if (b.type != expected) {
+ throw new NoSuchElementException("expected " + boxName(expected) + " found " + boxName(b));
+ }
+ return b;
+ }
+
+ private void ensure(Box ref) throws IOException {
+ long skip = ref.offset + ref.size - stream.position();
+
+ if (skip == 0) {
+ return;
+ } else if (skip < 0) {
+ throw new EOFException(String.format(
+ "parser go beyond limits of the box. type=%s offset=%s size=%s position=%s",
+ boxName(ref), ref.offset, ref.size, stream.position()
+ ));
+ }
+
+ stream.skipBytes((int) skip);
+ }
+
+ private Box untilBox(Box ref, int... expected) throws IOException {
+ Box b;
+ while (stream.position() < (ref.offset + ref.size)) {
+ b = readBox();
+ for (int type : expected) {
+ if (b.type == type) {
+ return b;
+ }
+ }
+ ensure(b);
+ }
+
+ return null;
+ }
+
+ //
+
+ //
+
+ private Moof parse_moof(Box ref, int trackId) throws IOException {
+ Moof obj = new Moof();
+
+ Box b = readBox(ATOM_MFHD);
+ obj.mfhd_SequenceNumber = parse_mfhd();
+ ensure(b);
+
+ while ((b = untilBox(ref, ATOM_TRAF)) != null) {
+ obj.traf = parse_traf(b, trackId);
+ ensure(b);
+
+ if (obj.traf != null) {
+ return obj;
+ }
+ }
+
+ return obj;
+ }
+
+ private int parse_mfhd() throws IOException {
+ // version
+ // flags
+ stream.skipBytes(4);
+
+ return stream.readInt();
+ }
+
+ private Traf parse_traf(Box ref, int trackId) throws IOException {
+ Traf traf = new Traf();
+
+ Box b = readBox(ATOM_TFHD);
+ traf.tfhd = parse_tfhd(trackId);
+ ensure(b);
+
+ if (traf.tfhd == null) {
+ return null;
+ }
+
+ b = untilBox(ref, ATOM_TRUN, ATOM_TFDT);
+
+ if (b.type == ATOM_TFDT) {
+ traf.tfdt = parse_tfdt();
+ ensure(b);
+ b = readBox(ATOM_TRUN);
+ }
+
+ traf.trun = parse_trun();
+ ensure(b);
+
+ return traf;
+ }
+
+ private Tfhd parse_tfhd(int trackId) throws IOException {
+ Tfhd obj = new Tfhd();
+
+ obj.bFlags = stream.readInt();
+ obj.trackId = stream.readInt();
+
+ if (trackId != -1 && obj.trackId != trackId) {
+ return null;
+ }
+
+ if (hasFlag(obj.bFlags, 0x01)) {
+ stream.skipBytes(8);
+ }
+ if (hasFlag(obj.bFlags, 0x02)) {
+ stream.skipBytes(4);
+ }
+ if (hasFlag(obj.bFlags, 0x08)) {
+ obj.defaultSampleDuration = stream.readInt();
+ }
+ if (hasFlag(obj.bFlags, 0x10)) {
+ obj.defaultSampleSize = stream.readInt();
+ }
+ if (hasFlag(obj.bFlags, 0x20)) {
+ obj.defaultSampleFlags = stream.readInt();
+ }
+
+ return obj;
+ }
+
+ private long parse_tfdt() throws IOException {
+ int version = stream.read();
+ stream.skipBytes(3);// flags
+ return version == 0 ? readUint() : stream.readLong();
+ }
+
+ private Trun parse_trun() throws IOException {
+ Trun obj = new Trun();
+ obj.bFlags = stream.readInt();
+ obj.entryCount = stream.readInt();// unsigned int
+
+ obj.entries_rowSize = 0;
+ if (hasFlag(obj.bFlags, 0x0100)) {
+ obj.entries_rowSize += 4;
+ }
+ if (hasFlag(obj.bFlags, 0x0200)) {
+ obj.entries_rowSize += 4;
+ }
+ if (hasFlag(obj.bFlags, 0x0400)) {
+ obj.entries_rowSize += 4;
+ }
+ if (hasFlag(obj.bFlags, 0x0800)) {
+ obj.entries_rowSize += 4;
+ }
+ obj.bEntries = new byte[obj.entries_rowSize * obj.entryCount];
+
+ if (hasFlag(obj.bFlags, 0x0001)) {
+ obj.dataOffset = stream.readInt();
+ }
+ if (hasFlag(obj.bFlags, 0x0004)) {
+ obj.bFirstSampleFlags = stream.readInt();
+ }
+
+ stream.read(obj.bEntries);
+
+ for (int i = 0; i < obj.entryCount; i++) {
+ TrunEntry entry = obj.getEntry(i);
+ if (hasFlag(obj.bFlags, 0x0100)) {
+ obj.chunkDuration += entry.sampleDuration;
+ }
+ if (hasFlag(obj.bFlags, 0x0200)) {
+ obj.chunkSize += entry.sampleSize;
+ }
+ if (hasFlag(obj.bFlags, 0x0800)) {
+ if (!hasFlag(obj.bFlags, 0x0100)) {
+ obj.chunkDuration += entry.sampleCompositionTimeOffset;
+ }
+ }
+ }
+
+ return obj;
+ }
+
+ private int parse_ftyp() throws IOException {
+ int brand = stream.readInt();
+ stream.skipBytes(4);// minor version
+
+ return brand;
+ }
+
+ private Mvhd parse_mvhd() throws IOException {
+ int version = stream.read();
+ stream.skipBytes(3);// flags
+
+ // creation entries_time
+ // modification entries_time
+ stream.skipBytes(2 * (version == 0 ? 4 : 8));
+
+ Mvhd obj = new Mvhd();
+ obj.timeScale = readUint();
+
+ // chunkDuration
+ stream.skipBytes(version == 0 ? 4 : 8);
+
+ // rate
+ // volume
+ // reserved
+ // matrix array
+ // predefined
+ stream.skipBytes(76);
+
+ obj.nextTrackId = readUint();
+
+ return obj;
+ }
+
+ private Tkhd parse_tkhd() throws IOException {
+ int version = stream.read();
+
+ Tkhd obj = new Tkhd();
+
+ // flags
+ // creation entries_time
+ // modification entries_time
+ stream.skipBytes(3 + (2 * (version == 0 ? 4 : 8)));
+
+ obj.trackId = stream.readInt();
+
+ stream.skipBytes(4);// reserved
+
+ obj.duration = version == 0 ? readUint() : stream.readLong();
+
+ stream.skipBytes(2 * 4);// reserved
+
+ obj.bLayer = stream.readShort();
+ obj.bAlternateGroup = stream.readShort();
+ obj.bVolume = stream.readShort();
+
+ stream.skipBytes(2);// reserved
+
+ obj.matrix = new byte[9 * 4];
+ stream.read(obj.matrix);
+
+ obj.bWidth = stream.readInt();
+ obj.bHeight = stream.readInt();
+
+ return obj;
+ }
+
+ private Trak parse_trak(Box ref) throws IOException {
+ Trak trak = new Trak();
+
+ Box b = readBox(ATOM_TKHD);
+ trak.tkhd = parse_tkhd();
+ ensure(b);
+
+ b = untilBox(ref, ATOM_MDIA);
+ trak.mdia = new byte[b.size];
+
+ ByteBuffer buffer = ByteBuffer.wrap(trak.mdia);
+ buffer.putInt(b.size);
+ buffer.putInt(ATOM_MDIA);
+ stream.read(trak.mdia, 8, b.size - 8);
+
+ trak.mdia_mdhd_timeScale = parse_mdia(buffer);
+
+ return trak;
+ }
+
+ private int parse_mdia(ByteBuffer data) {
+ while (data.hasRemaining()) {
+ int end = data.position() + data.getInt();
+ if (data.getInt() == ATOM_MDHD) {
+ byte version = data.get();
+ data.position(data.position() + 3 + ((version == 0 ? 4 : 8) * 2));
+ return data.getInt();
+ }
+
+ data.position(end);
+ }
+
+ return 0;// this NEVER should happen
+ }
+
+ private Moov parse_moov(Box ref) throws IOException {
+ Box b = readBox(ATOM_MVHD);
+ Moov moov = new Moov();
+ moov.mvhd = parse_mvhd();
+ ensure(b);
+
+ ArrayList tmp = new ArrayList<>((int) moov.mvhd.nextTrackId);
+ while ((b = untilBox(ref, ATOM_TRAK, ATOM_MVEX)) != null) {
+
+ switch (b.type) {
+ case ATOM_TRAK:
+ tmp.add(parse_trak(b));
+ break;
+ case ATOM_MVEX:
+ moov.mvex_trex = parse_mvex(b, (int) moov.mvhd.nextTrackId);
+ break;
+ }
+
+ ensure(b);
+ }
+
+ moov.trak = tmp.toArray(new Trak[tmp.size()]);
+
+ return moov;
+ }
+
+ private Trex[] parse_mvex(Box ref, int possibleTrackCount) throws IOException {
+ ArrayList tmp = new ArrayList<>(possibleTrackCount);
+
+ Box b;
+ while ((b = untilBox(ref, ATOM_TREX)) != null) {
+ tmp.add(parse_trex());
+ ensure(b);
+ }
+
+ return tmp.toArray(new Trex[tmp.size()]);
+ }
+
+ private Trex parse_trex() throws IOException {
+ // version
+ // flags
+ stream.skipBytes(4);
+
+ Trex obj = new Trex();
+ obj.trackId = stream.readInt();
+ obj.defaultSampleDescriptionIndex = stream.readInt();
+ obj.defaultSampleDuration = stream.readInt();
+ obj.defaultSampleSize = stream.readInt();
+ obj.defaultSampleFlags = stream.readInt();
+
+ return obj;
+ }
+
+ private Tfra parse_tfra() throws IOException {
+ int version = stream.read();
+
+ stream.skipBytes(3);// flags
+
+ Tfra tfra = new Tfra();
+ tfra.trackId = stream.readInt();
+
+ stream.skipBytes(3);// reserved
+ int bFlags = stream.read();
+ int size_tts = ((bFlags >> 4) & 3) + ((bFlags >> 2) & 3) + (bFlags & 3);
+
+ tfra.entries_time = new int[stream.readInt()];
+
+ for (int i = 0; i < tfra.entries_time.length; i++) {
+ tfra.entries_time[i] = version == 0 ? stream.readInt() : (int) stream.readLong();
+ stream.skipBytes(size_tts + (version == 0 ? 4 : 8));
+ }
+
+ return tfra;
+ }
+
+ private Sidx parse_sidx() throws IOException {
+ int version = stream.read();
+
+ stream.skipBytes(3);// flags
+
+ Sidx obj = new Sidx();
+ obj.referenceId = stream.readInt();
+ obj.timescale = stream.readInt();
+
+ // earliest presentation entries_time
+ // first offset
+ // reserved
+ stream.skipBytes((2 * (version == 0 ? 4 : 8)) + 2);
+
+ obj.entries_subsegmentDuration = new int[stream.readShort()];
+
+ for (int i = 0; i < obj.entries_subsegmentDuration.length; i++) {
+ // reference type
+ // referenced size
+ stream.skipBytes(4);
+ obj.entries_subsegmentDuration[i] = stream.readInt();// unsigned int
+
+ // starts with SAP
+ // SAP type
+ // SAP delta entries_time
+ stream.skipBytes(4);
+ }
+
+ return obj;
+ }
+
+ private Tfra[] parse_mfra(Box ref, int trackCount) throws IOException {
+ ArrayList tmp = new ArrayList<>(trackCount);
+ long limit = ref.offset + ref.size;
+
+ while (stream.position() < limit) {
+ box = readBox();
+
+ if (box.type == ATOM_TFRA) {
+ tmp.add(parse_tfra());
+ }
+
+ ensure(box);
+ }
+
+ return tmp.toArray(new Tfra[tmp.size()]);
+ }
+
+ //
+
+ //
+ class Box {
+
+ int type;
+ long offset;
+ int size;
+ }
+
+ class Sidx {
+
+ int timescale;
+ int referenceId;
+ int[] entries_subsegmentDuration;
+ }
+
+ public class Moof {
+
+ int mfhd_SequenceNumber;
+ public Traf traf;
+ }
+
+ public class Traf {
+
+ public Tfhd tfhd;
+ long tfdt;
+ public Trun trun;
+ }
+
+ public class Tfhd {
+
+ int bFlags;
+ public int trackId;
+ int defaultSampleDuration;
+ int defaultSampleSize;
+ int defaultSampleFlags;
+ }
+
+ public class TrunEntry {
+
+ public int sampleDuration;
+ public int sampleSize;
+ public int sampleFlags;
+ public int sampleCompositionTimeOffset;
+ }
+
+ public class Trun {
+
+ public int chunkDuration;
+ public int chunkSize;
+
+ public int bFlags;
+ int bFirstSampleFlags;
+ int dataOffset;
+
+ public int entryCount;
+ byte[] bEntries;
+ int entries_rowSize;
+
+ public TrunEntry getEntry(int i) {
+ ByteBuffer buffer = ByteBuffer.wrap(bEntries, i * entries_rowSize, entries_rowSize);
+ TrunEntry entry = new TrunEntry();
+
+ if (hasFlag(bFlags, 0x0100)) {
+ entry.sampleDuration = buffer.getInt();
+ }
+ if (hasFlag(bFlags, 0x0200)) {
+ entry.sampleSize = buffer.getInt();
+ }
+ if (hasFlag(bFlags, 0x0400)) {
+ entry.sampleFlags = buffer.getInt();
+ }
+ if (hasFlag(bFlags, 0x0800)) {
+ entry.sampleCompositionTimeOffset = buffer.getInt();
+ }
+
+ return entry;
+ }
+ }
+
+ public class Tkhd {
+
+ int trackId;
+ long duration;
+ short bVolume;
+ int bWidth;
+ int bHeight;
+ byte[] matrix;
+ short bLayer;
+ short bAlternateGroup;
+ }
+
+ public class Trak {
+
+ public Tkhd tkhd;
+ public int mdia_mdhd_timeScale;
+
+ byte[] mdia;
+ }
+
+ class Mvhd {
+
+ long timeScale;
+ long nextTrackId;
+ }
+
+ class Moov {
+
+ Mvhd mvhd;
+ Trak[] trak;
+ Trex[] mvex_trex;
+ }
+
+ class Tfra {
+
+ int trackId;
+ int[] entries_time;
+ }
+
+ public class Trex {
+
+ private int trackId;
+ int defaultSampleDescriptionIndex;
+ int defaultSampleDuration;
+ int defaultSampleSize;
+ int defaultSampleFlags;
+ }
+
+ public class Mp4Track {
+
+ public TrackKind kind;
+ public Trak trak;
+ public Trex trex;
+ }
+
+ public class Mp4TrackChunk {
+
+ public InputStream data;
+ public Moof moof;
+ }
+//
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java
new file mode 100644
index 000000000..babb2e24c
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/Mp4DashWriter.java
@@ -0,0 +1,623 @@
+package org.schabi.newpipe.streams;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import org.schabi.newpipe.streams.Mp4DashReader.Mp4Track;
+import org.schabi.newpipe.streams.Mp4DashReader.Mp4TrackChunk;
+import org.schabi.newpipe.streams.Mp4DashReader.Trak;
+import org.schabi.newpipe.streams.Mp4DashReader.Trex;
+
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.schabi.newpipe.streams.Mp4DashReader.hasFlag;
+
+/**
+ *
+ * @author kapodamy
+ */
+public class Mp4DashWriter {
+
+ private final static byte DIMENSIONAL_FIVE = 5;
+ private final static byte DIMENSIONAL_TWO = 2;
+ private final static short DEFAULT_TIMESCALE = 1000;
+ private final static int BUFFER_SIZE = 8 * 1024;
+ private final static byte DEFAULT_TREX_SIZE = 32;
+ private final static byte[] TFRA_TTS_DEFAULT = new byte[]{0x01, 0x01, 0x01};
+ private final static int EPOCH_OFFSET = 2082844800;
+
+ private Mp4Track[] infoTracks;
+ private SharpStream[] sourceTracks;
+
+ private Mp4DashReader[] readers;
+ private final long time;
+
+ private boolean done = false;
+ private boolean parsed = false;
+
+ private long written = 0;
+ private ArrayList> chunkTimes;
+ private ArrayList moofOffsets;
+ private ArrayList fragSizes;
+
+ public Mp4DashWriter(SharpStream... source) {
+ sourceTracks = source;
+ readers = new Mp4DashReader[sourceTracks.length];
+ infoTracks = new Mp4Track[sourceTracks.length];
+ time = (System.currentTimeMillis() / 1000L) + EPOCH_OFFSET;
+ }
+
+ public Mp4Track[] getTracksFromSource(int sourceIndex) throws IllegalStateException {
+ if (!parsed) {
+ throw new IllegalStateException("All sources must be parsed first");
+ }
+
+ return readers[sourceIndex].getAvailableTracks();
+ }
+
+ public void parseSources() throws IOException, IllegalStateException {
+ if (done) {
+ throw new IllegalStateException("already done");
+ }
+ if (parsed) {
+ throw new IllegalStateException("already parsed");
+ }
+
+ try {
+ for (int i = 0; i < readers.length; i++) {
+ readers[i] = new Mp4DashReader(sourceTracks[i]);
+ readers[i].parse();
+ }
+
+ } finally {
+ parsed = true;
+ }
+ }
+
+ public void selectTracks(int... trackIndex) throws IOException {
+ if (done) {
+ throw new IOException("already done");
+ }
+ if (chunkTimes != null) {
+ throw new IOException("tracks already selected");
+ }
+
+ try {
+ chunkTimes = new ArrayList<>(readers.length);
+ moofOffsets = new ArrayList<>(32);
+ fragSizes = new ArrayList<>(32);
+
+ for (int i = 0; i < readers.length; i++) {
+ infoTracks[i] = readers[i].selectTrack(trackIndex[i]);
+
+ chunkTimes.add(new ArrayList(32));
+ }
+
+ } finally {
+ parsed = true;
+ }
+ }
+
+ public long getBytesWritten() {
+ return written;
+ }
+
+ public void build(SharpStream out) throws IOException, RuntimeException {
+ if (done) {
+ throw new RuntimeException("already done");
+ }
+ if (!out.canWrite()) {
+ throw new IOException("the provided output is not writable");
+ }
+
+ long sidxOffsets = -1;
+ int maxFrags = 0;
+
+ for (SharpStream stream : sourceTracks) {
+ if (!stream.canRewind()) {
+ sidxOffsets = -2;// sidx not available
+ }
+ }
+
+ try {
+ dump(make_ftyp(), out);
+ dump(make_moov(), out);
+
+ if (sidxOffsets == -1 && out.canRewind()) {
+ //
+ int reserved = 0;
+ for (Mp4DashReader reader : readers) {
+ int count = reader.getFragmentsCount();
+ if (count > maxFrags) {
+ maxFrags = count;
+ }
+ reserved += 12 + calcSidxBodySize(count);
+ }
+ if (maxFrags > 0xFFFF) {
+ sidxOffsets = -3;// TODO: to many fragments, needs a multi-sidx implementation
+ } else {
+ sidxOffsets = written;
+ dump(make_free(reserved), out);
+ }
+ //
+ }
+ ArrayList chunks = new ArrayList<>(readers.length);
+ chunks.add(null);
+
+ int read;
+ byte[] buffer = new byte[BUFFER_SIZE];
+ int sequenceNumber = 1;
+
+ while (true) {
+ chunks.clear();
+
+ for (int i = 0; i < readers.length; i++) {
+ Mp4TrackChunk chunk = readers[i].getNextChunk();
+ if (chunk == null || chunk.moof.traf.trun.chunkSize < 1) {
+ continue;
+ }
+ chunk.moof.traf.tfhd.trackId = i + 1;
+ chunks.add(chunk);
+
+ if (sequenceNumber == 1) {
+ if (chunk.moof.traf.trun.entryCount > 0 && hasFlag(chunk.moof.traf.trun.bFlags, 0x0800)) {
+ chunkTimes.get(i).add(chunk.moof.traf.trun.getEntry(0).sampleCompositionTimeOffset);
+ } else {
+ chunkTimes.get(i).add(0);
+ }
+ }
+
+ chunkTimes.get(i).add(chunk.moof.traf.trun.chunkDuration);
+ }
+
+ if (chunks.size() < 1) {
+ break;
+ }
+
+ long offset = written;
+ moofOffsets.add(offset);
+
+ dump(make_moof(sequenceNumber++, chunks, offset), out);
+ dump(make_mdat(chunks), out);
+
+ for (Mp4TrackChunk chunk : chunks) {
+ while ((read = chunk.data.read(buffer)) > 0) {
+ out.write(buffer, 0, read);
+ written += read;
+ }
+ }
+
+ fragSizes.add((int) (written - offset));
+ }
+
+ dump(make_mfra(), out);
+
+ if (sidxOffsets > 0 && moofOffsets.size() == maxFrags) {
+ long len = written;
+
+ out.rewind();
+ out.skip(sidxOffsets);
+
+ written = sidxOffsets;
+ sidxOffsets = moofOffsets.get(0);
+
+ for (int i = 0; i < readers.length; i++) {
+ dump(make_sidx(i, sidxOffsets - written), out);
+ }
+
+ written = len;
+ }
+ } finally {
+ done = true;
+ }
+ }
+
+ public boolean isDone() {
+ return done;
+ }
+
+ public boolean isParsed() {
+ return parsed;
+ }
+
+ public void close() {
+ done = true;
+ parsed = true;
+
+ for (SharpStream src : sourceTracks) {
+ src.dispose();
+ }
+
+ sourceTracks = null;
+ readers = null;
+ infoTracks = null;
+ moofOffsets = null;
+ chunkTimes = null;
+ }
+
+ //
+ private void dump(byte[][] buffer, SharpStream stream) throws IOException {
+ for (byte[] buff : buffer) {
+ stream.write(buff);
+ written += buff.length;
+ }
+ }
+
+ private byte[][] lengthFor(byte[][] buffer) {
+ int length = 0;
+ for (byte[] buff : buffer) {
+ length += buff.length;
+ }
+
+ ByteBuffer.wrap(buffer[0]).putInt(length);
+
+ return buffer;
+ }
+
+ private int calcSidxBodySize(int entryCount) {
+ return 4 + 4 + 8 + 8 + 4 + (entryCount * 12);
+ }
+ //
+
+ //
+ private byte[][] make_moof(int sequence, ArrayList chunks, long referenceOffset) {
+ int pos = 2;
+ TrunExtra[] extra = new TrunExtra[chunks.size()];
+
+ byte[][] buffer = new byte[pos + (extra.length * DIMENSIONAL_FIVE)][];
+ buffer[0] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x6D, 0x6F, 0x6F, 0x66,// info header
+ 0x00, 0x00, 0x00, 0x10, 0x6D, 0x66, 0x68, 0x64, 0x00, 0x00, 0x00, 0x00//mfhd
+ };
+ buffer[1] = new byte[4];
+ ByteBuffer.wrap(buffer[1]).putInt(sequence);
+
+ for (int i = 0; i < extra.length; i++) {
+ extra[i] = new TrunExtra();
+ for (byte[] buff : make_traf(chunks.get(i), extra[i], referenceOffset)) {
+ buffer[pos++] = buff;
+ }
+ }
+
+ lengthFor(buffer);
+
+ int offset = 8 + ByteBuffer.wrap(buffer[0]).getInt();
+
+ for (int i = 0; i < extra.length; i++) {
+ extra[i].byteBuffer.putInt(offset);
+ offset += chunks.get(i).moof.traf.trun.chunkSize;
+ }
+
+ return buffer;
+ }
+
+ private byte[][] make_traf(Mp4TrackChunk chunk, TrunExtra extra, long moofOffset) {
+ byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
+ buffer[0] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x66,
+ 0x00, 0x00, 0x00, 0x00, 0x74, 0x66, 0x68, 0x64
+ };
+
+ int flags = (chunk.moof.traf.tfhd.bFlags & 0x38) | 0x01;
+ byte tfhdBodySize = 8 + 8;
+ if (hasFlag(flags, 0x08)) {
+ tfhdBodySize += 4;
+ }
+ if (hasFlag(flags, 0x10)) {
+ tfhdBodySize += 4;
+ }
+ if (hasFlag(flags, 0x20)) {
+ tfhdBodySize += 4;
+ }
+ buffer[1] = new byte[tfhdBodySize];
+ ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+ set.position(4);
+ set.putInt(chunk.moof.traf.tfhd.trackId);
+ set.putLong(moofOffset);
+ if (hasFlag(flags, 0x08)) {
+ set.putInt(chunk.moof.traf.tfhd.defaultSampleDuration);
+ }
+ if (hasFlag(flags, 0x10)) {
+ set.putInt(chunk.moof.traf.tfhd.defaultSampleSize);
+ }
+ if (hasFlag(flags, 0x20)) {
+ set.putInt(chunk.moof.traf.tfhd.defaultSampleFlags);
+ }
+ set.putInt(0, flags);
+ ByteBuffer.wrap(buffer[0]).putInt(8, 8 + tfhdBodySize);
+
+ buffer[2] = new byte[]{
+ 0x00, 0x00, 0x00, 0x14,
+ 0x74, 0x66, 0x64, 0x74,
+ 0x01, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00
+ };
+
+ ByteBuffer.wrap(buffer[2]).putLong(12, chunk.moof.traf.tfdt);
+
+ buffer[3] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x75, 0x6E,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00
+ };
+
+ buffer[4] = chunk.moof.traf.trun.bEntries;
+
+ lengthFor(buffer);
+
+ set = ByteBuffer.wrap(buffer[3]);
+ set.putInt(buffer[3].length + buffer[4].length);
+ set.position(8);
+ set.putInt((chunk.moof.traf.trun.bFlags | 0x01) & 0x0F01);
+ set.putInt(chunk.moof.traf.trun.entryCount);
+ extra.byteBuffer = set;
+
+ return buffer;
+ }
+
+ private byte[][] make_mdat(ArrayList chunks) {
+ byte[][] buffer = new byte[][]{
+ {
+ 0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x61, 0x74
+ }
+ };
+
+ int length = 0;
+
+ for (Mp4TrackChunk chunk : chunks) {
+ length += chunk.moof.traf.trun.chunkSize;
+ }
+
+ ByteBuffer.wrap(buffer[0]).putInt(length + 8);
+
+ return buffer;
+ }
+
+ private byte[][] make_ftyp() {
+ return new byte[][]{
+ {
+ 0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70, 0x64, 0x61, 0x73, 0x68, 0x00, 0x00, 0x00, 0x00,
+ 0x6D, 0x70, 0x34, 0x31, 0x69, 0x73, 0x6F, 0x6D, 0x69, 0x73, 0x6F, 0x36, 0x69, 0x73, 0x6F, 0x32
+ }
+ };
+ }
+
+ private byte[][] make_mvhd() {
+ byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
+
+ buffer[0] = new byte[]{
+ 0x00, 0x00, 0x00, 0x78, 0x6D, 0x76, 0x68, 0x64, 0x01, 0x00, 0x00, 0x00
+ };
+ buffer[1] = new byte[28];
+ buffer[2] = new byte[]{
+ 0x00, 0x01, 0x00, 0x00, 0x01, 0x00,// default volume and rate
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,// reserved values
+ // default matrix
+ 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x40, 0x00, 0x00, 0x00
+ };
+ buffer[3] = new byte[24];// predefined
+ buffer[4] = ByteBuffer.allocate(4).putInt(infoTracks.length + 1).array();
+
+ long longestTrack = 0;
+
+ for (Mp4Track track : infoTracks) {
+ long tmp = (long) ((track.trak.tkhd.duration / (double) track.trak.mdia_mdhd_timeScale) * DEFAULT_TIMESCALE);
+ if (tmp > longestTrack) {
+ longestTrack = tmp;
+ }
+ }
+
+ ByteBuffer.wrap(buffer[1])
+ .putLong(time)
+ .putLong(time)
+ .putInt(DEFAULT_TIMESCALE)
+ .putLong(longestTrack);
+
+ return buffer;
+ }
+
+ private byte[][] make_trak(int trackId, Trak trak) throws RuntimeException {
+ if (trak.tkhd.matrix.length != 36) {
+ throw new RuntimeException("bad track matrix length (expected 36)");
+ }
+
+ byte[][] buffer = new byte[DIMENSIONAL_FIVE][];
+
+ buffer[0] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x74, 0x72, 0x61, 0x6B,// trak header
+ 0x00, 0x00, 0x00, 0x68, 0x74, 0x6B, 0x68, 0x64, 0x01, 0x00, 0x00, 0x03 // tkhd header
+ };
+ buffer[1] = new byte[48];
+ buffer[2] = trak.tkhd.matrix;
+ buffer[3] = new byte[8];
+ buffer[4] = trak.mdia;
+
+ ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+ set.putLong(time);
+ set.putLong(time);
+ set.putInt(trackId);
+ set.position(24);
+ set.putLong(trak.tkhd.duration);
+ set.position(40);
+ set.putShort(trak.tkhd.bLayer);
+ set.putShort(trak.tkhd.bAlternateGroup);
+ set.putShort(trak.tkhd.bVolume);
+
+ ByteBuffer.wrap(buffer[3])
+ .putInt(trak.tkhd.bWidth)
+ .putInt(trak.tkhd.bHeight);
+
+ return lengthFor(buffer);
+ }
+
+ private byte[][] make_moov() throws RuntimeException {
+ int pos = 1;
+ byte[][] buffer = new byte[2 + (DIMENSIONAL_TWO * infoTracks.length) + (DIMENSIONAL_FIVE * infoTracks.length) + DIMENSIONAL_FIVE + 1][];
+
+ buffer[0] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x6D, 0x6F, 0x6F, 0x76
+ };
+
+ for (byte[] buff : make_mvhd()) {
+ buffer[pos++] = buff;
+ }
+
+ for (int i = 0; i < infoTracks.length; i++) {
+ for (byte[] buff : make_trak(i + 1, infoTracks[i].trak)) {
+ buffer[pos++] = buff;
+ }
+ }
+
+ buffer[pos] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x6D, 0x76, 0x65, 0x78
+ };
+
+ ByteBuffer.wrap(buffer[pos++]).putInt((infoTracks.length * DEFAULT_TREX_SIZE) + 8);
+
+ for (int i = 0; i < infoTracks.length; i++) {
+ for (byte[] buff : make_trex(i + 1, infoTracks[i].trex)) {
+ buffer[pos++] = buff;
+ }
+ }
+
+ // default udta
+ buffer[pos] = new byte[]{
+ 0x00, 0x00, 0x00, 0x5C, 0x75, 0x64, 0x74, 0x61, 0x00, 0x00, 0x00, 0x54, 0x6D, 0x65, 0x74, 0x61,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x68, 0x64, 0x6C, 0x72, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x6D, 0x64, 0x69, 0x72, 0x61, 0x70, 0x70, 0x6C, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x69, 0x6C, 0x73, 0x74, 0x00, 0x00, 0x00,
+ 0x1F, (byte) 0xA9, 0x63, 0x6D, 0x74, 0x00, 0x00, 0x00, 0x17, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00,
+ 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x4E, 0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
+ };
+
+ return lengthFor(buffer);
+ }
+
+ private byte[][] make_trex(int trackId, Trex trex) {
+ byte[][] buffer = new byte[][]{
+ {
+ 0x00, 0x00, 0x00, 0x20, 0x74, 0x72, 0x65, 0x78, 0x00, 0x00, 0x00, 0x00
+ },
+ new byte[20]
+ };
+
+ ByteBuffer.wrap(buffer[1])
+ .putInt(trackId)
+ .putInt(trex.defaultSampleDescriptionIndex)
+ .putInt(trex.defaultSampleDuration)
+ .putInt(trex.defaultSampleSize)
+ .putInt(trex.defaultSampleFlags);
+
+ return buffer;
+ }
+
+ private byte[][] make_tfra(int trackId, List times, List moofOffsets) {
+ int entryCount = times.size() - 1;
+ byte[][] buffer = new byte[DIMENSIONAL_TWO][];
+ buffer[0] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x74, 0x66, 0x72, 0x61, 0x01, 0x00, 0x00, 0x00
+ };
+ buffer[1] = new byte[12 + ((16 + TFRA_TTS_DEFAULT.length) * entryCount)];
+
+ ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+ set.putInt(trackId);
+ set.position(8);
+ set.putInt(entryCount);
+
+ long decodeTime = 0;
+
+ for (int i = 0; i < entryCount; i++) {
+ decodeTime += times.get(i);
+ set.putLong(decodeTime);
+ set.putLong(moofOffsets.get(i));
+ set.put(TFRA_TTS_DEFAULT);// default values: traf number/trun number/sample number
+ }
+
+ return lengthFor(buffer);
+ }
+
+ private byte[][] make_mfra() {
+ byte[][] buffer = new byte[2 + (DIMENSIONAL_TWO * infoTracks.length)][];
+ buffer[0] = new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x6D, 0x66, 0x72, 0x61
+ };
+ int pos = 1;
+
+ for (int i = 0; i < infoTracks.length; i++) {
+ for (byte[] buff : make_tfra(i + 1, chunkTimes.get(i), moofOffsets)) {
+ buffer[pos++] = buff;
+ }
+ }
+
+ buffer[pos] = new byte[]{// mfro
+ 0x00, 0x00, 0x00, 0x10, 0x6D, 0x66, 0x72, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+
+ lengthFor(buffer);
+
+ ByteBuffer set = ByteBuffer.wrap(buffer[pos]);
+ set.position(12);
+ set.put(buffer[0], 0, 4);
+
+ return buffer;
+
+ }
+
+ private byte[][] make_sidx(int internalTrackId, long firstOffset) {
+ List times = chunkTimes.get(internalTrackId);
+ int count = times.size() - 1;// the first item is ignored (composition time)
+
+ if (count > 65535) {
+ throw new OutOfMemoryError("to many fragments. sidx limit is 65535, found " + String.valueOf(count));
+ }
+
+ byte[][] buffer = new byte[][]{
+ new byte[]{
+ 0x00, 0x00, 0x00, 0x00, 0x73, 0x69, 0x64, 0x78, 0x01, 0x00, 0x00, 0x00
+ },
+ new byte[calcSidxBodySize(count)]
+ };
+
+ lengthFor(buffer);
+
+ ByteBuffer set = ByteBuffer.wrap(buffer[1]);
+ set.putInt(internalTrackId + 1);
+ set.putInt(infoTracks[internalTrackId].trak.mdia_mdhd_timeScale);
+ set.putLong(0);
+ set.putLong(firstOffset - ByteBuffer.wrap(buffer[0]).getInt());
+ set.putInt(0xFFFF & count);// unsigned
+
+ int i = 0;
+ while (i < count) {
+ set.putInt(fragSizes.get(i) & 0x7fffffff);// default reference type is 0
+ set.putInt(times.get(i + 1));
+ set.putInt(0x90000000);// default SAP settings
+ i++;
+ }
+
+ return buffer;
+ }
+
+ private byte[][] make_free(int totalSize) {
+ return lengthFor(new byte[][]{
+ new byte[]{0x00, 0x00, 0x00, 0x00, 0x66, 0x72, 0x65, 0x65},
+ new byte[totalSize - 8]// this is waste of RAM
+ });
+
+ }
+
+//
+
+ class TrunExtra {
+
+ ByteBuffer byteBuffer;
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java b/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java
new file mode 100644
index 000000000..26aaf49a5
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/SubtitleConverter.java
@@ -0,0 +1,370 @@
+package org.schabi.newpipe.streams;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.text.ParseException;
+import java.util.Locale;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathExpressionException;
+
+/**
+ * @author kapodamy
+ */
+public class SubtitleConverter {
+ private static final String NEW_LINE = "\r\n";
+
+ public void dumpTTML(SharpStream in, final SharpStream out, final boolean ignoreEmptyFrames, final boolean detectYoutubeDuplicateLines
+ ) throws IOException, ParseException, SAXException, ParserConfigurationException, XPathExpressionException {
+
+ final FrameWriter callback = new FrameWriter() {
+ int frameIndex = 0;
+ final Charset charset = Charset.forName("utf-8");
+
+ @Override
+ public void yield(SubtitleFrame frame) throws IOException {
+ if (ignoreEmptyFrames && frame.isEmptyText()) {
+ return;
+ }
+ out.write(String.valueOf(frameIndex++).getBytes(charset));
+ out.write(NEW_LINE.getBytes(charset));
+ out.write(getTime(frame.start, true).getBytes(charset));
+ out.write(" --> ".getBytes(charset));
+ out.write(getTime(frame.end, true).getBytes(charset));
+ out.write(NEW_LINE.getBytes(charset));
+ out.write(frame.text.getBytes(charset));
+ out.write(NEW_LINE.getBytes(charset));
+ out.write(NEW_LINE.getBytes(charset));
+ }
+ };
+
+ read_xml_based(in, callback, detectYoutubeDuplicateLines,
+ "tt", "xmlns", "http://www.w3.org/ns/ttml",
+ new String[]{"timedtext", "head", "wp"},
+ new String[]{"body", "div", "p"},
+ "begin", "end", true
+ );
+ }
+
+ private void read_xml_based(SharpStream source, FrameWriter callback, boolean detectYoutubeDuplicateLines,
+ String root, String formatAttr, String formatVersion, String[] cuePath, String[] framePath,
+ String timeAttr, String durationAttr, boolean hasTimestamp
+ ) throws IOException, ParseException, SAXException, ParserConfigurationException, XPathExpressionException {
+ /*
+ * XML based subtitles parser with BASIC support
+ * multiple CUE is not supported
+ * styling is not supported
+ * tag timestamps (in auto-generated subtitles) are not supported, maybe in the future
+ * also TimestampTagOption enum is not applicable
+ * Language parsing is not supported
+ */
+
+ byte[] buffer = new byte[source.available()];
+ source.read(buffer);
+
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setNamespaceAware(true);
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ Document xml = builder.parse(new ByteArrayInputStream(buffer));
+
+ String attr;
+
+ // get the format version or namespace
+ Element node = xml.getDocumentElement();
+
+ if (node == null) {
+ throw new ParseException("Can't get the format version. ¿wrong namespace?", -1);
+ } else if (!node.getNodeName().equals(root)) {
+ throw new ParseException("Invalid root", -1);
+ }
+
+ if (formatAttr.equals("xmlns")) {
+ if (!node.getNamespaceURI().equals(formatVersion)) {
+ throw new UnsupportedOperationException("Expected xml namespace: " + formatVersion);
+ }
+ } else {
+ attr = node.getAttributeNS(formatVersion, formatAttr);
+ if (attr == null) {
+ throw new ParseException("Can't get the format attribute", -1);
+ }
+ if (!attr.equals(formatVersion)) {
+ throw new ParseException("Invalid format version : " + attr, -1);
+ }
+ }
+
+ NodeList node_list;
+
+ int line_break = 0;// Maximum characters per line if present (valid for TranScript v3)
+
+ if (!hasTimestamp) {
+ node_list = selectNodes(xml, cuePath, formatVersion);
+
+ if (node_list != null) {
+ // if the subtitle has multiple CUEs, use the highest value
+ for (int i = 0; i < node_list.getLength(); i++) {
+ try {
+ int tmp = Integer.parseInt(((Element) node_list.item(i)).getAttributeNS(formatVersion, "ah"));
+ if (tmp > line_break) {
+ line_break = tmp;
+ }
+ } catch (Exception err) {
+ }
+ }
+ }
+ }
+
+ // parse every frame
+ node_list = selectNodes(xml, framePath, formatVersion);
+
+ if (node_list == null) {
+ return;// no frames detected
+ }
+
+ int fs_ff = -1;// first timestamp of first frame
+ boolean limit_lines = false;
+
+ for (int i = 0; i < node_list.getLength(); i++) {
+ Element elem = (Element) node_list.item(i);
+ SubtitleFrame obj = new SubtitleFrame();
+ obj.text = elem.getTextContent();
+
+ attr = elem.getAttribute(timeAttr);// ¡this cant be null!
+ obj.start = hasTimestamp ? parseTimestamp(attr) : Integer.parseInt(attr);
+
+ attr = elem.getAttribute(durationAttr);
+ if (obj.text == null || attr == null) {
+ continue;// normally is a blank line (on auto-generated subtitles) ignore
+ }
+
+ if (hasTimestamp) {
+ obj.end = parseTimestamp(attr);
+
+ if (detectYoutubeDuplicateLines) {
+ if (limit_lines) {
+ int swap = obj.end;
+ obj.end = fs_ff;
+ fs_ff = swap;
+ } else {
+ if (fs_ff < 0) {
+ fs_ff = obj.end;
+ } else {
+ if (fs_ff < obj.start) {
+ limit_lines = true;// the subtitles has duplicated lines
+ } else {
+ detectYoutubeDuplicateLines = false;
+ }
+ }
+ }
+ }
+ } else {
+ obj.end = obj.start + Integer.parseInt(attr);
+ }
+
+ if (/*node.getAttribute("w").equals("1") &&*/line_break > 1 && obj.text.length() > line_break) {
+
+ // implement auto line breaking (once)
+ StringBuilder text = new StringBuilder(obj.text);
+ obj.text = null;
+
+ switch (text.charAt(line_break)) {
+ case ' ':
+ case '\t':
+ putBreakAt(line_break, text);
+ break;
+ default:// find the word start position
+ for (int j = line_break - 1; j > 0; j--) {
+ switch (text.charAt(j)) {
+ case ' ':
+ case '\t':
+ putBreakAt(j, text);
+ j = -1;
+ break;
+ case '\r':
+ case '\n':
+ j = -1;// long word, just ignore
+ break;
+ }
+ }
+ break;
+ }
+
+ obj.text = text.toString();// set the processed text
+ }
+
+ callback.yield(obj);
+ }
+ }
+
+ private static NodeList selectNodes(Document xml, String[] path, String namespaceUri) throws XPathExpressionException {
+ Element ref = xml.getDocumentElement();
+
+ for (int i = 0; i < path.length - 1; i++) {
+ NodeList nodes = ref.getChildNodes();
+ if (nodes.getLength() < 1) {
+ return null;
+ }
+
+ Element elem;
+ for (int j = 0; j < nodes.getLength(); j++) {
+ if (nodes.item(j).getNodeType() == Node.ELEMENT_NODE) {
+ elem = (Element) nodes.item(j);
+ if (elem.getNodeName().equals(path[i]) && elem.getNamespaceURI().equals(namespaceUri)) {
+ ref = elem;
+ break;
+ }
+ }
+ }
+ }
+
+ return ref.getElementsByTagNameNS(namespaceUri, path[path.length - 1]);
+ }
+
+ private static int parseTimestamp(String multiImpl) throws NumberFormatException, ParseException {
+ if (multiImpl.length() < 1) {
+ return 0;
+ } else if (multiImpl.length() == 1) {
+ return Integer.parseInt(multiImpl) * 1000;// ¡this must be a number in seconds!
+ }
+
+ // detect wallclock-time
+ if (multiImpl.startsWith("wallclock(")) {
+ throw new UnsupportedOperationException("Parsing wallclock timestamp is not implemented");
+ }
+
+ // detect offset-time
+ if (multiImpl.indexOf(':') < 0) {
+ int multiplier = 1000;
+ char metric = multiImpl.charAt(multiImpl.length() - 1);
+ switch (metric) {
+ case 'h':
+ multiplier *= 3600000;
+ break;
+ case 'm':
+ multiplier *= 60000;
+ break;
+ case 's':
+ if (multiImpl.charAt(multiImpl.length() - 2) == 'm') {
+ multiplier = 1;// ms
+ }
+ break;
+ default:
+ if (!Character.isDigit(metric)) {
+ throw new NumberFormatException("Invalid metric suffix found on : " + multiImpl);
+ }
+ metric = '\0';
+ break;
+ }
+ try {
+ String offset_time = multiImpl;
+
+ if (multiplier == 1) {
+ offset_time = offset_time.substring(0, offset_time.length() - 2);
+ } else if (metric != '\0') {
+ offset_time = offset_time.substring(0, offset_time.length() - 1);
+ }
+
+ double time_metric_based = Double.parseDouble(offset_time);
+ if (Math.abs(time_metric_based) <= Double.MAX_VALUE) {
+ return (int) (time_metric_based * multiplier);
+ }
+ } catch (Exception err) {
+ throw new UnsupportedOperationException("Invalid or not implemented timestamp on: " + multiImpl);
+ }
+ }
+
+ // detect clock-time
+ int time = 0;
+ String[] units = multiImpl.split(":");
+
+ if (units.length < 3) {
+ throw new ParseException("Invalid clock-time timestamp", -1);
+ }
+
+ time += Integer.parseInt(units[0]) * 3600000;// hours
+ time += Integer.parseInt(units[1]) * 60000;//minutes
+ time += Float.parseFloat(units[2]) * 1000f;// seconds and milliseconds (if present)
+
+ // frames and sub-frames are ignored (not implemented)
+ // time += units[3] * fps;
+ return time;
+ }
+
+ private static void putBreakAt(int idx, StringBuilder str) {
+ // this should be optimized at compile time
+
+ if (NEW_LINE.length() > 1) {
+ str.delete(idx, idx + 1);// remove after replace
+ str.insert(idx, NEW_LINE);
+ } else {
+ str.setCharAt(idx, NEW_LINE.charAt(0));
+ }
+ }
+
+ private static String getTime(int time, boolean comma) {
+ // cast every value to integer to avoid auto-round in ToString("00").
+ StringBuilder str = new StringBuilder(12);
+ str.append(numberToString(time / 1000 / 3600, 2));// hours
+ str.append(':');
+ str.append(numberToString(time / 1000 / 60 % 60, 2));// minutes
+ str.append(':');
+ str.append(numberToString(time / 1000 % 60, 2));// seconds
+ str.append(comma ? ',' : '.');
+ str.append(numberToString(time % 1000, 3));// miliseconds
+
+ return str.toString();
+ }
+
+ private static String numberToString(int nro, int pad) {
+ return String.format(Locale.ENGLISH, "%0".concat(String.valueOf(pad)).concat("d"), nro);
+ }
+
+
+ /******************
+ * helper classes *
+ ******************/
+
+ private interface FrameWriter {
+
+ void yield(SubtitleFrame frame) throws IOException;
+ }
+
+ private static class SubtitleFrame {
+ //Java no support unsigned int
+
+ public int end;
+ public int start;
+ public String text = "";
+
+ private boolean isEmptyText() {
+ if (text == null) {
+ return true;
+ }
+
+ for (int i = 0; i < text.length(); i++) {
+ switch (text.charAt(i)) {
+ case ' ':
+ case '\t':
+ case '\r':
+ case '\n':
+ break;
+ default:
+ return false;
+ }
+ }
+
+ return true;
+ }
+ }
+
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java b/app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java
new file mode 100644
index 000000000..86eb5ff4f
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/TrackDataChunk.java
@@ -0,0 +1,65 @@
+package org.schabi.newpipe.streams;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public class TrackDataChunk extends InputStream {
+
+ private final DataReader base;
+ private int size;
+
+ public TrackDataChunk(DataReader base, int size) {
+ this.base = base;
+ this.size = size;
+ }
+
+ @Override
+ public int read() throws IOException {
+ if (size < 1) {
+ return -1;
+ }
+
+ int res = base.read();
+
+ if (res >= 0) {
+ size--;
+ }
+
+ return res;
+ }
+
+ @Override
+ public int read(byte[] buffer) throws IOException {
+ return read(buffer, 0, buffer.length);
+ }
+
+ @Override
+ public int read(byte[] buffer, int offset, int count) throws IOException {
+ count = Math.min(size, count);
+ int read = base.read(buffer, offset, count);
+ size -= count;
+ return read;
+ }
+
+ @Override
+ public long skip(long amount) throws IOException {
+ long res = base.skipBytes(Math.min(amount, size));
+ size -= res;
+ return res;
+ }
+
+ @Override
+ public int available() {
+ return size;
+ }
+
+ @Override
+ public void close() {
+ size = 0;
+ }
+
+ @Override
+ public boolean markSupported() {
+ return false;
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java b/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
new file mode 100644
index 000000000..f61ef14c5
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMReader.java
@@ -0,0 +1,507 @@
+package org.schabi.newpipe.streams;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ *
+ * @author kapodamy
+ */
+public class WebMReader {
+
+ //
+ private final static int ID_EMBL = 0x0A45DFA3;
+ private final static int ID_EMBLReadVersion = 0x02F7;
+ private final static int ID_EMBLDocType = 0x0282;
+ private final static int ID_EMBLDocTypeReadVersion = 0x0285;
+
+ private final static int ID_Segment = 0x08538067;
+
+ private final static int ID_Info = 0x0549A966;
+ private final static int ID_TimecodeScale = 0x0AD7B1;
+ private final static int ID_Duration = 0x489;
+
+ private final static int ID_Tracks = 0x0654AE6B;
+ private final static int ID_TrackEntry = 0x2E;
+ private final static int ID_TrackNumber = 0x57;
+ private final static int ID_TrackType = 0x03;
+ private final static int ID_CodecID = 0x06;
+ private final static int ID_CodecPrivate = 0x23A2;
+ private final static int ID_Video = 0x60;
+ private final static int ID_Audio = 0x61;
+ private final static int ID_DefaultDuration = 0x3E383;
+ private final static int ID_FlagLacing = 0x1C;
+
+ private final static int ID_Cluster = 0x0F43B675;
+ private final static int ID_Timecode = 0x67;
+ private final static int ID_SimpleBlock = 0x23;
+//
+
+ public enum TrackKind {
+ Audio/*2*/, Video/*1*/, Other
+ }
+
+ private DataReader stream;
+ private Segment segment;
+ private WebMTrack[] tracks;
+ private int selectedTrack;
+ private boolean done;
+ private boolean firstSegment;
+
+ public WebMReader(SharpStream source) {
+ this.stream = new DataReader(source);
+ }
+
+ public void parse() throws IOException {
+ Element elem = readElement(ID_EMBL);
+ if (!readEbml(elem, 1, 2)) {
+ throw new UnsupportedOperationException("Unsupported EBML data (WebM)");
+ }
+ ensure(elem);
+
+ elem = untilElement(null, ID_Segment);
+ if (elem == null) {
+ throw new IOException("Fragment element not found");
+ }
+ segment = readSegment(elem, 0, true);
+ tracks = segment.tracks;
+ selectedTrack = -1;
+ done = false;
+ firstSegment = true;
+ }
+
+ public WebMTrack[] getAvailableTracks() {
+ return tracks;
+ }
+
+ public WebMTrack selectTrack(int index) {
+ selectedTrack = index;
+ return tracks[index];
+ }
+
+ public Segment getNextSegment() throws IOException {
+ if (done) {
+ return null;
+ }
+
+ if (firstSegment && segment != null) {
+ firstSegment = false;
+ return segment;
+ }
+
+ ensure(segment.ref);
+
+ Element elem = untilElement(null, ID_Segment);
+ if (elem == null) {
+ done = true;
+ return null;
+ }
+ segment = readSegment(elem, 0, false);
+
+ return segment;
+ }
+
+ //
+ private long readNumber(Element parent) throws IOException {
+ int length = (int) parent.contentSize;
+ long value = 0;
+ while (length-- > 0) {
+ int read = stream.read();
+ if (read == -1) {
+ throw new EOFException();
+ }
+ value = (value << 8) | read;
+ }
+ return value;
+ }
+
+ private String readString(Element parent) throws IOException {
+ return new String(readBlob(parent), "utf-8");
+ }
+
+ private byte[] readBlob(Element parent) throws IOException {
+ long length = parent.contentSize;
+ byte[] buffer = new byte[(int) length];
+ int read = stream.read(buffer);
+ if (read < length) {
+ throw new EOFException();
+ }
+ return buffer;
+ }
+
+ private long readEncodedNumber() throws IOException {
+ int value = stream.read();
+
+ if (value > 0) {
+ byte size = 1;
+ int mask = 0x80;
+
+ while (size < 9) {
+ if ((value & mask) == mask) {
+ mask = 0xFF;
+ mask >>= size;
+
+ long number = value & mask;
+
+ for (int i = 1; i < size; i++) {
+ value = stream.read();
+ number <<= 8;
+ number |= value;
+ }
+
+ return number;
+ }
+
+ mask >>= 1;
+ size++;
+ }
+ }
+
+ throw new IOException("Invalid encoded length");
+ }
+
+ private Element readElement() throws IOException {
+ Element elem = new Element();
+ elem.offset = stream.position();
+ elem.type = (int) readEncodedNumber();
+ elem.contentSize = readEncodedNumber();
+ elem.size = elem.contentSize + stream.position() - elem.offset;
+
+ return elem;
+ }
+
+ private Element readElement(int expected) throws IOException {
+ Element elem = readElement();
+ if (expected != 0 && elem.type != expected) {
+ throw new NoSuchElementException("expected " + elementID(expected) + " found " + elementID(elem.type));
+ }
+
+ return elem;
+ }
+
+ private Element untilElement(Element ref, int... expected) throws IOException {
+ Element elem;
+ while (ref == null ? stream.available() : (stream.position() < (ref.offset + ref.size))) {
+ elem = readElement();
+ for (int type : expected) {
+ if (elem.type == type) {
+ return elem;
+ }
+ }
+ ensure(elem);
+ }
+
+ return null;
+ }
+
+ private String elementID(long type) {
+ return "0x".concat(Long.toHexString(type));
+ }
+
+ private void ensure(Element ref) throws IOException {
+ long skip = (ref.offset + ref.size) - stream.position();
+
+ if (skip == 0) {
+ return;
+ } else if (skip < 0) {
+ throw new EOFException(String.format(
+ "parser go beyond limits of the Element. type=%s offset=%s size=%s position=%s",
+ elementID(ref.type), ref.offset, ref.size, stream.position()
+ ));
+ }
+
+ stream.skipBytes(skip);
+ }
+//
+
+ //
+ private boolean readEbml(Element ref, int minReadVersion, int minDocTypeVersion) throws IOException {
+ Element elem = untilElement(ref, ID_EMBLReadVersion);
+ if (elem == null) {
+ return false;
+ }
+ if (readNumber(elem) > minReadVersion) {
+ return false;
+ }
+
+ elem = untilElement(ref, ID_EMBLDocType);
+ if (elem == null) {
+ return false;
+ }
+ if (!readString(elem).equals("webm")) {
+ return false;
+ }
+ elem = untilElement(ref, ID_EMBLDocTypeReadVersion);
+
+ return elem != null && readNumber(elem) <= minDocTypeVersion;
+ }
+
+ private Info readInfo(Element ref) throws IOException {
+ Element elem;
+ Info info = new Info();
+
+ while ((elem = untilElement(ref, ID_TimecodeScale, ID_Duration)) != null) {
+ switch (elem.type) {
+ case ID_TimecodeScale:
+ info.timecodeScale = readNumber(elem);
+ break;
+ case ID_Duration:
+ info.duration = readNumber(elem);
+ break;
+ }
+ ensure(elem);
+ }
+
+ if (info.timecodeScale == 0) {
+ throw new NoSuchElementException("Element Timecode not found");
+ }
+
+ return info;
+ }
+
+ private Segment readSegment(Element ref, int trackLacingExpected, boolean metadataExpected) throws IOException {
+ Segment obj = new Segment(ref);
+ Element elem;
+ while ((elem = untilElement(ref, ID_Info, ID_Tracks, ID_Cluster)) != null) {
+ if (elem.type == ID_Cluster) {
+ obj.currentCluster = elem;
+ break;
+ }
+ switch (elem.type) {
+ case ID_Info:
+ obj.info = readInfo(elem);
+ break;
+ case ID_Tracks:
+ obj.tracks = readTracks(elem, trackLacingExpected);
+ break;
+ }
+ ensure(elem);
+ }
+
+ if (metadataExpected && (obj.info == null || obj.tracks == null)) {
+ throw new RuntimeException("Cluster element found without Info and/or Tracks element at position " + String.valueOf(ref.offset));
+ }
+
+ return obj;
+ }
+
+ private WebMTrack[] readTracks(Element ref, int lacingExpected) throws IOException {
+ ArrayList trackEntries = new ArrayList<>(2);
+ Element elem_trackEntry;
+
+ while ((elem_trackEntry = untilElement(ref, ID_TrackEntry)) != null) {
+ WebMTrack entry = new WebMTrack();
+ boolean drop = false;
+ Element elem;
+ while ((elem = untilElement(elem_trackEntry,
+ ID_TrackNumber, ID_TrackType, ID_CodecID, ID_CodecPrivate, ID_FlagLacing, ID_DefaultDuration, ID_Audio, ID_Video
+ )) != null) {
+ switch (elem.type) {
+ case ID_TrackNumber:
+ entry.trackNumber = readNumber(elem);
+ break;
+ case ID_TrackType:
+ entry.trackType = (int)readNumber(elem);
+ break;
+ case ID_CodecID:
+ entry.codecId = readString(elem);
+ break;
+ case ID_CodecPrivate:
+ entry.codecPrivate = readBlob(elem);
+ break;
+ case ID_Audio:
+ case ID_Video:
+ entry.bMetadata = readBlob(elem);
+ break;
+ case ID_DefaultDuration:
+ entry.defaultDuration = readNumber(elem);
+ break;
+ case ID_FlagLacing:
+ drop = readNumber(elem) != lacingExpected;
+ break;
+ default:
+ System.out.println();
+ break;
+ }
+ ensure(elem);
+ }
+ if (!drop) {
+ trackEntries.add(entry);
+ }
+ ensure(elem_trackEntry);
+ }
+
+ WebMTrack[] entries = new WebMTrack[trackEntries.size()];
+ trackEntries.toArray(entries);
+
+ for (WebMTrack entry : entries) {
+ switch (entry.trackType) {
+ case 1:
+ entry.kind = TrackKind.Video;
+ break;
+ case 2:
+ entry.kind = TrackKind.Audio;
+ break;
+ default:
+ entry.kind = TrackKind.Other;
+ break;
+ }
+ }
+
+ return entries;
+ }
+
+ private SimpleBlock readSimpleBlock(Element ref) throws IOException {
+ SimpleBlock obj = new SimpleBlock(ref);
+ obj.dataSize = stream.position();
+ obj.trackNumber = readEncodedNumber();
+ obj.relativeTimeCode = stream.readShort();
+ obj.flags = (byte) stream.read();
+ obj.dataSize = (ref.offset + ref.size) - stream.position();
+
+ if (obj.dataSize < 0) {
+ throw new IOException(String.format("Unexpected SimpleBlock element size, missing %s bytes", -obj.dataSize));
+ }
+ return obj;
+ }
+
+ private Cluster readCluster(Element ref) throws IOException {
+ Cluster obj = new Cluster(ref);
+
+ Element elem = untilElement(ref, ID_Timecode);
+ if (elem == null) {
+ throw new NoSuchElementException("Cluster at " + String.valueOf(ref.offset) + " without Timecode element");
+ }
+ obj.timecode = readNumber(elem);
+
+ return obj;
+ }
+//
+
+ //
+ class Element {
+
+ int type;
+ long offset;
+ long contentSize;
+ long size;
+ }
+
+ public class Info {
+
+ public long timecodeScale;
+ public long duration;
+ }
+
+ public class WebMTrack {
+
+ public long trackNumber;
+ protected int trackType;
+ public String codecId;
+ public byte[] codecPrivate;
+ public byte[] bMetadata;
+ public TrackKind kind;
+ public long defaultDuration;
+ }
+
+ public class Segment {
+
+ Segment(Element ref) {
+ this.ref = ref;
+ this.firstClusterInSegment = true;
+ }
+
+ public Info info;
+ WebMTrack[] tracks;
+ private Element currentCluster;
+ private final Element ref;
+ boolean firstClusterInSegment;
+
+ public Cluster getNextCluster() throws IOException {
+ if (done) {
+ return null;
+ }
+ if (firstClusterInSegment && segment.currentCluster != null) {
+ firstClusterInSegment = false;
+ return readCluster(segment.currentCluster);
+ }
+ ensure(segment.currentCluster);
+
+ Element elem = untilElement(segment.ref, ID_Cluster);
+ if (elem == null) {
+ return null;
+ }
+
+ segment.currentCluster = elem;
+
+ return readCluster(segment.currentCluster);
+ }
+ }
+
+ public class SimpleBlock {
+
+ public TrackDataChunk data;
+
+ SimpleBlock(Element ref) {
+ this.ref = ref;
+ }
+
+ public long trackNumber;
+ public short relativeTimeCode;
+ public byte flags;
+ public long dataSize;
+ private final Element ref;
+
+ public boolean isKeyframe() {
+ return (flags & 0x80) == 0x80;
+ }
+ }
+
+ public class Cluster {
+
+ Element ref;
+ SimpleBlock currentSimpleBlock = null;
+ public long timecode;
+
+ Cluster(Element ref) {
+ this.ref = ref;
+ }
+
+ boolean check() {
+ return stream.position() >= (ref.offset + ref.size);
+ }
+
+ public SimpleBlock getNextSimpleBlock() throws IOException {
+ if (check()) {
+ return null;
+ }
+ if (currentSimpleBlock != null) {
+ ensure(currentSimpleBlock.ref);
+ }
+
+ while (!check()) {
+ Element elem = untilElement(ref, ID_SimpleBlock);
+ if (elem == null) {
+ return null;
+ }
+
+ currentSimpleBlock = readSimpleBlock(elem);
+ if (currentSimpleBlock.trackNumber == tracks[selectedTrack].trackNumber) {
+ currentSimpleBlock.data = new TrackDataChunk(stream, (int) currentSimpleBlock.dataSize);
+ return currentSimpleBlock;
+ }
+
+ ensure(elem);
+ }
+
+ return null;
+ }
+
+ }
+//
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
new file mode 100644
index 000000000..ea038c607
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java
@@ -0,0 +1,728 @@
+package org.schabi.newpipe.streams;
+
+import org.schabi.newpipe.streams.WebMReader.Cluster;
+import org.schabi.newpipe.streams.WebMReader.Segment;
+import org.schabi.newpipe.streams.WebMReader.SimpleBlock;
+import org.schabi.newpipe.streams.WebMReader.WebMTrack;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+/**
+ *
+ * @author kapodamy
+ */
+public class WebMWriter {
+
+ private final static int BUFFER_SIZE = 8 * 1024;
+ private final static int DEFAULT_TIMECODE_SCALE = 1000000;
+ private final static int INTERV = 100;// 100ms on 1000000us timecode scale
+ private final static int DEFAULT_CUES_EACH_MS = 5000;// 100ms on 1000000us timecode scale
+
+ private WebMReader.WebMTrack[] infoTracks;
+ private SharpStream[] sourceTracks;
+
+ private WebMReader[] readers;
+
+ private boolean done = false;
+ private boolean parsed = false;
+
+ private long written = 0;
+
+ private Segment[] readersSegment;
+ private Cluster[] readersCluter;
+
+ private int[] predefinedDurations;
+
+ private byte[] outBuffer;
+
+ public WebMWriter(SharpStream... source) {
+ sourceTracks = source;
+ readers = new WebMReader[sourceTracks.length];
+ infoTracks = new WebMTrack[sourceTracks.length];
+ outBuffer = new byte[BUFFER_SIZE];
+ }
+
+ public WebMTrack[] getTracksFromSource(int sourceIndex) throws IllegalStateException {
+ if (done) {
+ throw new IllegalStateException("already done");
+ }
+ if (!parsed) {
+ throw new IllegalStateException("All sources must be parsed first");
+ }
+
+ return readers[sourceIndex].getAvailableTracks();
+ }
+
+ public void parseSources() throws IOException, IllegalStateException {
+ if (done) {
+ throw new IllegalStateException("already done");
+ }
+ if (parsed) {
+ throw new IllegalStateException("already parsed");
+ }
+
+ try {
+ for (int i = 0; i < readers.length; i++) {
+ readers[i] = new WebMReader(sourceTracks[i]);
+ readers[i].parse();
+ }
+
+ } finally {
+ parsed = true;
+ }
+ }
+
+ public void selectTracks(int... trackIndex) throws IOException {
+ try {
+ readersSegment = new Segment[readers.length];
+ readersCluter = new Cluster[readers.length];
+ predefinedDurations = new int[readers.length];
+
+ for (int i = 0; i < readers.length; i++) {
+ infoTracks[i] = readers[i].selectTrack(trackIndex[i]);
+ predefinedDurations[i] = -1;
+ readersSegment[i] = readers[i].getNextSegment();
+ }
+ } finally {
+ parsed = true;
+ }
+ }
+
+ public long getBytesWritten() {
+ return written;
+ }
+
+ public boolean isDone() {
+ return done;
+ }
+
+ public boolean isParsed() {
+ return parsed;
+ }
+
+ public void close() {
+ done = true;
+ parsed = true;
+
+ for (SharpStream src : sourceTracks) {
+ src.dispose();
+ }
+
+ sourceTracks = null;
+ readers = null;
+ infoTracks = null;
+ readersSegment = null;
+ readersCluter = null;
+ outBuffer = null;
+ }
+
+ public void build(SharpStream out) throws IOException, RuntimeException {
+ if (!out.canRewind()) {
+ throw new IOException("The output stream must be allow seek");
+ }
+
+ makeEBML(out);
+
+ long offsetSegmentSizeSet = written + 5;
+ long offsetInfoDurationSet = written + 94;
+ long offsetClusterSet = written + 58;
+ long offsetCuesSet = written + 75;
+
+ ArrayList listBuffer = new ArrayList<>(4);
+
+ /* segment */
+ listBuffer.add(new byte[]{
+ 0x18, 0x53, (byte) 0x80, 0x67, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00// segment content size
+ });
+
+ long baseSegmentOffset = written + listBuffer.get(0).length;
+
+ /* seek head */
+ listBuffer.add(new byte[]{
+ 0x11, 0x4d, (byte) 0x9b, 0x74, (byte) 0xbe,
+ 0x4d, (byte) 0xbb, (byte) 0x8b,
+ 0x53, (byte) 0xab, (byte) 0x84, 0x15, 0x49, (byte) 0xa9, 0x66, 0x53,
+ (byte) 0xac, (byte) 0x81, /*info offset*/ 0x43,
+ 0x4d, (byte) 0xbb, (byte) 0x8b, 0x53, (byte) 0xab,
+ (byte) 0x84, 0x16, 0x54, (byte) 0xae, 0x6b, 0x53, (byte) 0xac, (byte) 0x81,
+ /*tracks offset*/ 0x6a,
+ 0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1f,
+ 0x43, (byte) 0xb6, 0x75, 0x53, (byte) 0xac, (byte) 0x84, /*cluster offset [2]*/ 0x00, 0x00, 0x00, 0x00,
+ 0x4d, (byte) 0xbb, (byte) 0x8e, 0x53, (byte) 0xab, (byte) 0x84, 0x1c, 0x53,
+ (byte) 0xbb, 0x6b, 0x53, (byte) 0xac, (byte) 0x84, /*cues offset [7]*/ 0x00, 0x00, 0x00, 0x00
+ });
+
+ /* info */
+ listBuffer.add(new byte[]{
+ 0x15, 0x49, (byte) 0xa9, 0x66, (byte) 0xa2, 0x2a, (byte) 0xd7, (byte) 0xb1
+ });
+ listBuffer.add(encode(DEFAULT_TIMECODE_SCALE, true));// this value MUST NOT exceed 4 bytes
+ listBuffer.add(new byte[]{0x44, (byte) 0x89, (byte) 0x84,
+ 0x00, 0x00, 0x00, 0x00,// info.duration
+
+ /* MuxingApp */
+ 0x4d, (byte) 0x80, (byte) 0x87, 0x4E,
+ 0x65, 0x77, 0x50, 0x69, 0x70, 0x65, // "NewPipe" binary string
+
+ /* WritingApp */
+ 0x57, 0x41, (byte) 0x87, 0x4E,
+ 0x65, 0x77, 0x50, 0x69, 0x70, 0x65// "NewPipe" binary string
+ });
+
+ /* tracks */
+ listBuffer.addAll(makeTracks());
+
+ for (byte[] buff : listBuffer) {
+ dump(buff, out);
+ }
+
+ // reserve space for Cues element, but is a waste of space (actually is 64 KiB)
+ // TODO: better Cue maker
+ long cueReservedOffset = written;
+ dump(new byte[]{(byte) 0xec, 0x20, (byte) 0xff, (byte) 0xfb}, out);
+ int reserved = (1024 * 63) - 4;
+ while (reserved > 0) {
+ int write = Math.min(reserved, outBuffer.length);
+ out.write(outBuffer, 0, write);
+ reserved -= write;
+ written += write;
+ }
+
+ // Select a track for the cue
+ int cuesForTrackId = selectTrackForCue();
+ long nextCueTime = infoTracks[cuesForTrackId].trackType == 1 ? -1 : 0;
+ ArrayList keyFrames = new ArrayList<>(32);
+
+ //ArrayList chunks = new ArrayList<>(readers.length);
+ ArrayList clusterOffsets = new ArrayList<>(32);
+ ArrayList clusterSizes = new ArrayList<>(32);
+
+ long duration = 0;
+ int durationFromTrackId = 0;
+
+ byte[] bTimecode = makeTimecode(0);
+
+ int firstClusterOffset = (int) written;
+ long currentClusterOffset = makeCluster(out, bTimecode, 0, clusterOffsets, clusterSizes);
+
+ long baseTimecode = 0;
+ long limitTimecode = -1;
+ int limitTimecodeByTrackId = cuesForTrackId;
+
+ int blockWritten = Integer.MAX_VALUE;
+
+ int newClusterByTrackId = -1;
+
+ while (blockWritten > 0) {
+ blockWritten = 0;
+ int i = 0;
+ while (i < readers.length) {
+ Block bloq = getNextBlockFrom(i);
+ if (bloq == null) {
+ i++;
+ continue;
+ }
+
+ if (bloq.data == null) {
+ blockWritten = 1;// fake block
+ newClusterByTrackId = i;
+ i++;
+ continue;
+ }
+
+ if (newClusterByTrackId == i) {
+ limitTimecodeByTrackId = i;
+ newClusterByTrackId = -1;
+ baseTimecode = bloq.absoluteTimecode;
+ limitTimecode = baseTimecode + INTERV;
+ bTimecode = makeTimecode(baseTimecode);
+ currentClusterOffset = makeCluster(out, bTimecode, currentClusterOffset, clusterOffsets, clusterSizes);
+ }
+
+ if (cuesForTrackId == i) {
+ if ((nextCueTime > -1 && bloq.absoluteTimecode >= nextCueTime) || (nextCueTime < 0 && bloq.isKeyframe())) {
+ if (nextCueTime > -1) {
+ nextCueTime += DEFAULT_CUES_EACH_MS;
+ }
+ keyFrames.add(
+ new KeyFrame(baseSegmentOffset, currentClusterOffset - 7, written, bTimecode.length, bloq.absoluteTimecode)
+ );
+ }
+ }
+
+ writeBlock(out, bloq, baseTimecode);
+ blockWritten++;
+
+ if (bloq.absoluteTimecode > duration) {
+ duration = bloq.absoluteTimecode;
+ durationFromTrackId = bloq.trackNumber;
+ }
+
+ if (limitTimecode < 0) {
+ limitTimecode = bloq.absoluteTimecode + INTERV;
+ continue;
+ }
+
+ if (bloq.absoluteTimecode >= limitTimecode) {
+ if (limitTimecodeByTrackId != i) {
+ limitTimecode += INTERV - (bloq.absoluteTimecode - limitTimecode);
+ }
+ i++;
+ }
+ }
+ }
+
+ makeCluster(out, null, currentClusterOffset, null, clusterSizes);
+
+ long segmentSize = written - offsetSegmentSizeSet - 7;
+
+ // final step write offsets and sizes
+ out.rewind();
+ written = 0;
+
+ skipTo(out, offsetSegmentSizeSet);
+ writeLong(out, segmentSize);
+
+ if (predefinedDurations[durationFromTrackId] > -1) {
+ duration += predefinedDurations[durationFromTrackId];// this value is full-filled in makeTrackEntry() method
+ }
+ skipTo(out, offsetInfoDurationSet);
+ writeFloat(out, duration);
+
+ firstClusterOffset -= baseSegmentOffset;
+ skipTo(out, offsetClusterSet);
+ writeInt(out, firstClusterOffset);
+
+ skipTo(out, cueReservedOffset);
+
+ /* Cue */
+ dump(new byte[]{0x1c, 0x53, (byte) 0xbb, 0x6b, 0x20, 0x00, 0x00}, out);
+
+ for (KeyFrame keyFrame : keyFrames) {
+ for (byte[] buffer : makeCuePoint(cuesForTrackId, keyFrame)) {
+ dump(buffer, out);
+ if (written >= (cueReservedOffset + 65535 - 16)) {
+ throw new IOException("Too many Cues");
+ }
+ }
+ }
+ short cueSize = (short) (written - cueReservedOffset - 7);
+
+ /* EBML Void */
+ ByteBuffer voidBuffer = ByteBuffer.allocate(4);
+ voidBuffer.putShort((short) 0xec20);
+ voidBuffer.putShort((short) (firstClusterOffset - written - 4));
+ dump(voidBuffer.array(), out);
+
+ out.rewind();
+ written = 0;
+
+ skipTo(out, offsetCuesSet);
+ writeInt(out, (int) (cueReservedOffset - baseSegmentOffset));
+
+ skipTo(out, cueReservedOffset + 5);
+ writeShort(out, cueSize);
+
+ for (int i = 0; i < clusterSizes.size(); i++) {
+ skipTo(out, clusterOffsets.get(i));
+ byte[] size = ByteBuffer.allocate(4).putInt(clusterSizes.get(i) | 0x200000).array();
+ out.write(size, 1, 3);
+ written += 3;
+ }
+ }
+
+ private Block getNextBlockFrom(int internalTrackId) throws IOException {
+ if (readersSegment[internalTrackId] == null) {
+ readersSegment[internalTrackId] = readers[internalTrackId].getNextSegment();
+ if (readersSegment[internalTrackId] == null) {
+ return null;// no more blocks in the selected track
+ }
+ }
+
+ if (readersCluter[internalTrackId] == null) {
+ readersCluter[internalTrackId] = readersSegment[internalTrackId].getNextCluster();
+ if (readersCluter[internalTrackId] == null) {
+ readersSegment[internalTrackId] = null;
+ return getNextBlockFrom(internalTrackId);
+ }
+ }
+
+ SimpleBlock res = readersCluter[internalTrackId].getNextSimpleBlock();
+ if (res == null) {
+ readersCluter[internalTrackId] = null;
+ return new Block();// fake block to indicate the end of the cluster
+ }
+
+ Block bloq = new Block();
+ bloq.data = res.data;
+ bloq.dataSize = (int) res.dataSize;
+ bloq.trackNumber = internalTrackId;
+ bloq.flags = res.flags;
+ bloq.absoluteTimecode = convertTimecode(res.relativeTimeCode, readersSegment[internalTrackId].info.timecodeScale, DEFAULT_TIMECODE_SCALE);
+ bloq.absoluteTimecode += readersCluter[internalTrackId].timecode;
+
+ return bloq;
+ }
+
+ private short convertTimecode(int time, long oldTimeScale, int newTimeScale) {
+ return (short) (time * (newTimeScale / oldTimeScale));
+ }
+
+ private void skipTo(SharpStream stream, long absoluteOffset) throws IOException {
+ absoluteOffset -= written;
+ written += absoluteOffset;
+ stream.skip(absoluteOffset);
+ }
+
+ private void writeLong(SharpStream stream, long number) throws IOException {
+ byte[] buffer = ByteBuffer.allocate(DataReader.LONG_SIZE).putLong(number).array();
+ stream.write(buffer, 1, buffer.length - 1);
+ written += buffer.length - 1;
+ }
+
+ private void writeFloat(SharpStream stream, float number) throws IOException {
+ byte[] buffer = ByteBuffer.allocate(DataReader.FLOAT_SIZE).putFloat(number).array();
+ dump(buffer, stream);
+ }
+
+ private void writeShort(SharpStream stream, short number) throws IOException {
+ byte[] buffer = ByteBuffer.allocate(DataReader.SHORT_SIZE).putShort(number).array();
+ dump(buffer, stream);
+ }
+
+ private void writeInt(SharpStream stream, int number) throws IOException {
+ byte[] buffer = ByteBuffer.allocate(DataReader.INTEGER_SIZE).putInt(number).array();
+ dump(buffer, stream);
+ }
+
+ private void writeBlock(SharpStream stream, Block bloq, long clusterTimecode) throws IOException {
+ long relativeTimeCode = bloq.absoluteTimecode - clusterTimecode;
+
+ if (relativeTimeCode < Short.MIN_VALUE || relativeTimeCode > Short.MAX_VALUE) {
+ throw new IndexOutOfBoundsException("SimpleBlock timecode overflow.");
+ }
+
+ ArrayList listBuffer = new ArrayList<>(5);
+ listBuffer.add(new byte[]{(byte) 0xa3});
+ listBuffer.add(null);// block size
+ listBuffer.add(encode(bloq.trackNumber + 1, false));
+ listBuffer.add(ByteBuffer.allocate(DataReader.SHORT_SIZE).putShort((short) relativeTimeCode).array());
+ listBuffer.add(new byte[]{bloq.flags});
+
+ int blockSize = bloq.dataSize;
+ for (int i = 2; i < listBuffer.size(); i++) {
+ blockSize += listBuffer.get(i).length;
+ }
+ listBuffer.set(1, encode(blockSize, false));
+
+ for (byte[] buff : listBuffer) {
+ dump(buff, stream);
+ }
+
+ int read;
+ while ((read = bloq.data.read(outBuffer)) > 0) {
+ stream.write(outBuffer, 0, read);
+ written += read;
+ }
+ }
+
+ private byte[] makeTimecode(long timecode) {
+ ByteBuffer buffer = ByteBuffer.allocate(9);
+ buffer.put((byte) 0xe7);
+ buffer.put(encode(timecode, true));
+
+ byte[] res = new byte[buffer.position()];
+ System.arraycopy(buffer.array(), 0, res, 0, res.length);
+
+ return res;
+ }
+
+ private long makeCluster(SharpStream stream, byte[] bTimecode, long startOffset, ArrayList clusterOffsets, ArrayList clusterSizes) throws IOException {
+ if (startOffset > 0) {
+ clusterSizes.add((int) (written - startOffset));// size for last offset
+ }
+
+ if (clusterOffsets != null) {
+ /* cluster */
+ dump(new byte[]{0x1f, 0x43, (byte) 0xb6, 0x75}, stream);
+ clusterOffsets.add(written);// warning: max cluster size is 256 MiB
+ dump(new byte[]{0x20, 0x00, 0x00}, stream);
+
+ startOffset = written;// size for the this cluster
+
+ dump(bTimecode, stream);
+
+ return startOffset;
+ }
+
+ return -1;
+ }
+
+ private void makeEBML(SharpStream stream) throws IOException {
+ // deafult values
+ dump(new byte[]{
+ 0x1A, 0x45, (byte) 0xDF, (byte) 0xA3, 0x01, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x1F, 0x42, (byte) 0x86, (byte) 0x81, 0x01,
+ 0x42, (byte) 0xF7, (byte) 0x81, 0x01, 0x42, (byte) 0xF2, (byte) 0x81, 0x04,
+ 0x42, (byte) 0xF3, (byte) 0x81, 0x08, 0x42, (byte) 0x82, (byte) 0x84, 0x77,
+ 0x65, 0x62, 0x6D, 0x42, (byte) 0x87, (byte) 0x81, 0x02,
+ 0x42, (byte) 0x85, (byte) 0x81, 0x02
+ }, stream);
+ }
+
+ private ArrayList makeTracks() {
+ ArrayList buffer = new ArrayList<>(1);
+ buffer.add(new byte[]{0x16, 0x54, (byte) 0xae, 0x6b});
+ buffer.add(null);
+
+ for (int i = 0; i < infoTracks.length; i++) {
+ buffer.addAll(makeTrackEntry(i, infoTracks[i]));
+ }
+
+ return lengthFor(buffer);
+ }
+
+ private ArrayList makeTrackEntry(int internalTrackId, WebMTrack track) {
+ byte[] id = encode(internalTrackId + 1, true);
+ ArrayList buffer = new ArrayList<>(12);
+
+ /* track */
+ buffer.add(new byte[]{(byte) 0xae});
+ buffer.add(null);
+
+ /* track number */
+ buffer.add(new byte[]{(byte) 0xd7});
+ buffer.add(id);
+
+ /* track uid */
+ buffer.add(new byte[]{0x73, (byte) 0xc5});
+ buffer.add(id);
+
+ /* flag lacing */
+ buffer.add(new byte[]{(byte) 0x9c, (byte) 0x81, 0x00});
+
+ /* lang */
+ buffer.add(new byte[]{0x22, (byte) 0xb5, (byte) 0x9c, (byte) 0x83, 0x75, 0x6e, 0x64});
+
+ /* codec id */
+ buffer.add(new byte[]{(byte) 0x86});
+ buffer.addAll(encode(track.codecId));
+
+ /* type */
+ buffer.add(new byte[]{(byte) 0x83});
+ buffer.add(encode(track.trackType, true));
+
+ /* default duration */
+ if (track.defaultDuration != 0) {
+ predefinedDurations[internalTrackId] = (int) Math.ceil(track.defaultDuration / (float) DEFAULT_TIMECODE_SCALE);
+ buffer.add(new byte[]{0x23, (byte) 0xe3, (byte) 0x83});
+ buffer.add(encode(track.defaultDuration, true));
+ }
+
+ /* audio/video */
+ if ((track.trackType == 1 || track.trackType == 2) && valid(track.bMetadata)) {
+ buffer.add(new byte[]{(byte) (track.trackType == 1 ? 0xe0 : 0xe1)});
+ buffer.add(encode(track.bMetadata.length, false));
+ buffer.add(track.bMetadata);
+ }
+
+ /* codec private*/
+ if (valid(track.codecPrivate)) {
+ buffer.add(new byte[]{0x63, (byte) 0xa2});
+ buffer.add(encode(track.codecPrivate.length, false));
+ buffer.add(track.codecPrivate);
+ }
+
+ return lengthFor(buffer);
+
+ }
+
+ private ArrayList makeCuePoint(int internalTrackId, KeyFrame keyFrame) {
+ ArrayList buffer = new ArrayList<>(5);
+
+ /* CuePoint */
+ buffer.add(new byte[]{(byte) 0xbb});
+ buffer.add(null);
+
+ /* CueTime */
+ buffer.add(new byte[]{(byte) 0xb3});
+ buffer.add(encode(keyFrame.atTimecode, true));
+
+ /* CueTrackPosition */
+ buffer.addAll(makeCueTrackPosition(internalTrackId, keyFrame));
+
+ return lengthFor(buffer);
+ }
+
+ private ArrayList makeCueTrackPosition(int internalTrackId, KeyFrame keyFrame) {
+ ArrayList buffer = new ArrayList<>(8);
+
+ /* CueTrackPositions */
+ buffer.add(new byte[]{(byte) 0xb7});
+ buffer.add(null);
+
+ /* CueTrack */
+ buffer.add(new byte[]{(byte) 0xf7});
+ buffer.add(encode(internalTrackId + 1, true));
+
+ /* CueClusterPosition */
+ buffer.add(new byte[]{(byte) 0xf1});
+ buffer.add(encode(keyFrame.atCluster, true));
+
+ /* CueRelativePosition */
+ if (keyFrame.atBlock > 0) {
+ buffer.add(new byte[]{(byte) 0xf0});
+ buffer.add(encode(keyFrame.atBlock, true));
+ }
+
+ return lengthFor(buffer);
+ }
+
+ private void dump(byte[] buffer, SharpStream stream) throws IOException {
+ stream.write(buffer);
+ written += buffer.length;
+ }
+
+ private ArrayList lengthFor(ArrayList buffer) {
+ long size = 0;
+ for (int i = 2; i < buffer.size(); i++) {
+ size += buffer.get(i).length;
+ }
+ buffer.set(1, encode(size, false));
+ return buffer;
+ }
+
+ private byte[] encode(long number, boolean withLength) {
+ int length = -1;
+ for (int i = 1; i <= 7; i++) {
+ if (number < Math.pow(2, 7 * i)) {
+ length = i;
+ break;
+ }
+ }
+
+ if (length < 1) {
+ throw new ArithmeticException("Can't encode a number of bigger than 7 bytes");
+ }
+
+ if (number == (Math.pow(2, 7 * length)) - 1) {
+ length++;
+ }
+
+ int offset = withLength ? 1 : 0;
+ byte[] buffer = new byte[offset + length];
+ long marker = (long) Math.floor((length - 1) / 8);
+
+ for (int i = length - 1, mul = 1; i >= 0; i--, mul *= 0x100) {
+ long b = (long) Math.floor(number / mul);
+ if (!withLength && i == marker) {
+ b = b | (0x80 >> (length - 1));
+ }
+ buffer[offset + i] = (byte) b;
+ }
+
+ if (withLength) {
+ buffer[0] = (byte) (0x80 | length);
+ }
+
+ return buffer;
+ }
+
+ private ArrayList encode(String value) {
+ byte[] str;
+ try {
+ str = value.getBytes("utf-8");
+ } catch (UnsupportedEncodingException err) {
+ str = value.getBytes();
+ }
+
+ ArrayList buffer = new ArrayList<>(2);
+ buffer.add(encode(str.length, false));
+ buffer.add(str);
+
+ return buffer;
+ }
+
+ private boolean valid(byte[] buffer) {
+ return buffer != null && buffer.length > 0;
+ }
+
+ private int selectTrackForCue() {
+ int i = 0;
+ int videoTracks = 0;
+ int audioTracks = 0;
+
+ for (; i < infoTracks.length; i++) {
+ switch (infoTracks[i].trackType) {
+ case 1:
+ videoTracks++;
+ break;
+ case 2:
+ audioTracks++;
+ break;
+ }
+ }
+
+ int kind;
+ if (audioTracks == infoTracks.length) {
+ kind = 2;
+ } else if (videoTracks == infoTracks.length) {
+ kind = 1;
+ } else if (videoTracks > 0) {
+ kind = 1;
+ } else if (audioTracks > 0) {
+ kind = 2;
+ } else {
+ return 0;
+ }
+
+ // TODO: in the adove code, find and select the shortest track for the desired kind
+ for (i = 0; i < infoTracks.length; i++) {
+ if (kind == infoTracks[i].trackType) {
+ return i;
+ }
+ }
+
+ return 0;
+ }
+
+ class KeyFrame {
+
+ KeyFrame(long segment, long cluster, long block, int bTimecodeLength, long timecode) {
+ atCluster = cluster - segment;
+ if ((block - bTimecodeLength) > cluster) {
+ atBlock = (int) (block - cluster);
+ }
+ atTimecode = timecode;
+ }
+
+ long atCluster;
+ int atBlock;
+ long atTimecode;
+ }
+
+ class Block {
+
+ InputStream data;
+ int trackNumber;
+ byte flags;
+ int dataSize;
+ long absoluteTimecode;
+
+ boolean isKeyframe() {
+ return (flags & 0x80) == 0x80;
+ }
+
+ @Override
+ public String toString() {
+ return String.format("trackNumber=%s isKeyFrame=%S absoluteTimecode=%s", trackNumber, (flags & 0x80) == 0x80, absoluteTimecode);
+ }
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java b/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
new file mode 100644
index 000000000..48bea06f6
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/streams/io/SharpStream.java
@@ -0,0 +1,47 @@
+package org.schabi.newpipe.streams.io;
+
+import java.io.IOException;
+
+/**
+ * based c#
+ */
+public abstract class SharpStream {
+
+ public abstract int read() throws IOException;
+
+ public abstract int read(byte buffer[]) throws IOException;
+
+ public abstract int read(byte buffer[], int offset, int count) throws IOException;
+
+ public abstract long skip(long amount) throws IOException;
+
+
+ public abstract int available();
+
+ public abstract void rewind() throws IOException;
+
+
+ public abstract void dispose();
+
+ public abstract boolean isDisposed();
+
+
+ public abstract boolean canRewind();
+
+ public abstract boolean canRead();
+
+ public abstract boolean canWrite();
+
+
+ public abstract void write(byte value) throws IOException;
+
+ public abstract void write(byte[] buffer) throws IOException;
+
+ public abstract void write(byte[] buffer, int offset, int count) throws IOException;
+
+ public abstract void flush() throws IOException;
+
+ public void setLength(long length) throws IOException {
+ throw new IOException("Not implemented");
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java b/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java
index 3c5f16929..6a398a8a2 100644
--- a/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java
@@ -25,6 +25,7 @@ import android.animation.ArgbEvaluator;
import android.animation.ValueAnimator;
import android.content.res.ColorStateList;
import android.support.annotation.ColorInt;
+import android.support.annotation.FloatRange;
import android.support.v4.view.ViewCompat;
import android.support.v4.view.animation.FastOutSlowInInterpolator;
import android.util.Log;
@@ -363,4 +364,24 @@ public class AnimationUtils {
}).start();
}
}
+
+ public static void slideUp(final View view,
+ long duration,
+ long delay,
+ @FloatRange(from = 0.0f, to = 1.0f) float translationPercent) {
+ int translationY = (int) (view.getResources().getDisplayMetrics().heightPixels *
+ (translationPercent));
+
+ view.animate().setListener(null).cancel();
+ view.setAlpha(0f);
+ view.setTranslationY(translationY);
+ view.setVisibility(View.VISIBLE);
+ view.animate()
+ .alpha(1f)
+ .translationY(0)
+ .setStartDelay(delay)
+ .setDuration(duration)
+ .setInterpolator(new FastOutSlowInInterpolator())
+ .start();
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
index e328ad23e..3f6d82b9f 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -69,8 +69,7 @@ public final class ExtractorHelper {
public static Single searchFor(final int serviceId,
final String searchString,
final List contentFilter,
- final String sortFilter,
- final String contentCountry) {
+ final String sortFilter) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
SearchInfo.getInfo(NewPipe.getService(serviceId),
@@ -83,8 +82,7 @@ public final class ExtractorHelper {
final String searchString,
final List contentFilter,
final String sortFilter,
- final String pageUrl,
- final String contentCountry) {
+ final String pageUrl) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
SearchInfo.getMoreItems(NewPipe.getService(serviceId),
@@ -96,8 +94,7 @@ public final class ExtractorHelper {
}
public static Single> suggestionsFor(final int serviceId,
- final String query,
- final String contentCountry) {
+ final String query) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
NewPipe.getService(serviceId)
@@ -126,7 +123,7 @@ public final class ExtractorHelper {
final String nextStreamsUrl) {
checkServiceId(serviceId);
return Single.fromCallable(() ->
- ChannelInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl, NewPipe.getLocalization()));
+ ChannelInfo.getMoreItems(NewPipe.getService(serviceId), url, nextStreamsUrl));
}
public static Single getCommentsInfo(final int serviceId,
@@ -163,19 +160,17 @@ public final class ExtractorHelper {
public static Single getKioskInfo(final int serviceId,
final String url,
- final String contentCountry,
boolean forceLoad) {
return checkCache(forceLoad, serviceId, url, InfoItem.InfoType.PLAYLIST, Single.fromCallable(() ->
- KioskInfo.getInfo(NewPipe.getService(serviceId), url, contentCountry)));
+ KioskInfo.getInfo(NewPipe.getService(serviceId), url)));
}
public static Single getMoreKioskItems(final int serviceId,
- final String url,
- final String nextStreamsUrl,
- final String contentCountry) {
+ final String url,
+ final String nextStreamsUrl) {
return Single.fromCallable(() ->
KioskInfo.getMoreItems(NewPipe.getService(serviceId),
- url, nextStreamsUrl, contentCountry));
+ url, nextStreamsUrl));
}
/*//////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
index 871d0578f..8fc423837 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -110,7 +110,8 @@ public final class ListHelper {
: context.getString(R.string.best_resolution_key);
String maxResolution = getResolutionLimit(context);
- if (maxResolution != null && compareVideoStreamResolution(maxResolution, resolution) < 1){
+ if (maxResolution != null && (resolution.equals(context.getString(R.string.best_resolution_key))
+ || compareVideoStreamResolution(maxResolution, resolution) < 1)) {
resolution = maxResolution;
}
return resolution;
diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index c1e5c9ed4..eed1a8ae2 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -69,10 +69,23 @@ public class Localization {
return stringBuilder.toString();
}
+ public static org.schabi.newpipe.extractor.utils.Localization getPreferredExtractorLocal(Context context) {
+ SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+
+ String languageCode = sp.getString(context.getString(R.string.content_language_key),
+ context.getString(R.string.default_language_value));
+
+ String countryCode = sp.getString(context.getString(R.string.content_country_key),
+ context.getString(R.string.default_country_value));
+
+ return new org.schabi.newpipe.extractor.utils.Localization(countryCode, languageCode);
+ }
+
public static Locale getPreferredLocale(Context context) {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
- String languageCode = sp.getString(context.getString(R.string.search_language_key), context.getString(R.string.default_language_value));
+ String languageCode = sp.getString(context.getString(R.string.content_language_key),
+ context.getString(R.string.default_language_value));
try {
if (languageCode.length() == 2) {
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index 562dd7e49..4b93600ce 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -50,7 +50,6 @@ import org.schabi.newpipe.player.MainVideoPlayer;
import org.schabi.newpipe.player.PopupVideoPlayer;
import org.schabi.newpipe.player.PopupVideoPlayerActivity;
import org.schabi.newpipe.player.VideoPlayer;
-import org.schabi.newpipe.player.old.PlayVideoActivity;
import org.schabi.newpipe.player.playqueue.PlayQueue;
import org.schabi.newpipe.settings.SettingsActivity;
@@ -118,26 +117,6 @@ public class NavigationHelper {
context.startActivity(playerIntent);
}
- public static void playOnOldVideoPlayer(Context context, StreamInfo info) {
- ArrayList videoStreamsList = new ArrayList<>(ListHelper.getSortedStreamVideosList(context, info.getVideoStreams(), null, false));
- int index = ListHelper.getDefaultResolutionIndex(context, videoStreamsList);
-
- if (index == -1) {
- Toast.makeText(context, R.string.video_streams_empty, Toast.LENGTH_SHORT).show();
- return;
- }
-
- VideoStream videoStream = videoStreamsList.get(index);
- Intent intent = new Intent(context, PlayVideoActivity.class)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- .putExtra(PlayVideoActivity.VIDEO_TITLE, info.getName())
- .putExtra(PlayVideoActivity.STREAM_URL, videoStream.getUrl())
- .putExtra(PlayVideoActivity.VIDEO_URL, info.getUrl())
- .putExtra(PlayVideoActivity.START_POSITION, info.getStartPosition());
-
- context.startActivity(intent);
- }
-
public static void playOnPopupPlayer(final Context context, final PlayQueue queue) {
if (!PermissionHelper.isPopupEnabled(context)) {
PermissionHelper.showPopupEnablementToast(context);
diff --git a/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java b/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java
index c81100703..6de663c13 100644
--- a/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java
@@ -4,11 +4,15 @@ import org.schabi.newpipe.extractor.InfoItem;
import org.schabi.newpipe.extractor.ListInfo;
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
import org.schabi.newpipe.extractor.stream.StreamInfo;
+import org.schabi.newpipe.extractor.stream.StreamInfoItem;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
public class RelatedStreamInfo extends ListInfo {
+ private StreamInfoItem nextStream;
public RelatedStreamInfo(int serviceId, ListLinkHandler listUrlIdHandler, String name) {
super(serviceId, listUrlIdHandler, name);
@@ -17,7 +21,21 @@ public class RelatedStreamInfo extends ListInfo {
public static RelatedStreamInfo getInfo(StreamInfo info) {
ListLinkHandler handler = new ListLinkHandler(info.getOriginalUrl(), info.getUrl(), info.getId(), Collections.emptyList(), null);
RelatedStreamInfo relatedStreamInfo = new RelatedStreamInfo(info.getServiceId(), handler, info.getName());
- relatedStreamInfo.setRelatedItems(info.getRelatedStreams());
- return relatedStreamInfo;
+ List streams = new ArrayList<>();
+ if(info.getNextVideo() != null){
+ streams.add(info.getNextVideo());
+ }
+ streams.addAll(info.getRelatedStreams());
+ relatedStreamInfo.setRelatedItems(streams);
+ relatedStreamInfo.setNextStream(info.getNextVideo());
+ return relatedStreamInfo;
+ }
+
+ public StreamInfoItem getNextStream() {
+ return nextStream;
+ }
+
+ public void setNextStream(StreamInfoItem nextStream) {
+ this.nextStream = nextStream;
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java b/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java
new file mode 100644
index 000000000..a5d3ea3eb
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java
@@ -0,0 +1,66 @@
+package org.schabi.newpipe.util;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.extractor.MediaFormat;
+import org.schabi.newpipe.extractor.stream.AudioStream;
+import org.schabi.newpipe.extractor.stream.Stream;
+import org.schabi.newpipe.extractor.stream.VideoStream;
+import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper;
+
+import java.util.List;
+
+public class SecondaryStreamHelper {
+ private final int position;
+ private final StreamSizeWrapper streams;
+
+ public SecondaryStreamHelper(StreamSizeWrapper streams, T selectedStream) {
+ this.streams = streams;
+ this.position = streams.getStreamsList().indexOf(selectedStream);
+ if (this.position < 0) throw new RuntimeException("selected stream not found");
+ }
+
+ public T getStream() {
+ return streams.getStreamsList().get(position);
+ }
+
+ public long getSizeInBytes() {
+ return streams.getSizeInBytes(position);
+ }
+
+ /**
+ * find the correct audio stream for the desired video stream
+ *
+ * @param audioStreams list of audio streams
+ * @param videoStream desired video ONLY stream
+ * @return selected audio stream or null if a candidate was not found
+ */
+ public static AudioStream getAudioStreamFor(@NonNull List audioStreams, @NonNull VideoStream videoStream) {
+ // TODO: check if m4v and m4a selected streams are DASH compliant
+ switch (videoStream.getFormat()) {
+ case WEBM:
+ case MPEG_4:
+ break;
+ default:
+ return null;
+ }
+
+ boolean m4v = videoStream.getFormat() == MediaFormat.MPEG_4;
+
+ for (AudioStream audio : audioStreams) {
+ if (audio.getFormat() == (m4v ? MediaFormat.M4A : MediaFormat.WEBMA)) {
+ return audio;
+ }
+ }
+
+ // retry, but this time in reverse order
+ for (int i = audioStreams.size() - 1; i >= 0; i--) {
+ AudioStream audio = audioStreams.get(i);
+ if (audio.getFormat() == (m4v ? MediaFormat.MP3 : MediaFormat.OPUS)) {
+ return audio;
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
index e100a447b..eb106f91d 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamItemAdapter.java
@@ -1,6 +1,7 @@
package org.schabi.newpipe.util;
import android.content.Context;
+import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -13,6 +14,7 @@ import org.schabi.newpipe.Downloader;
import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.stream.AudioStream;
import org.schabi.newpipe.extractor.stream.Stream;
+import org.schabi.newpipe.extractor.stream.SubtitlesStream;
import org.schabi.newpipe.extractor.stream.VideoStream;
import java.io.Serializable;
@@ -28,26 +30,34 @@ import us.shandian.giga.util.Utility;
/**
* A list adapter for a list of {@link Stream streams}, currently supporting {@link VideoStream} and {@link AudioStream}.
*/
-public class StreamItemAdapter extends BaseAdapter {
+public class StreamItemAdapter extends BaseAdapter {
private final Context context;
private final StreamSizeWrapper streamsWrapper;
- private final boolean showIconNoAudio;
+ private final SparseArray> secondaryStreams;
- public StreamItemAdapter(Context context, StreamSizeWrapper streamsWrapper, boolean showIconNoAudio) {
+ public StreamItemAdapter(Context context, StreamSizeWrapper streamsWrapper, SparseArray> secondaryStreams) {
this.context = context;
this.streamsWrapper = streamsWrapper;
- this.showIconNoAudio = showIconNoAudio;
+ this.secondaryStreams = secondaryStreams;
+ }
+
+ public StreamItemAdapter(Context context, StreamSizeWrapper streamsWrapper, boolean showIconNoAudio) {
+ this(context, streamsWrapper, showIconNoAudio ? new SparseArray<>() : null);
}
public StreamItemAdapter(Context context, StreamSizeWrapper streamsWrapper) {
- this(context, streamsWrapper, false);
+ this(context, streamsWrapper, null);
}
public List getAll() {
return streamsWrapper.getStreamsList();
}
+ public SparseArray> getAllSecondary() {
+ return secondaryStreams;
+ }
+
@Override
public int getCount() {
return streamsWrapper.getStreamsList().size();
@@ -89,29 +99,46 @@ public class StreamItemAdapter extends BaseAdapter {
String qualityString;
if (stream instanceof VideoStream) {
- qualityString = ((VideoStream) stream).getResolution();
+ VideoStream videoStream = ((VideoStream) stream);
+ qualityString = videoStream.getResolution();
- if (!showIconNoAudio) {
- woSoundIconVisibility = View.GONE;
- } else if (((VideoStream) stream).isVideoOnly()) {
- woSoundIconVisibility = View.VISIBLE;
- } else if (isDropdownItem) {
- woSoundIconVisibility = View.INVISIBLE;
+ if (secondaryStreams != null) {
+ if (videoStream.isVideoOnly()) {
+ woSoundIconVisibility = secondaryStreams.get(position) == null ? View.VISIBLE : View.INVISIBLE;
+ } else if (isDropdownItem) {
+ woSoundIconVisibility = View.INVISIBLE;
+ }
}
} else if (stream instanceof AudioStream) {
qualityString = ((AudioStream) stream).getAverageBitrate() + "kbps";
+ } else if (stream instanceof SubtitlesStream) {
+ qualityString = ((SubtitlesStream) stream).getDisplayLanguageName();
+ if (((SubtitlesStream) stream).isAutoGenerated()) {
+ qualityString += " (" + context.getString(R.string.caption_auto_generated) + ")";
+ }
} else {
qualityString = stream.getFormat().getSuffix();
}
if (streamsWrapper.getSizeInBytes(position) > 0) {
- sizeView.setText(streamsWrapper.getFormattedSize(position));
+ SecondaryStreamHelper secondary = secondaryStreams == null ? null : secondaryStreams.get(position);
+ if (secondary != null) {
+ long size = secondary.getSizeInBytes() + streamsWrapper.getSizeInBytes(position);
+ sizeView.setText(Utility.formatBytes(size));
+ } else {
+ sizeView.setText(streamsWrapper.getFormattedSize(position));
+ }
sizeView.setVisibility(View.VISIBLE);
} else {
sizeView.setVisibility(View.GONE);
}
- formatNameView.setText(stream.getFormat().getName());
+ if (stream instanceof SubtitlesStream) {
+ formatNameView.setText(((SubtitlesStream) stream).getLanguageTag());
+ } else {
+ formatNameView.setText(stream.getFormat().getName());
+ }
+
qualityView.setText(qualityString);
woSoundIconView.setVisibility(woSoundIconVisibility);
@@ -122,15 +149,17 @@ public class StreamItemAdapter extends BaseAdapter {
* A wrapper class that includes a way of storing the stream sizes.
*/
public static class StreamSizeWrapper implements Serializable {
- private static final StreamSizeWrapper EMPTY = new StreamSizeWrapper<>(Collections.emptyList());
+ private static final StreamSizeWrapper EMPTY = new StreamSizeWrapper<>(Collections.emptyList(), null);
private final List streamsList;
private final long[] streamSizes;
+ private final String unknownSize;
- public StreamSizeWrapper(List streamsList) {
+ public StreamSizeWrapper(List streamsList, Context context) {
this.streamsList = streamsList;
this.streamSizes = new long[streamsList.size()];
+ this.unknownSize = context == null ? "--.-" : context.getString(R.string.unknown_content);
- for (int i = 0; i < streamSizes.length; i++) streamSizes[i] = -1;
+ for (int i = 0; i < streamSizes.length; i++) streamSizes[i] = -2;
}
/**
@@ -143,7 +172,7 @@ public class StreamItemAdapter extends BaseAdapter {
final Callable fetchAndSet = () -> {
boolean hasChanged = false;
for (X stream : streamsWrapper.getStreamsList()) {
- if (streamsWrapper.getSizeInBytes(stream) > 0) {
+ if (streamsWrapper.getSizeInBytes(stream) > -2) {
continue;
}
@@ -173,11 +202,18 @@ public class StreamItemAdapter extends BaseAdapter {
}
public String getFormattedSize(int streamIndex) {
- return Utility.formatBytes(getSizeInBytes(streamIndex));
+ return formatSize(getSizeInBytes(streamIndex));
}
public String getFormattedSize(T stream) {
- return Utility.formatBytes(getSizeInBytes(stream));
+ return formatSize(getSizeInBytes(stream));
+ }
+
+ private String formatSize(long size) {
+ if (size > -1) {
+ return Utility.formatBytes(size);
+ }
+ return unknownSize;
}
public void setSize(int streamIndex, long sizeInBytes) {
@@ -193,4 +229,4 @@ public class StreamItemAdapter extends BaseAdapter {
return (StreamSizeWrapper) EMPTY;
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadDataSource.java b/app/src/main/java/us/shandian/giga/get/DownloadDataSource.java
deleted file mode 100644
index 2a8a9e129..000000000
--- a/app/src/main/java/us/shandian/giga/get/DownloadDataSource.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package us.shandian.giga.get;
-
-import java.util.List;
-
-/**
- * Provides access to the storage of {@link DownloadMission}s
- */
-public interface DownloadDataSource {
-
- /**
- * Load all missions
- *
- * @return a list of download missions
- */
- List loadMissions();
-
- /**
- * Add a download mission to the storage
- *
- * @param downloadMission the download mission to add
- * @return the identifier of the mission
- */
- void addMission(DownloadMission downloadMission);
-
- /**
- * Update a download mission which exists in the storage
- *
- * @param downloadMission the download mission to update
- * @throws IllegalArgumentException if the mission was not added to storage
- */
- void updateMission(DownloadMission downloadMission);
-
-
- /**
- * Delete a download mission
- *
- * @param downloadMission the mission to delete
- */
- void deleteMission(DownloadMission downloadMission);
-}
\ No newline at end of file
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
new file mode 100644
index 000000000..ce7ae267c
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java
@@ -0,0 +1,186 @@
+package us.shandian.giga.get;
+
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.RandomAccessFile;
+import java.net.HttpURLConnection;
+import java.nio.channels.ClosedByInterruptException;
+
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadInitializer extends Thread {
+ private final static String TAG = "DownloadInitializer";
+ final static int mId = 0;
+
+ private DownloadMission mMission;
+ private HttpURLConnection mConn;
+
+ DownloadInitializer(@NonNull DownloadMission mission) {
+ mMission = mission;
+ mConn = null;
+ }
+
+ @Override
+ public void run() {
+ if (mMission.current > 0) mMission.resetState();
+
+ int retryCount = 0;
+ while (true) {
+ try {
+ mMission.currentThreadCount = mMission.threadCount;
+
+ mConn = mMission.openConnection(mId, -1, -1);
+ mMission.establishConnection(mId, mConn);
+
+ if (!mMission.running || Thread.interrupted()) return;
+
+ mMission.length = Utility.getContentLength(mConn);
+
+
+ if (mMission.length == 0) {
+ mMission.notifyError(DownloadMission.ERROR_HTTP_NO_CONTENT, null);
+ return;
+ }
+
+ // check for dynamic generated content
+ if (mMission.length == -1 && mConn.getResponseCode() == 200) {
+ mMission.blocks = 0;
+ mMission.length = 0;
+ mMission.fallback = true;
+ mMission.unknownLength = true;
+ mMission.currentThreadCount = 1;
+
+ if (DEBUG) {
+ Log.d(TAG, "falling back (unknown length)");
+ }
+ } else {
+ // Open again
+ mConn = mMission.openConnection(mId, mMission.length - 10, mMission.length);
+ mMission.establishConnection(mId, mConn);
+
+ if (!mMission.running || Thread.interrupted()) return;
+
+ synchronized (mMission.blockState) {
+ if (mConn.getResponseCode() == 206) {
+ if (mMission.currentThreadCount > 1) {
+ mMission.blocks = mMission.length / DownloadMission.BLOCK_SIZE;
+
+ if (mMission.currentThreadCount > mMission.blocks) {
+ mMission.currentThreadCount = (int) mMission.blocks;
+ }
+ if (mMission.currentThreadCount <= 0) {
+ mMission.currentThreadCount = 1;
+ }
+ if (mMission.blocks * DownloadMission.BLOCK_SIZE < mMission.length) {
+ mMission.blocks++;
+ }
+ } else {
+ // if one thread is solicited don't calculate blocks, is useless
+ mMission.blocks = 1;
+ mMission.fallback = true;
+ mMission.unknownLength = false;
+ }
+
+ if (DEBUG) {
+ Log.d(TAG, "http response code = " + mConn.getResponseCode());
+ }
+ } else {
+ // Fallback to single thread
+ mMission.blocks = 0;
+ mMission.fallback = true;
+ mMission.unknownLength = false;
+ mMission.currentThreadCount = 1;
+
+ if (DEBUG) {
+ Log.d(TAG, "falling back due http response code = " + mConn.getResponseCode());
+ }
+ }
+
+ for (long i = 0; i < mMission.currentThreadCount; i++) {
+ mMission.threadBlockPositions.add(i);
+ mMission.threadBytePositions.add(0L);
+ }
+ }
+
+ if (!mMission.running || Thread.interrupted()) return;
+ }
+
+ File file;
+ if (mMission.current == 0) {
+ file = new File(mMission.location);
+ if (!Utility.mkdir(file, true)) {
+ mMission.notifyError(DownloadMission.ERROR_PATH_CREATION, null);
+ return;
+ }
+
+ file = new File(file, mMission.name);
+
+ // if the name is used by another process, delete it
+ if (file.exists() && !file.isFile() && !file.delete()) {
+ mMission.notifyError(DownloadMission.ERROR_FILE_CREATION, null);
+ return;
+ }
+
+ if (!file.exists() && !file.createNewFile()) {
+ mMission.notifyError(DownloadMission.ERROR_FILE_CREATION, null);
+ return;
+ }
+ } else {
+ file = new File(mMission.location, mMission.name);
+ }
+
+ RandomAccessFile af = new RandomAccessFile(file, "rw");
+ af.setLength(mMission.offsets[mMission.current] + mMission.length);
+ af.seek(mMission.offsets[mMission.current]);
+ af.close();
+
+ if (!mMission.running || Thread.interrupted()) return;
+
+ mMission.running = false;
+ break;
+ } catch (InterruptedIOException | ClosedByInterruptException e) {
+ return;
+ } catch (Exception e) {
+ if (!mMission.running) return;
+
+ if (e instanceof IOException && e.getMessage().contains("Permission denied")) {
+ mMission.notifyError(DownloadMission.ERROR_PERMISSION_DENIED, e);
+ return;
+ }
+
+ if (retryCount++ > mMission.maxRetry) {
+ Log.e(TAG, "initializer failed", e);
+ mMission.running = false;
+ mMission.notifyError(e);
+ return;
+ }
+
+ Log.e(TAG, "initializer failed, retrying", e);
+ }
+ }
+
+ // hide marquee in the progress bar
+ mMission.done++;
+
+ mMission.start();
+ }
+
+ @Override
+ public void interrupt() {
+ super.interrupt();
+
+ if (mConn != null) {
+ try {
+ mConn.disconnect();
+ } catch (Exception e) {
+ // nothing to do
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadManager.java b/app/src/main/java/us/shandian/giga/get/DownloadManager.java
deleted file mode 100644
index 45beb5563..000000000
--- a/app/src/main/java/us/shandian/giga/get/DownloadManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package us.shandian.giga.get;
-
-public interface DownloadManager {
- int BLOCK_SIZE = 512 * 1024;
-
- /**
- * Start a new download mission
- *
- * @param url the url to download
- * @param location the location
- * @param name the name of the file to create
- * @param isAudio true if the download is an audio file
- * @param threads the number of threads maximal used to download chunks of the file. @return the identifier of the mission.
- */
- int startMission(String url, String location, String name, boolean isAudio, int threads);
-
- /**
- * Resume the execution of a download mission.
- *
- * @param id the identifier of the mission to resume.
- */
- void resumeMission(int id);
-
- /**
- * Pause the execution of a download mission.
- *
- * @param id the identifier of the mission to pause.
- */
- void pauseMission(int id);
-
- /**
- * Deletes the mission from the downloaded list but keeps the downloaded file.
- *
- * @param id The mission identifier
- */
- void deleteMission(int id);
-
- /**
- * Get the download mission by its identifier
- *
- * @param id the identifier of the download mission
- * @return the download mission or null if the mission doesn't exist
- */
- DownloadMission getMission(int id);
-
- /**
- * Get the number of download missions.
- *
- * @return the number of download missions.
- */
- int getCount();
-
-}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java b/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
deleted file mode 100755
index a377d861c..000000000
--- a/app/src/main/java/us/shandian/giga/get/DownloadManagerImpl.java
+++ /dev/null
@@ -1,395 +0,0 @@
-package us.shandian.giga.get;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import org.schabi.newpipe.download.ExtSDDownloadFailedActivity;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import us.shandian.giga.util.Utility;
-
-import static org.schabi.newpipe.BuildConfig.DEBUG;
-
-public class DownloadManagerImpl implements DownloadManager {
- private static final String TAG = DownloadManagerImpl.class.getSimpleName();
- private final DownloadDataSource mDownloadDataSource;
-
- private final ArrayList mMissions = new ArrayList<>();
- @NonNull
- private final Context context;
-
- /**
- * Create a new instance
- *
- * @param searchLocations the directories to search for unfinished downloads
- * @param downloadDataSource the data source for finished downloads
- */
- public DownloadManagerImpl(Collection searchLocations, DownloadDataSource downloadDataSource) {
- mDownloadDataSource = downloadDataSource;
- this.context = null;
- loadMissions(searchLocations);
- }
-
- public DownloadManagerImpl(Collection searchLocations, DownloadDataSource downloadDataSource, Context context) {
- mDownloadDataSource = downloadDataSource;
- this.context = context;
- loadMissions(searchLocations);
- }
-
- @Override
- public int startMission(String url, String location, String name, boolean isAudio, int threads) {
- DownloadMission existingMission = getMissionByLocation(location, name);
- if (existingMission != null) {
- // Already downloaded or downloading
- if (existingMission.finished) {
- // Overwrite mission
- deleteMission(mMissions.indexOf(existingMission));
- } else {
- // Rename file (?)
- try {
- name = generateUniqueName(location, name);
- } catch (Exception e) {
- Log.e(TAG, "Unable to generate unique name", e);
- name = System.currentTimeMillis() + name;
- Log.i(TAG, "Using " + name);
- }
- }
- }
-
- DownloadMission mission = new DownloadMission(name, url, location);
- mission.timestamp = System.currentTimeMillis();
- mission.threadCount = threads;
- mission.addListener(new MissionListener(mission));
- new Initializer(mission).start();
- return insertMission(mission);
- }
-
- @Override
- public void resumeMission(int i) {
- DownloadMission d = getMission(i);
- if (!d.running && d.errCode == -1) {
- d.start();
- }
- }
-
- @Override
- public void pauseMission(int i) {
- DownloadMission d = getMission(i);
- if (d.running) {
- d.pause();
- }
- }
-
- @Override
- public void deleteMission(int i) {
- DownloadMission mission = getMission(i);
- if (mission.finished) {
- mDownloadDataSource.deleteMission(mission);
- }
- mission.delete();
- mMissions.remove(i);
- }
-
- private void loadMissions(Iterable searchLocations) {
- mMissions.clear();
- loadFinishedMissions();
- for (String location : searchLocations) {
- loadMissions(location);
- }
-
- }
-
- /**
- * Sort a list of mission by its timestamp. Oldest first
- * @param missions the missions to sort
- */
- static void sortByTimestamp(List missions) {
- Collections.sort(missions, new Comparator() {
- @Override
- public int compare(DownloadMission o1, DownloadMission o2) {
- return Long.compare(o1.timestamp, o2.timestamp);
- }
- });
- }
-
- /**
- * Loads finished missions from the data source
- */
- private void loadFinishedMissions() {
- List finishedMissions = mDownloadDataSource.loadMissions();
- if (finishedMissions == null) {
- finishedMissions = new ArrayList<>();
- }
- // Ensure its sorted
- sortByTimestamp(finishedMissions);
-
- mMissions.ensureCapacity(mMissions.size() + finishedMissions.size());
- for (DownloadMission mission : finishedMissions) {
- File downloadedFile = mission.getDownloadedFile();
- if (!downloadedFile.isFile()) {
- if (DEBUG) {
- Log.d(TAG, "downloaded file removed: " + downloadedFile.getAbsolutePath());
- }
- mDownloadDataSource.deleteMission(mission);
- } else {
- mission.length = downloadedFile.length();
- mission.finished = true;
- mission.running = false;
- mMissions.add(mission);
- }
- }
- }
-
- private void loadMissions(String location) {
-
- File f = new File(location);
-
- if (f.exists() && f.isDirectory()) {
- File[] subs = f.listFiles();
-
- if (subs == null) {
- Log.e(TAG, "listFiles() returned null");
- return;
- }
-
- for (File sub : subs) {
- if (sub.isFile() && sub.getName().endsWith(".giga")) {
- DownloadMission mis = Utility.readFromFile(sub.getAbsolutePath());
- if (mis != null) {
- if (mis.finished) {
- if (!sub.delete()) {
- Log.w(TAG, "Unable to delete .giga file: " + sub.getPath());
- }
- continue;
- }
-
- mis.running = false;
- mis.recovered = true;
- insertMission(mis);
- }
- }
- }
- }
- }
-
- @Override
- public DownloadMission getMission(int i) {
- return mMissions.get(i);
- }
-
- @Override
- public int getCount() {
- return mMissions.size();
- }
-
- private int insertMission(DownloadMission mission) {
- int i = -1;
-
- DownloadMission m = null;
-
- if (mMissions.size() > 0) {
- do {
- m = mMissions.get(++i);
- } while (m.timestamp > mission.timestamp && i < mMissions.size() - 1);
-
- //if (i > 0) i--;
- } else {
- i = 0;
- }
-
- mMissions.add(i, mission);
-
- return i;
- }
-
- /**
- * Get a mission by its location and name
- *
- * @param location the location
- * @param name the name
- * @return the mission or null if no such mission exists
- */
- private
- @Nullable
- DownloadMission getMissionByLocation(String location, String name) {
- for (DownloadMission mission : mMissions) {
- if (location.equals(mission.location) && name.equals(mission.name)) {
- return mission;
- }
- }
- return null;
- }
-
- /**
- * Splits the filename into name and extension
- *
- * Dots are ignored if they appear: not at all, at the beginning of the file,
- * at the end of the file
- *
- * @param name the name to split
- * @return a string array with a length of 2 containing the name and the extension
- */
- private static String[] splitName(String name) {
- int dotIndex = name.lastIndexOf('.');
- if (dotIndex <= 0 || (dotIndex == name.length() - 1)) {
- return new String[]{name, ""};
- } else {
- return new String[]{name.substring(0, dotIndex), name.substring(dotIndex + 1)};
- }
- }
-
- /**
- * Generates a unique file name.
- *
- * e.g. "myname (1).txt" if the name "myname.txt" exists.
- *
- * @param location the location (to check for existing files)
- * @param name the name of the file
- * @return the unique file name
- * @throws IllegalArgumentException if the location is not a directory
- * @throws SecurityException if the location is not readable
- */
- private static String generateUniqueName(String location, String name) {
- if (location == null) throw new NullPointerException("location is null");
- if (name == null) throw new NullPointerException("name is null");
- File destination = new File(location);
- if (!destination.isDirectory()) {
- throw new IllegalArgumentException("location is not a directory: " + location);
- }
- final String[] nameParts = splitName(name);
- String[] existingName = destination.list(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return name.startsWith(nameParts[0]);
- }
- });
- Arrays.sort(existingName);
- String newName;
- int downloadIndex = 0;
- do {
- newName = nameParts[0] + " (" + downloadIndex + ")." + nameParts[1];
- ++downloadIndex;
- if (downloadIndex == 1000) { // Probably an error on our side
- throw new RuntimeException("Too many existing files");
- }
- } while (Arrays.binarySearch(existingName, newName) >= 0);
- return newName;
- }
-
- private class Initializer extends Thread {
- private final DownloadMission mission;
- private final Handler handler;
-
- public Initializer(DownloadMission mission) {
- this.mission = mission;
- this.handler = new Handler();
- }
-
- @Override
- public void run() {
- try {
- URL url = new URL(mission.url);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- mission.length = conn.getContentLength();
-
- if (mission.length <= 0) {
- mission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
- //mission.notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
- return;
- }
-
- // Open again
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("Range", "bytes=" + (mission.length - 10) + "-" + mission.length);
-
- if (conn.getResponseCode() != 206) {
- // Fallback to single thread if no partial content support
- mission.fallback = true;
-
- if (DEBUG) {
- Log.d(TAG, "falling back");
- }
- }
-
- if (DEBUG) {
- Log.d(TAG, "response = " + conn.getResponseCode());
- }
-
- mission.blocks = mission.length / BLOCK_SIZE;
-
- if (mission.threadCount > mission.blocks) {
- mission.threadCount = (int) mission.blocks;
- }
-
- if (mission.threadCount <= 0) {
- mission.threadCount = 1;
- }
-
- if (mission.blocks * BLOCK_SIZE < mission.length) {
- mission.blocks++;
- }
-
-
- new File(mission.location).mkdirs();
- new File(mission.location + "/" + mission.name).createNewFile();
- RandomAccessFile af = new RandomAccessFile(mission.location + "/" + mission.name, "rw");
- af.setLength(mission.length);
- af.close();
-
- mission.start();
- } catch (IOException ie) {
- if(context == null) throw new RuntimeException(ie);
-
- if(ie.getMessage().contains("Permission denied")) {
- handler.post(() ->
- context.startActivity(new Intent(context, ExtSDDownloadFailedActivity.class)));
- } else throw new RuntimeException(ie);
- } catch (Exception e) {
- // TODO Notify
- throw new RuntimeException(e);
- }
- }
- }
-
- /**
- * Waits for mission to finish to add it to the {@link #mDownloadDataSource}
- */
- private class MissionListener implements DownloadMission.MissionListener {
- private final DownloadMission mMission;
-
- private MissionListener(DownloadMission mission) {
- if (mission == null) throw new NullPointerException("mission is null");
- // Could the mission be passed in onFinish()?
- mMission = mission;
- }
-
- @Override
- public void onProgressUpdate(DownloadMission downloadMission, long done, long total) {
- }
-
- @Override
- public void onFinish(DownloadMission downloadMission) {
- mDownloadDataSource.addMission(mMission);
- }
-
- @Override
- public void onError(DownloadMission downloadMission, int errCode) {
- }
- }
-}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
index 79c4baf05..c25d517f1 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java
@@ -1,102 +1,170 @@
package us.shandian.giga.get;
import android.os.Handler;
-import android.os.Looper;
+import android.os.Message;
import android.util.Log;
import java.io.File;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.lang.ref.WeakReference;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
+import javax.net.ssl.SSLException;
+
+import us.shandian.giga.postprocessing.Postprocessing;
+import us.shandian.giga.service.DownloadManagerService;
import us.shandian.giga.util.Utility;
import static org.schabi.newpipe.BuildConfig.DEBUG;
-public class DownloadMission implements Serializable {
- private static final long serialVersionUID = 0L;
+public class DownloadMission extends Mission {
+ private static final long serialVersionUID = 3L;// last bump: 8 november 2018
- private static final String TAG = DownloadMission.class.getSimpleName();
+ static final int BUFFER_SIZE = 64 * 1024;
+ final static int BLOCK_SIZE = 512 * 1024;
- public interface MissionListener {
- HashMap handlerStore = new HashMap<>();
+ private static final String TAG = "DownloadMission";
- void onProgressUpdate(DownloadMission downloadMission, long done, long total);
-
- void onFinish(DownloadMission downloadMission);
-
- void onError(DownloadMission downloadMission, int errCode);
- }
-
- public static final int ERROR_SERVER_UNSUPPORTED = 206;
- public static final int ERROR_UNKNOWN = 233;
+ public static final int ERROR_NOTHING = -1;
+ public static final int ERROR_PATH_CREATION = 1000;
+ public static final int ERROR_FILE_CREATION = 1001;
+ public static final int ERROR_UNKNOWN_EXCEPTION = 1002;
+ public static final int ERROR_PERMISSION_DENIED = 1003;
+ public static final int ERROR_SSL_EXCEPTION = 1004;
+ public static final int ERROR_UNKNOWN_HOST = 1005;
+ public static final int ERROR_CONNECT_HOST = 1006;
+ public static final int ERROR_POSTPROCESSING_FAILED = 1007;
+ public static final int ERROR_HTTP_NO_CONTENT = 204;
+ public static final int ERROR_HTTP_UNSUPPORTED_RANGE = 206;
/**
- * The filename
+ * The urls of the file to download
*/
- public String name;
+ public String[] urls;
/**
- * The url of the file to download
+ * Number of blocks the size of {@link DownloadMission#BLOCK_SIZE}
*/
- public String url;
-
- /**
- * The directory to store the download
- */
- public String location;
-
- /**
- * Number of blocks the size of {@link DownloadManager#BLOCK_SIZE}
- */
- public long blocks;
-
- /**
- * Number of bytes
- */
- public long length;
+ long blocks = -1;
/**
* Number of bytes downloaded
*/
public long done;
+
+ /**
+ * Indicates a file generated dynamically on the web server
+ */
+ public boolean unknownLength;
+
+ /**
+ * offset in the file where the data should be written
+ */
+ public long[] offsets;
+
+ /**
+ * The post-processing algorithm arguments
+ */
+ public String[] postprocessingArgs;
+
+ /**
+ * The post-processing algorithm name
+ */
+ public String postprocessingName;
+
+ /**
+ * Indicates if the post-processing algorithm is actually running, used to detect corrupt downloads
+ */
+ public boolean postprocessingRunning;
+
+ /**
+ * Indicate if the post-processing algorithm works on the same file
+ */
+ public boolean postprocessingThis;
+
+ /**
+ * The current resource to download {@code urls[current]}
+ */
+ public int current;
+
+ /**
+ * Metadata where the mission state is saved
+ */
+ public File metadata;
+
+ /**
+ * maximum attempts
+ */
+ public int maxRetry;
+
+ /**
+ * Approximated final length, this represent the sum of all resources sizes
+ */
+ public long nearLength;
+
public int threadCount = 3;
- public int finishCount;
- private final List threadPositions = new ArrayList<>();
- public final Map blockState = new HashMap<>();
- public boolean running;
- public boolean finished;
- public boolean fallback;
- public int errCode = -1;
- public long timestamp;
+ boolean fallback;
+ private int finishCount;
+ public transient boolean running;
+ public transient boolean enqueued = true;
+ public int errCode = ERROR_NOTHING;
+
+ public transient Exception errObject = null;
public transient boolean recovered;
-
- private transient ArrayList> mListeners = new ArrayList<>();
+ public transient Handler mHandler;
private transient boolean mWritingToFile;
- private static final int NO_IDENTIFIER = -1;
+ @SuppressWarnings("UseSparseArrays")// LongSparseArray is not serializable
+ final HashMap blockState = new HashMap<>();
+ final List threadBlockPositions = new ArrayList<>();
+ final List threadBytePositions = new ArrayList<>();
+
+ private transient boolean deleted;
+ int currentThreadCount;
+ private transient Thread[] threads = new Thread[0];
+ private transient Thread init = null;
+
+
+ protected DownloadMission() {
- public DownloadMission() {
}
- public DownloadMission(String name, String url, String location) {
+ public DownloadMission(String url, String name, String location, char kind) {
+ this(new String[]{url}, name, location, kind, null, null);
+ }
+
+ public DownloadMission(String[] urls, String name, String location, char kind, String postprocessingName, String[] postprocessingArgs) {
if (name == null) throw new NullPointerException("name is null");
if (name.isEmpty()) throw new IllegalArgumentException("name is empty");
- if (url == null) throw new NullPointerException("url is null");
- if (url.isEmpty()) throw new IllegalArgumentException("url is empty");
+ if (urls == null) throw new NullPointerException("urls is null");
+ if (urls.length < 1) throw new IllegalArgumentException("urls is empty");
if (location == null) throw new NullPointerException("location is null");
if (location.isEmpty()) throw new IllegalArgumentException("location is empty");
- this.url = url;
+ this.urls = urls;
this.name = name;
this.location = location;
- }
+ this.kind = kind;
+ this.offsets = new long[urls.length];
+ if (postprocessingName != null) {
+ Postprocessing algorithm = Postprocessing.getAlgorithm(postprocessingName, null);
+ this.postprocessingThis = algorithm.worksOnSameFile;
+ this.offsets[0] = algorithm.recommendedReserve;
+ this.postprocessingName = postprocessingName;
+ this.postprocessingArgs = postprocessingArgs;
+ } else {
+ if (DEBUG && urls.length > 1) {
+ Log.w(TAG, "mission created with multiple urls ¿missing post-processing algorithm?");
+ }
+ }
+ }
private void checkBlock(long block) {
if (block < 0 || block >= blocks) {
@@ -110,12 +178,12 @@ public class DownloadMission implements Serializable {
* @param block the block identifier
* @return true if the block is reserved and false if otherwise
*/
- public boolean isBlockPreserved(long block) {
+ boolean isBlockPreserved(long block) {
checkBlock(block);
return blockState.containsKey(block) ? blockState.get(block) : false;
}
- public void preserveBlock(long block) {
+ void preserveBlock(long block) {
checkBlock(block);
synchronized (blockState) {
blockState.put(block, true);
@@ -123,125 +191,211 @@ public class DownloadMission implements Serializable {
}
/**
- * Set the download position of the file
+ * Set the block of the file
*
* @param threadId the identifier of the thread
- * @param position the download position of the thread
+ * @param position the block of the thread
*/
- public void setPosition(int threadId, long position) {
- threadPositions.set(threadId, position);
+ void setBlockPosition(int threadId, long position) {
+ threadBlockPositions.set(threadId, position);
}
/**
- * Get the position of a thread
+ * Get the block of a file
*
* @param threadId the identifier of the thread
- * @return the position for the thread
+ * @return the block for the thread
*/
- public long getPosition(int threadId) {
- return threadPositions.get(threadId);
+ long getBlockPosition(int threadId) {
+ return threadBlockPositions.get(threadId);
}
- public synchronized void notifyProgress(long deltaLen) {
+ /**
+ * Save the position of the desired thread
+ *
+ * @param threadId the identifier of the thread
+ * @param position the relative position in bytes or zero
+ */
+ void setThreadBytePosition(int threadId, long position) {
+ threadBytePositions.set(threadId, position);
+ }
+
+ /**
+ * Get position inside of the thread, where thread will be resumed
+ *
+ * @param threadId the identifier of the thread
+ * @return the relative position in bytes or zero
+ */
+ long getThreadBytePosition(int threadId) {
+ return threadBytePositions.get(threadId);
+ }
+
+ /**
+ * Open connection
+ *
+ * @param threadId id of the calling thread, used only for debug
+ * @param rangeStart range start
+ * @param rangeEnd range end
+ * @return a {@link java.net.URLConnection URLConnection} linking to the URL.
+ * @throws IOException if an I/O exception occurs.
+ */
+ HttpURLConnection openConnection(int threadId, long rangeStart, long rangeEnd) throws IOException {
+ URL url = new URL(urls[current]);
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ conn.setInstanceFollowRedirects(true);
+
+ if (rangeStart >= 0) {
+ String req = "bytes=" + rangeStart + "-";
+ if (rangeEnd > 0) req += rangeEnd;
+
+ conn.setRequestProperty("Range", req);
+
+ if (DEBUG) {
+ Log.d(TAG, threadId + ":" + conn.getRequestProperty("Range"));
+ }
+ }
+
+ return conn;
+ }
+
+ /**
+ * @param threadId id of the calling thread
+ * @param conn Opens and establish the communication
+ * @throws IOException if an error occurred connecting to the server.
+ * @throws HttpError if the HTTP Status-Code is not satisfiable
+ */
+ void establishConnection(int threadId, HttpURLConnection conn) throws IOException, HttpError {
+ conn.connect();
+ int statusCode = conn.getResponseCode();
+
+ if (DEBUG) {
+ Log.d(TAG, threadId + ":Content-Length=" + conn.getContentLength() + " Code:" + statusCode);
+ }
+
+ switch (statusCode) {
+ case 204:
+ case 205:
+ case 207:
+ throw new HttpError(conn.getResponseCode());
+ case 416:
+ return;// let the download thread handle this error
+ default:
+ if (statusCode < 200 || statusCode > 299) {
+ throw new HttpError(statusCode);
+ }
+ }
+
+ }
+
+
+ private void notify(int what) {
+ Message m = new Message();
+ m.what = what;
+ m.obj = this;
+
+ mHandler.sendMessage(m);
+ }
+
+ synchronized void notifyProgress(long deltaLen) {
if (!running) return;
if (recovered) {
recovered = false;
}
+ if (unknownLength) {
+ length += deltaLen;// Update length before proceeding
+ }
+
done += deltaLen;
if (done > length) {
done = length;
}
- if (done != length) {
- writeThisToFile();
+ if (done != length && !deleted && !mWritingToFile) {
+ mWritingToFile = true;
+ runAsync(-2, this::writeThisToFile);
}
- for (WeakReference ref : mListeners) {
- final MissionListener listener = ref.get();
- if (listener != null) {
- MissionListener.handlerStore.get(listener).post(new Runnable() {
- @Override
- public void run() {
- listener.onProgressUpdate(DownloadMission.this, done, length);
- }
- });
- }
+ notify(DownloadManagerService.MESSAGE_PROGRESS);
+ }
+
+ synchronized void notifyError(Exception err) {
+ Log.e(TAG, "notifyError()", err);
+
+ if (err instanceof FileNotFoundException) {
+ notifyError(ERROR_FILE_CREATION, null);
+ } else if (err instanceof SSLException) {
+ notifyError(ERROR_SSL_EXCEPTION, null);
+ } else if (err instanceof HttpError) {
+ notifyError(((HttpError) err).statusCode, null);
+ } else if (err instanceof ConnectException) {
+ notifyError(ERROR_CONNECT_HOST, null);
+ } else if (err instanceof UnknownHostException) {
+ notifyError(ERROR_UNKNOWN_HOST, null);
+ } else {
+ notifyError(ERROR_UNKNOWN_EXCEPTION, err);
}
}
- /**
- * Called by a download thread when it finished.
- */
- public synchronized void notifyFinished() {
- if (errCode > 0) return;
+ synchronized void notifyError(int code, Exception err) {
+ Log.e(TAG, "notifyError() code = " + code, err);
+
+ errCode = code;
+ errObject = err;
+
+ pause();
+
+ notify(DownloadManagerService.MESSAGE_ERROR);
+ }
+
+ synchronized void notifyFinished() {
+ if (errCode > ERROR_NOTHING) return;
finishCount++;
- if (finishCount == threadCount) {
- onFinish();
+ if (finishCount == currentThreadCount) {
+ if (errCode > ERROR_NOTHING) return;
+
+ if (DEBUG) {
+ Log.d(TAG, "onFinish" + (current + 1) + "/" + urls.length);
+ }
+
+ if ((current + 1) < urls.length) {
+ // prepare next sub-mission
+ long current_offset = offsets[current++];
+ offsets[current] = current_offset + length;
+ initializer();
+ return;
+ }
+
+ current++;
+ unknownLength = false;
+
+ if (!doPostprocessing()) return;
+
+ running = false;
+ deleteThisFromFile();
+
+ notify(DownloadManagerService.MESSAGE_FINISHED);
}
}
- /**
- * Called when all parts are downloaded
- */
- private void onFinish() {
- if (errCode > 0) return;
-
+ private void notifyPostProcessing(boolean processing) {
if (DEBUG) {
- Log.d(TAG, "onFinish");
+ Log.d(TAG, (processing ? "enter" : "exit") + " postprocessing on " + location + File.separator + name);
}
- running = false;
- finished = true;
-
- deleteThisFromFile();
-
- for (WeakReference ref : mListeners) {
- final MissionListener listener = ref.get();
- if (listener != null) {
- MissionListener.handlerStore.get(listener).post(new Runnable() {
- @Override
- public void run() {
- listener.onFinish(DownloadMission.this);
- }
- });
+ synchronized (blockState) {
+ if (!processing) {
+ postprocessingName = null;
+ postprocessingArgs = null;
}
- }
- }
- public synchronized void notifyError(int err) {
- errCode = err;
-
- writeThisToFile();
-
- for (WeakReference ref : mListeners) {
- final MissionListener listener = ref.get();
- MissionListener.handlerStore.get(listener).post(new Runnable() {
- @Override
- public void run() {
- listener.onError(DownloadMission.this, errCode);
- }
- });
- }
- }
-
- public synchronized void addListener(MissionListener listener) {
- Handler handler = new Handler(Looper.getMainLooper());
- MissionListener.handlerStore.put(listener, handler);
- mListeners.add(new WeakReference<>(listener));
- }
-
- public synchronized void removeListener(MissionListener listener) {
- for (Iterator> iterator = mListeners.iterator();
- iterator.hasNext(); ) {
- WeakReference weakRef = iterator.next();
- if (listener != null && listener == weakRef.get()) {
- iterator.remove();
- }
+ // don't return without fully write the current state
+ postprocessingRunning = processing;
+ Utility.writeToFile(metadata, DownloadMission.this);
}
}
@@ -249,92 +403,257 @@ public class DownloadMission implements Serializable {
* Start downloading with multiple threads.
*/
public void start() {
- if (!running && !finished) {
- running = true;
+ if (running || current >= urls.length) return;
- if (!fallback) {
- for (int i = 0; i < threadCount; i++) {
- if (threadPositions.size() <= i && !recovered) {
- threadPositions.add((long) i);
- }
- new Thread(new DownloadRunnable(this, i)).start();
- }
- } else {
- // In fallback mode, resuming is not supported.
- threadCount = 1;
+ // ensure that the previous state is completely paused.
+ joinForThread(init);
+ for (Thread thread : threads) joinForThread(thread);
+
+ enqueued = false;
+ running = true;
+ errCode = ERROR_NOTHING;
+
+ if (blocks < 0) {
+ initializer();
+ return;
+ }
+
+ init = null;
+
+ if (threads.length < 1) {
+ threads = new Thread[currentThreadCount];
+ }
+
+ if (fallback) {
+ if (unknownLength) {
done = 0;
- blocks = 0;
- new Thread(new DownloadRunnableFallback(this)).start();
+ length = 0;
+ }
+
+ threads[0] = runAsync(1, new DownloadRunnableFallback(this));
+ } else {
+ for (int i = 0; i < currentThreadCount; i++) {
+ threads[i] = runAsync(i + 1, new DownloadRunnable(this, i));
}
}
}
- public void pause() {
- if (running) {
- running = false;
- recovered = true;
+ /**
+ * Pause the mission, does not affect the blocks that are being downloaded.
+ */
+ public synchronized void pause() {
+ if (!running) return;
- // TODO: Notify & Write state to info file
- // if (err)
+ running = false;
+ recovered = true;
+ enqueued = false;
+
+ if (postprocessingRunning) {
+ if (DEBUG) {
+ Log.w(TAG, "pause during post-processing is not applicable.");
+ }
+ return;
}
+
+ if (init != null && init.isAlive()) {
+ init.interrupt();
+ synchronized (blockState) {
+ resetState();
+ }
+ return;
+ }
+
+ if (DEBUG && blocks == 0) {
+ Log.w(TAG, "pausing a download that can not be resumed (range requests not allowed by the server).");
+ }
+
+ if (threads == null || Thread.currentThread().isInterrupted()) {
+ writeThisToFile();
+ return;
+ }
+
+ // wait for all threads are suspended before save the state
+ runAsync(-1, () -> {
+ try {
+ for (Thread thread : threads) {
+ if (thread.isAlive()) {
+ thread.interrupt();
+ thread.join(5000);
+ }
+ }
+ } catch (Exception e) {
+ // nothing to do
+ } finally {
+ writeThisToFile();
+ }
+ });
}
/**
* Removes the file and the meta file
*/
- public void delete() {
- deleteThisFromFile();
- new File(location, name).delete();
+ @Override
+ public boolean delete() {
+ deleted = true;
+ boolean res = deleteThisFromFile();
+ if (!super.delete()) res = false;
+ return res;
+ }
+
+ void resetState() {
+ done = 0;
+ blocks = -1;
+ errCode = ERROR_NOTHING;
+ fallback = false;
+ unknownLength = false;
+ finishCount = 0;
+ threadBlockPositions.clear();
+ threadBytePositions.clear();
+ blockState.clear();
+ threads = new Thread[0];
+
+ Utility.writeToFile(metadata, DownloadMission.this);
+ }
+
+ private void initializer() {
+ init = runAsync(DownloadInitializer.mId, new DownloadInitializer(this));
+
}
/**
* Write this {@link DownloadMission} to the meta file asynchronously
* if no thread is already running.
*/
- public void writeThisToFile() {
- if (!mWritingToFile) {
- mWritingToFile = true;
- new Thread() {
- @Override
- public void run() {
- doWriteThisToFile();
- mWritingToFile = false;
- }
- }.start();
- }
- }
-
- /**
- * Write this {@link DownloadMission} to the meta file.
- */
- private void doWriteThisToFile() {
+ private void writeThisToFile() {
synchronized (blockState) {
- Utility.writeToFile(getMetaFilename(), this);
+ if (deleted) return;
+ Utility.writeToFile(metadata, DownloadMission.this);
+ }
+ mWritingToFile = false;
+ }
+
+ public boolean isFinished() {
+ return current >= urls.length && postprocessingName == null;
+ }
+
+ public long getLength() {
+ long calculated;
+ if (postprocessingRunning) {
+ calculated = length;
+ } else {
+ calculated = offsets[current < offsets.length ? current : (offsets.length - 1)] + length;
+ }
+
+ calculated -= offsets[0];// don't count reserved space
+
+ return calculated > nearLength ? calculated : nearLength;
+ }
+
+ private boolean doPostprocessing() {
+ if (postprocessingName == null) return true;
+
+ try {
+ notifyPostProcessing(true);
+ notifyProgress(0);
+
+ Thread.currentThread().setName("[" + TAG + "] post-processing = " + postprocessingName + " filename = " + name);
+
+ Postprocessing algorithm = Postprocessing.getAlgorithm(postprocessingName, this);
+ algorithm.run();
+ } catch (Exception err) {
+ StringBuilder args = new StringBuilder(" ");
+ if (postprocessingArgs != null) {
+ for (String arg : postprocessingArgs) {
+ args.append(", ");
+ args.append(arg);
+ }
+ args.delete(0, 1);
+ }
+ Log.e(TAG, String.format("Post-processing failed. algorithm = %s args = [%s]", postprocessingName, args), err);
+
+ notifyError(ERROR_POSTPROCESSING_FAILED, err);
+ return false;
+ } finally {
+ notifyPostProcessing(false);
+ }
+
+ if (errCode != ERROR_NOTHING) notify(DownloadManagerService.MESSAGE_ERROR);
+
+ return errCode == ERROR_NOTHING;
+ }
+
+ private boolean deleteThisFromFile() {
+ synchronized (blockState) {
+ return metadata.delete();
}
}
- private void readObject(ObjectInputStream inputStream)
- throws java.io.IOException, ClassNotFoundException
- {
- inputStream.defaultReadObject();
- mListeners = new ArrayList<>();
- }
-
- private void deleteThisFromFile() {
- new File(getMetaFilename()).delete();
+ /**
+ * run a new thread
+ *
+ * @param id id of new thread (used for debugging only)
+ * @param who the Runnable whose {@code run} method is invoked.
+ */
+ private void runAsync(int id, Runnable who) {
+ runAsync(id, new Thread(who));
}
/**
- * Get the path of the meta file
+ * run a new thread
*
- * @return the path to the meta file
+ * @param id id of new thread (used for debugging only)
+ * @param who the Thread whose {@code run} method is invoked when this thread is started
+ * @return the passed thread
*/
- private String getMetaFilename() {
- return location + "/" + name + ".giga";
+ private Thread runAsync(int id, Thread who) {
+ // known thread ids:
+ // -2: state saving by notifyProgress() method
+ // -1: wait for saving the state by pause() method
+ // 0: initializer
+ // >=1: any download thread
+
+ if (DEBUG) {
+ who.setName(String.format("%s[%s] %s", TAG, id, name));
+ }
+
+ who.start();
+
+ return who;
}
- public File getDownloadedFile() {
- return new File(location, name);
+ private void joinForThread(Thread thread) {
+ if (thread == null || !thread.isAlive()) return;
+ if (thread == Thread.currentThread()) return;
+
+ if (DEBUG) {
+ Log.w(TAG, "a thread is !still alive!: " + thread.getName());
+ }
+
+ // still alive, this should not happen.
+ // Possible reasons:
+ // slow device
+ // the user is spamming start/pause buttons
+ // start() method called quickly after pause()
+
+ try {
+ thread.join(10000);
+ } catch (InterruptedException e) {
+ Log.d(TAG, "timeout on join : " + thread.getName());
+ throw new RuntimeException("A thread is still running:\n" + thread.getName());
+ }
}
+
+ static class HttpError extends Exception {
+ int statusCode;
+
+ HttpError(int statusCode) {
+ this.statusCode = statusCode;
+ }
+
+ @Override
+ public String getMessage() {
+ return "HTTP " + String.valueOf(statusCode);
+ }
+ }
}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
index 6ad8626c3..244fbd47a 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java
@@ -2,9 +2,11 @@ package us.shandian.giga.get;
import android.util.Log;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.io.RandomAccessFile;
import java.net.HttpURLConnection;
-import java.net.URL;
+import java.nio.channels.ClosedByInterruptException;
import static org.schabi.newpipe.BuildConfig.DEBUG;
@@ -12,142 +14,166 @@ import static org.schabi.newpipe.BuildConfig.DEBUG;
* Runnable to download blocks of a file until the file is completely downloaded,
* an error occurs or the process is stopped.
*/
-public class DownloadRunnable implements Runnable {
+public class DownloadRunnable extends Thread {
private static final String TAG = DownloadRunnable.class.getSimpleName();
private final DownloadMission mMission;
private final int mId;
- public DownloadRunnable(DownloadMission mission, int id) {
+ private HttpURLConnection mConn;
+
+ DownloadRunnable(DownloadMission mission, int id) {
if (mission == null) throw new NullPointerException("mission is null");
mMission = mission;
mId = id;
+ mConn = null;
}
@Override
public void run() {
boolean retry = mMission.recovered;
- long position = mMission.getPosition(mId);
+ long blockPosition = mMission.getBlockPosition(mId);
+ int retryCount = 0;
if (DEBUG) {
- Log.d(TAG, mId + ":default pos " + position);
+ Log.d(TAG, mId + ":default pos " + blockPosition);
Log.d(TAG, mId + ":recovered: " + mMission.recovered);
}
- while (mMission.errCode == -1 && mMission.running && position < mMission.blocks) {
+ RandomAccessFile f;
+ InputStream is = null;
- if (Thread.currentThread().isInterrupted()) {
- mMission.pause();
- return;
- }
+ try {
+ f = new RandomAccessFile(mMission.getDownloadedFile(), "rw");
+ } catch (FileNotFoundException e) {
+ mMission.notifyError(e);// this never should happen
+ return;
+ }
+
+ while (mMission.running && mMission.errCode == DownloadMission.ERROR_NOTHING && blockPosition < mMission.blocks) {
if (DEBUG && retry) {
- Log.d(TAG, mId + ":retry is true. Resuming at " + position);
+ Log.d(TAG, mId + ":retry is true. Resuming at " + blockPosition);
}
// Wait for an unblocked position
- while (!retry && position < mMission.blocks && mMission.isBlockPreserved(position)) {
+ while (!retry && blockPosition < mMission.blocks && mMission.isBlockPreserved(blockPosition)) {
if (DEBUG) {
- Log.d(TAG, mId + ":position " + position + " preserved, passing");
+ Log.d(TAG, mId + ":position " + blockPosition + " preserved, passing");
}
- position++;
+ blockPosition++;
}
retry = false;
- if (position >= mMission.blocks) {
+ if (blockPosition >= mMission.blocks) {
break;
}
if (DEBUG) {
- Log.d(TAG, mId + ":preserving position " + position);
+ Log.d(TAG, mId + ":preserving position " + blockPosition);
}
- mMission.preserveBlock(position);
- mMission.setPosition(mId, position);
+ mMission.preserveBlock(blockPosition);
+ mMission.setBlockPosition(mId, blockPosition);
- long start = position * DownloadManager.BLOCK_SIZE;
- long end = start + DownloadManager.BLOCK_SIZE - 1;
+ long start = blockPosition * DownloadMission.BLOCK_SIZE;
+ long end = start + DownloadMission.BLOCK_SIZE - 1;
+ long offset = mMission.getThreadBytePosition(mId);
+
+ start += offset;
if (end >= mMission.length) {
end = mMission.length - 1;
}
- HttpURLConnection conn = null;
-
- int total = 0;
+ long total = 0;
try {
- URL url = new URL(mMission.url);
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("Range", "bytes=" + start + "-" + end);
+ mConn = mMission.openConnection(mId, start, end);
+ mMission.establishConnection(mId, mConn);
- if (DEBUG) {
- Log.d(TAG, mId + ":" + conn.getRequestProperty("Range"));
- Log.d(TAG, mId + ":Content-Length=" + conn.getContentLength() + " Code:" + conn.getResponseCode());
+ // check if the download can be resumed
+ if (mConn.getResponseCode() == 416 && offset > 0) {
+ retryCount--;
+ throw new DownloadMission.HttpError(416);
}
- // A server may be ignoring the range request
- if (conn.getResponseCode() != 206) {
- mMission.errCode = DownloadMission.ERROR_SERVER_UNSUPPORTED;
- notifyError();
+ // The server may be ignoring the range request
+ if (mConn.getResponseCode() != 206) {
+ mMission.notifyError(new DownloadMission.HttpError(mConn.getResponseCode()));
if (DEBUG) {
- Log.e(TAG, mId + ":Unsupported " + conn.getResponseCode());
+ Log.e(TAG, mId + ":Unsupported " + mConn.getResponseCode());
}
break;
}
- RandomAccessFile f = new RandomAccessFile(mMission.location + "/" + mMission.name, "rw");
- f.seek(start);
- java.io.InputStream ipt = conn.getInputStream();
- byte[] buf = new byte[64*1024];
+ f.seek(mMission.offsets[mMission.current] + start);
- while (start < end && mMission.running) {
- int len = ipt.read(buf, 0, buf.length);
+ is = mConn.getInputStream();
- if (len == -1) {
- break;
- } else {
- start += len;
- total += len;
- f.write(buf, 0, len);
- notifyProgress(len);
- }
+ byte[] buf = new byte[DownloadMission.BUFFER_SIZE];
+ int len;
+
+ while (start < end && mMission.running && (len = is.read(buf, 0, buf.length)) != -1) {
+ f.write(buf, 0, len);
+ start += len;
+ total += len;
+ mMission.notifyProgress(len);
}
if (DEBUG && mMission.running) {
- Log.d(TAG, mId + ":position " + position + " finished, total length " + total);
+ Log.d(TAG, mId + ":position " + blockPosition + " finished, " + total + " bytes downloaded");
}
- f.close();
- ipt.close();
+ if (mMission.running)
+ mMission.setThreadBytePosition(mId, 0L);// clear byte position for next block
+ else
+ mMission.setThreadBytePosition(mId, total);// download paused, save progress for this block
- // TODO We should save progress for each thread
} catch (Exception e) {
- // TODO Retry count limit & notify error
- retry = true;
+ mMission.setThreadBytePosition(mId, total);
- notifyProgress(-total);
+ if (!mMission.running || e instanceof ClosedByInterruptException) break;
+
+ if (retryCount++ >= mMission.maxRetry) {
+ mMission.notifyError(e);
+ break;
+ }
if (DEBUG) {
- Log.d(TAG, mId + ":position " + position + " retrying", e);
+ Log.d(TAG, mId + ":position " + blockPosition + " retrying due exception", e);
}
+
+ retry = true;
}
}
+ try {
+ if (is != null) is.close();
+ } catch (Exception err) {
+ // nothing to do
+ }
+
+ try {
+ f.close();
+ } catch (Exception err) {
+ // ¿ejected media storage? ¿file deleted? ¿storage ran out of space?
+ }
+
if (DEBUG) {
- Log.d(TAG, "thread " + mId + " exited main loop");
+ Log.d(TAG, "thread " + mId + " exited from main download loop");
}
- if (mMission.errCode == -1 && mMission.running) {
+ if (mMission.errCode == DownloadMission.ERROR_NOTHING && mMission.running) {
if (DEBUG) {
Log.d(TAG, "no error has happened, notifying");
}
- notifyFinished();
+ mMission.notifyFinished();
}
if (DEBUG && !mMission.running) {
@@ -155,22 +181,15 @@ public class DownloadRunnable implements Runnable {
}
}
- private void notifyProgress(final long len) {
- synchronized (mMission) {
- mMission.notifyProgress(len);
+ @Override
+ public void interrupt() {
+ super.interrupt();
+
+ try {
+ if (mConn != null) mConn.disconnect();
+ } catch (Exception e) {
+ // nothing to do
}
}
- private void notifyError() {
- synchronized (mMission) {
- mMission.notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
- mMission.pause();
- }
- }
-
- private void notifyFinished() {
- synchronized (mMission) {
- mMission.notifyFinished();
- }
- }
}
diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
index f24139910..4bcaeaf85 100644
--- a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
+++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java
@@ -1,74 +1,139 @@
package us.shandian.giga.get;
-import java.io.BufferedInputStream;
+import android.annotation.SuppressLint;
+import android.support.annotation.NonNull;
+import android.util.Log;
+
+import java.io.IOException;
+import java.io.InputStream;
import java.io.RandomAccessFile;
import java.net.HttpURLConnection;
-import java.net.URL;
+import java.nio.channels.ClosedByInterruptException;
+
+
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+/**
+ * Single-threaded fallback mode
+ */
+public class DownloadRunnableFallback extends Thread {
+ private static final String TAG = "DownloadRunnableFallback";
-// Single-threaded fallback mode
-public class DownloadRunnableFallback implements Runnable {
private final DownloadMission mMission;
- //private int mId;
+ private final int mId = 1;
- public DownloadRunnableFallback(DownloadMission mission) {
- if (mission == null) throw new NullPointerException("mission is null");
- //mId = id;
+ private int mRetryCount = 0;
+ private InputStream mIs;
+ private RandomAccessFile mF;
+ private HttpURLConnection mConn;
+
+ DownloadRunnableFallback(@NonNull DownloadMission mission) {
mMission = mission;
+ mIs = null;
+ mF = null;
+ mConn = null;
+ }
+
+ private void dispose() {
+ try {
+ if (mIs != null) mIs.close();
+ } catch (IOException e) {
+ // nothing to do
+ }
+
+ try {
+ if (mF != null) mF.close();
+ } catch (IOException e) {
+ // ¿ejected media storage? ¿file deleted? ¿storage ran out of space?
+ }
}
@Override
+ @SuppressLint("LongLogTag")
public void run() {
- try {
- URL url = new URL(mMission.url);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ boolean done;
- if (conn.getResponseCode() != 200 && conn.getResponseCode() != 206) {
- notifyError(DownloadMission.ERROR_SERVER_UNSUPPORTED);
- } else {
- RandomAccessFile f = new RandomAccessFile(mMission.location + "/" + mMission.name, "rw");
- f.seek(0);
- BufferedInputStream ipt = new BufferedInputStream(conn.getInputStream());
- byte[] buf = new byte[512];
- int len = 0;
+ long start = 0;
- while ((len = ipt.read(buf, 0, 512)) != -1 && mMission.running) {
- f.write(buf, 0, len);
- notifyProgress(len);
-
- if (Thread.interrupted()) {
- break;
- }
-
- }
-
- f.close();
- ipt.close();
+ if (!mMission.unknownLength) {
+ start = mMission.getThreadBytePosition(0);
+ if (DEBUG && start > 0) {
+ Log.i(TAG, "Resuming a single-thread download at " + start);
}
+ }
+
+ try {
+ long rangeStart = (mMission.unknownLength || start < 1) ? -1 : start;
+
+ mConn = mMission.openConnection(mId, rangeStart, -1);
+ mMission.establishConnection(mId, mConn);
+
+ // check if the download can be resumed
+ if (mConn.getResponseCode() == 416 && start > 0) {
+ start = 0;
+ mRetryCount--;
+ throw new DownloadMission.HttpError(416);
+ }
+
+ // secondary check for the file length
+ if (!mMission.unknownLength)
+ mMission.unknownLength = Utility.getContentLength(mConn) == -1;
+
+ mF = new RandomAccessFile(mMission.getDownloadedFile(), "rw");
+ mF.seek(mMission.offsets[mMission.current] + start);
+
+ mIs = mConn.getInputStream();
+
+ byte[] buf = new byte[64 * 1024];
+ int len = 0;
+
+ while (mMission.running && (len = mIs.read(buf, 0, buf.length)) != -1) {
+ mF.write(buf, 0, len);
+ start += len;
+ mMission.notifyProgress(len);
+ }
+
+ // if thread goes interrupted check if the last part mIs written. This avoid re-download the whole file
+ done = len == -1;
} catch (Exception e) {
- notifyError(DownloadMission.ERROR_UNKNOWN);
+ dispose();
+
+ // save position
+ mMission.setThreadBytePosition(0, start);
+
+ if (!mMission.running || e instanceof ClosedByInterruptException) return;
+
+ if (mRetryCount++ >= mMission.maxRetry) {
+ mMission.notifyError(e);
+ return;
+ }
+
+ run();// try again
+ return;
}
- if (mMission.errCode == -1 && mMission.running) {
- notifyFinished();
- }
- }
+ dispose();
- private void notifyProgress(final long len) {
- synchronized (mMission) {
- mMission.notifyProgress(len);
- }
- }
-
- private void notifyError(final int err) {
- synchronized (mMission) {
- mMission.notifyError(err);
- mMission.pause();
- }
- }
-
- private void notifyFinished() {
- synchronized (mMission) {
+ if (done) {
mMission.notifyFinished();
+ } else {
+ mMission.setThreadBytePosition(0, start);
+ }
+ }
+
+ @Override
+ public void interrupt() {
+ super.interrupt();
+
+ if (mConn != null) {
+ try {
+ mConn.disconnect();
+ } catch (Exception e) {
+ // nothing to do
+ }
+
}
}
}
diff --git a/app/src/main/java/us/shandian/giga/get/FinishedMission.java b/app/src/main/java/us/shandian/giga/get/FinishedMission.java
new file mode 100644
index 000000000..b7d6908a5
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/FinishedMission.java
@@ -0,0 +1,16 @@
+package us.shandian.giga.get;
+
+public class FinishedMission extends Mission {
+
+ public FinishedMission() {
+ }
+
+ public FinishedMission(DownloadMission mission) {
+ source = mission.source;
+ length = mission.length;// ¿or mission.done?
+ timestamp = mission.timestamp;
+ name = mission.name;
+ location = mission.location;
+ kind = mission.kind;
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/get/Mission.java b/app/src/main/java/us/shandian/giga/get/Mission.java
new file mode 100644
index 000000000..ec2ddaa26
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/Mission.java
@@ -0,0 +1,66 @@
+package us.shandian.giga.get;
+
+import java.io.File;
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+
+public abstract class Mission implements Serializable {
+ private static final long serialVersionUID = 0L;// last bump: 5 october 2018
+
+ /**
+ * Source url of the resource
+ */
+ public String source;
+
+ /**
+ * Length of the current resource
+ */
+ public long length;
+
+ /**
+ * creation timestamp (and maybe unique identifier)
+ */
+ public long timestamp;
+
+ /**
+ * The filename
+ */
+ public String name;
+
+ /**
+ * The directory to store the download
+ */
+ public String location;
+
+ /**
+ * pre-defined content type
+ */
+ public char kind;
+
+ /**
+ * get the target file on the storage
+ *
+ * @return File object
+ */
+ public File getDownloadedFile() {
+ return new File(location, name);
+ }
+
+ public boolean delete() {
+ deleted = true;
+ return getDownloadedFile().delete();
+ }
+
+ /**
+ * Indicate if this mission is deleted whatever is stored
+ */
+ public transient boolean deleted = false;
+
+ @Override
+ public String toString() {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(timestamp);
+ return "[" + calendar.getTime().toString() + "] " + location + File.separator + name;
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java
new file mode 100644
index 000000000..4b4d5d733
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadDataSource.java
@@ -0,0 +1,73 @@
+package us.shandian.giga.get.sqlite;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.get.Mission;
+
+import static us.shandian.giga.get.sqlite.DownloadMissionHelper.KEY_LOCATION;
+import static us.shandian.giga.get.sqlite.DownloadMissionHelper.KEY_NAME;
+import static us.shandian.giga.get.sqlite.DownloadMissionHelper.MISSIONS_TABLE_NAME;
+
+public class DownloadDataSource {
+
+ private static final String TAG = "DownloadDataSource";
+ private final DownloadMissionHelper downloadMissionHelper;
+
+ public DownloadDataSource(Context context) {
+ downloadMissionHelper = new DownloadMissionHelper(context);
+ }
+
+ public ArrayList loadFinishedMissions() {
+ SQLiteDatabase database = downloadMissionHelper.getReadableDatabase();
+ Cursor cursor = database.query(MISSIONS_TABLE_NAME, null, null,
+ null, null, null, DownloadMissionHelper.KEY_TIMESTAMP);
+
+ int count = cursor.getCount();
+ if (count == 0) return new ArrayList<>(1);
+
+ ArrayList result = new ArrayList<>(count);
+ while (cursor.moveToNext()) {
+ result.add(DownloadMissionHelper.getMissionFromCursor(cursor));
+ }
+
+ return result;
+ }
+
+ public void addMission(DownloadMission downloadMission) {
+ if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+ SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
+ ContentValues values = DownloadMissionHelper.getValuesOfMission(downloadMission);
+ database.insert(MISSIONS_TABLE_NAME, null, values);
+ }
+
+ public void deleteMission(Mission downloadMission) {
+ if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+ SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
+ database.delete(MISSIONS_TABLE_NAME,
+ KEY_LOCATION + " = ? AND " +
+ KEY_NAME + " = ?",
+ new String[]{downloadMission.location, downloadMission.name});
+ }
+
+ public void updateMission(DownloadMission downloadMission) {
+ if (downloadMission == null) throw new NullPointerException("downloadMission is null");
+ SQLiteDatabase database = downloadMissionHelper.getWritableDatabase();
+ ContentValues values = DownloadMissionHelper.getValuesOfMission(downloadMission);
+ String whereClause = KEY_LOCATION + " = ? AND " +
+ KEY_NAME + " = ?";
+ int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
+ whereClause, new String[]{downloadMission.location, downloadMission.name});
+ if (rowsAffected != 1) {
+ Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
+ }
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java
similarity index 63%
rename from app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
rename to app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java
index d5a83551b..6dadc98c8 100644
--- a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionHelper.java
@@ -7,19 +7,19 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
/**
- * SqliteHelper to store {@link us.shandian.giga.get.DownloadMission}
+ * SQLiteHelper to store finished {@link us.shandian.giga.get.DownloadMission}'s
*/
-public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
-
-
+public class DownloadMissionHelper extends SQLiteOpenHelper {
private final String TAG = "DownloadMissionHelper";
// TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
private static final String DATABASE_NAME = "downloads.db";
- private static final int DATABASE_VERSION = 2;
+ private static final int DATABASE_VERSION = 3;
+
/**
* The table name of download missions
*/
@@ -30,9 +30,9 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
*/
static final String KEY_LOCATION = "location";
/**
- * The key to the url of a mission
+ * The key to the urls of a mission
*/
- static final String KEY_URL = "url";
+ static final String KEY_SOURCE_URL = "url";
/**
* The key to the name of a mission
*/
@@ -45,6 +45,8 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
static final String KEY_TIMESTAMP = "timestamp";
+ static final String KEY_KIND = "kind";
+
/**
* The statement to create the table
*/
@@ -52,16 +54,28 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
"CREATE TABLE " + MISSIONS_TABLE_NAME + " (" +
KEY_LOCATION + " TEXT NOT NULL, " +
KEY_NAME + " TEXT NOT NULL, " +
- KEY_URL + " TEXT NOT NULL, " +
+ KEY_SOURCE_URL + " TEXT NOT NULL, " +
KEY_DONE + " INTEGER NOT NULL, " +
KEY_TIMESTAMP + " INTEGER NOT NULL, " +
+ KEY_KIND + " TEXT NOT NULL, " +
" UNIQUE(" + KEY_LOCATION + ", " + KEY_NAME + "));";
-
- DownloadMissionSQLiteHelper(Context context) {
+ public DownloadMissionHelper(Context context) {
super(context, DATABASE_NAME, null, DATABASE_VERSION);
}
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ db.execSQL(MISSIONS_CREATE_TABLE);
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ if (oldVersion == 2) {
+ db.execSQL("ALTER TABLE " + MISSIONS_TABLE_NAME + " ADD COLUMN " + KEY_KIND + " TEXT;");
+ }
+ }
+
/**
* Returns all values of the download mission as ContentValues.
*
@@ -70,34 +84,29 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
*/
public static ContentValues getValuesOfMission(DownloadMission downloadMission) {
ContentValues values = new ContentValues();
- values.put(KEY_URL, downloadMission.url);
+ values.put(KEY_SOURCE_URL, downloadMission.source);
values.put(KEY_LOCATION, downloadMission.location);
values.put(KEY_NAME, downloadMission.name);
values.put(KEY_DONE, downloadMission.done);
values.put(KEY_TIMESTAMP, downloadMission.timestamp);
+ values.put(KEY_KIND, String.valueOf(downloadMission.kind));
return values;
}
- @Override
- public void onCreate(SQLiteDatabase db) {
- db.execSQL(MISSIONS_CREATE_TABLE);
- }
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- // Currently nothing to do
- }
-
- public static DownloadMission getMissionFromCursor(Cursor cursor) {
+ public static FinishedMission getMissionFromCursor(Cursor cursor) {
if (cursor == null) throw new NullPointerException("cursor is null");
- int pos;
- String name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
- String location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));
- String url = cursor.getString(cursor.getColumnIndexOrThrow(KEY_URL));
- DownloadMission mission = new DownloadMission(name, url, location);
- mission.done = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
+
+ String kind = cursor.getString(cursor.getColumnIndex(KEY_KIND));
+ if (kind == null || kind.isEmpty()) kind = "?";
+
+ FinishedMission mission = new FinishedMission();
+ mission.name = cursor.getString(cursor.getColumnIndexOrThrow(KEY_NAME));
+ mission.location = cursor.getString(cursor.getColumnIndexOrThrow(KEY_LOCATION));
+ mission.source = cursor.getString(cursor.getColumnIndexOrThrow(KEY_SOURCE_URL));;
+ mission.length = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_DONE));
mission.timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(KEY_TIMESTAMP));
- mission.finished = true;
+ mission.kind = kind.charAt(0);
+
return mission;
}
}
diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java b/app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java
deleted file mode 100644
index e7b4caeb8..000000000
--- a/app/src/main/java/us/shandian/giga/get/sqlite/SQLiteDownloadDataSource.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package us.shandian.giga.get.sqlite;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import us.shandian.giga.get.DownloadDataSource;
-import us.shandian.giga.get.DownloadMission;
-
-import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_LOCATION;
-import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.KEY_NAME;
-import static us.shandian.giga.get.sqlite.DownloadMissionSQLiteHelper.MISSIONS_TABLE_NAME;
-
-
-/**
- * Non-thread-safe implementation of {@link DownloadDataSource}
- */
-public class SQLiteDownloadDataSource implements DownloadDataSource {
-
- private static final String TAG = "DownloadDataSourceImpl";
- private final DownloadMissionSQLiteHelper downloadMissionSQLiteHelper;
-
- public SQLiteDownloadDataSource(Context context) {
- downloadMissionSQLiteHelper = new DownloadMissionSQLiteHelper(context);
- }
-
- @Override
- public List loadMissions() {
- ArrayList result;
- SQLiteDatabase database = downloadMissionSQLiteHelper.getReadableDatabase();
- Cursor cursor = database.query(MISSIONS_TABLE_NAME, null, null,
- null, null, null, DownloadMissionSQLiteHelper.KEY_TIMESTAMP);
-
- int count = cursor.getCount();
- if (count == 0) return new ArrayList<>();
- result = new ArrayList<>(count);
- while (cursor.moveToNext()) {
- result.add(DownloadMissionSQLiteHelper.getMissionFromCursor(cursor));
- }
- return result;
- }
-
- @Override
- public void addMission(DownloadMission downloadMission) {
- if (downloadMission == null) throw new NullPointerException("downloadMission is null");
- SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
- ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
- database.insert(MISSIONS_TABLE_NAME, null, values);
- }
-
- @Override
- public void updateMission(DownloadMission downloadMission) {
- if (downloadMission == null) throw new NullPointerException("downloadMission is null");
- SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
- ContentValues values = DownloadMissionSQLiteHelper.getValuesOfMission(downloadMission);
- String whereClause = KEY_LOCATION + " = ? AND " +
- KEY_NAME + " = ?";
- int rowsAffected = database.update(MISSIONS_TABLE_NAME, values,
- whereClause, new String[]{downloadMission.location, downloadMission.name});
- if (rowsAffected != 1) {
- Log.e(TAG, "Expected 1 row to be affected by update but got " + rowsAffected);
- }
- }
-
- @Override
- public void deleteMission(DownloadMission downloadMission) {
- if (downloadMission == null) throw new NullPointerException("downloadMission is null");
- SQLiteDatabase database = downloadMissionSQLiteHelper.getWritableDatabase();
- database.delete(MISSIONS_TABLE_NAME,
- KEY_LOCATION + " = ? AND " +
- KEY_NAME + " = ?",
- new String[]{downloadMission.location, downloadMission.name});
- }
-}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Mp4DashMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/Mp4DashMuxer.java
new file mode 100644
index 000000000..b303b66cd
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Mp4DashMuxer.java
@@ -0,0 +1,31 @@
+package us.shandian.giga.postprocessing;
+
+import org.schabi.newpipe.streams.Mp4DashWriter;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * @author kapodamy
+ */
+class Mp4DashMuxer extends Postprocessing {
+
+ Mp4DashMuxer(DownloadMission mission) {
+ super(mission);
+ recommendedReserve = 15360 * 1024;// 15 MiB
+ worksOnSameFile = true;
+ }
+
+ @Override
+ int process(SharpStream out, SharpStream... sources) throws IOException {
+ Mp4DashWriter muxer = new Mp4DashWriter(sources);
+ muxer.parseSources();
+ muxer.selectTracks(0, 0);
+ muxer.build(out);
+
+ return OK_RESULT;
+ }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
new file mode 100644
index 000000000..80726f705
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java
@@ -0,0 +1,151 @@
+package us.shandian.giga.postprocessing;
+
+import android.os.Message;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.postprocessing.io.ChunkFileInputStream;
+import us.shandian.giga.postprocessing.io.CircularFile;
+import us.shandian.giga.service.DownloadManagerService;
+
+public abstract class Postprocessing {
+
+ static final byte OK_RESULT = DownloadMission.ERROR_NOTHING;
+
+ public static final String ALGORITHM_TTML_CONVERTER = "ttml";
+ public static final String ALGORITHM_MP4_DASH_MUXER = "mp4D";
+ public static final String ALGORITHM_WEBM_MUXER = "webm";
+ private static final String ALGORITHM_TEST_ALGO = "test";
+
+ public static Postprocessing getAlgorithm(String algorithmName, DownloadMission mission) {
+ if (null == algorithmName) {
+ throw new NullPointerException("algorithmName");
+ } else switch (algorithmName) {
+ case ALGORITHM_TTML_CONVERTER:
+ return new TttmlConverter(mission);
+ case ALGORITHM_MP4_DASH_MUXER:
+ return new Mp4DashMuxer(mission);
+ case ALGORITHM_WEBM_MUXER:
+ return new WebMMuxer(mission);
+ case ALGORITHM_TEST_ALGO:
+ return new TestAlgo(mission);
+ /*case "example-algorithm":
+ return new ExampleAlgorithm(mission);*/
+ default:
+ throw new RuntimeException("Unimplemented post-processing algorithm: " + algorithmName);
+ }
+ }
+
+ /**
+ * Get a boolean value that indicate if the given algorithm work on the same
+ * file
+ */
+ public boolean worksOnSameFile;
+
+ /**
+ * Get the recommended space to reserve for the given algorithm. The amount
+ * is in bytes
+ */
+ public int recommendedReserve;
+
+ protected DownloadMission mission;
+
+ Postprocessing(DownloadMission mission) {
+ this.mission = mission;
+ }
+
+ public void run() throws IOException {
+ File file = mission.getDownloadedFile();
+ CircularFile out = null;
+ ChunkFileInputStream[] sources = new ChunkFileInputStream[mission.urls.length];
+
+ try {
+ int i = 0;
+ for (; i < sources.length - 1; i++) {
+ sources[i] = new ChunkFileInputStream(file, mission.offsets[i], mission.offsets[i + 1], "rw");
+ }
+ sources[i] = new ChunkFileInputStream(file, mission.offsets[i], mission.getDownloadedFile().length(), "rw");
+
+ int[] idx = {0};
+ CircularFile.OffsetChecker checker = () -> {
+ while (idx[0] < sources.length) {
+ /*
+ * WARNING: never use rewind() in any chunk after any writing (especially on first chunks)
+ * or the CircularFile can lead to unexpected results
+ */
+ if (sources[idx[0]].isDisposed() || sources[idx[0]].available() < 1) {
+ idx[0]++;
+ continue;// the selected source is not used anymore
+ }
+
+ return sources[idx[0]].getFilePointer() - 1;
+ }
+
+ return -1;
+ };
+
+ out = new CircularFile(file, 0, this::progressReport, checker);
+
+ mission.done = 0;
+ mission.length = file.length();
+
+ int result = process(out, sources);
+
+ if (result == OK_RESULT) {
+ long finalLength = out.finalizeFile();
+ mission.done = finalLength;
+ mission.length = finalLength;
+ } else {
+ mission.errCode = DownloadMission.ERROR_UNKNOWN_EXCEPTION;
+ mission.errObject = new RuntimeException("post-processing algorithm returned " + result);
+ }
+
+ if (result != OK_RESULT && worksOnSameFile) {
+ //noinspection ResultOfMethodCallIgnored
+ new File(mission.location, mission.name).delete();
+ }
+ } finally {
+ for (SharpStream source : sources) {
+ if (source != null && !source.isDisposed()) {
+ source.dispose();
+ }
+ }
+ if (out != null) {
+ out.dispose();
+ }
+ }
+ }
+
+ /**
+ * Abstract method to execute the pos-processing algorithm
+ *
+ * @param out output stream
+ * @param sources files to be processed
+ * @return a error code, 0 means the operation was successful
+ * @throws IOException if an I/O error occurs.
+ */
+ abstract int process(SharpStream out, SharpStream... sources) throws IOException;
+
+ String getArgumentAt(int index, String defaultValue) {
+ if (mission.postprocessingArgs == null || index >= mission.postprocessingArgs.length) {
+ return defaultValue;
+ }
+
+ return mission.postprocessingArgs[index];
+ }
+
+ private void progressReport(long done) {
+ mission.done = done;
+ if (mission.length < mission.done) mission.length = mission.done;
+
+ Message m = new Message();
+ m.what = DownloadManagerService.MESSAGE_PROGRESS;
+ m.obj = mission;
+
+ mission.mHandler.sendMessage(m);
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/TestAlgo.java b/app/src/main/java/us/shandian/giga/postprocessing/TestAlgo.java
new file mode 100644
index 000000000..66b235d7c
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/TestAlgo.java
@@ -0,0 +1,54 @@
+package us.shandian.giga.postprocessing;
+
+import android.util.Log;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.util.Random;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * Algorithm for testing proposes
+ */
+class TestAlgo extends Postprocessing {
+
+ public TestAlgo(DownloadMission mission) {
+ super(mission);
+
+ worksOnSameFile = true;
+ recommendedReserve = 4096 * 1024;// 4 KiB
+ }
+
+ @Override
+ int process(SharpStream out, SharpStream... sources) throws IOException {
+
+ int written = 0;
+ int size = 5 * 1024 * 1024;// 5 MiB
+ byte[] buffer = new byte[8 * 1024];//8 KiB
+ mission.length = size;
+
+ Random rnd = new Random();
+
+ // only write random data
+ sources[0].dispose();
+
+ while (written < size) {
+ rnd.nextBytes(buffer);
+
+ int read = Math.min(buffer.length, size - written);
+ out.write(buffer, 0, read);
+
+ try {
+ Thread.sleep((int) (Math.random() * 10));
+ } catch (InterruptedException e) {
+ return -1;
+ }
+
+ written += read;
+ }
+
+ return Postprocessing.OK_RESULT;
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/TttmlConverter.java b/app/src/main/java/us/shandian/giga/postprocessing/TttmlConverter.java
new file mode 100644
index 000000000..4c9d44548
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/TttmlConverter.java
@@ -0,0 +1,76 @@
+package us.shandian.giga.postprocessing;
+
+import android.util.Log;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+import org.schabi.newpipe.streams.SubtitleConverter;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPathExpressionException;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.postprocessing.io.SharpInputStream;
+
+/**
+ * @author kapodamy
+ */
+class TttmlConverter extends Postprocessing {
+ private static final String TAG = "TttmlConverter";
+
+ TttmlConverter(DownloadMission mission) {
+ super(mission);
+ recommendedReserve = 0;// due how XmlPullParser works, the xml is fully loaded on the ram
+ worksOnSameFile = true;
+ }
+
+ @Override
+ int process(SharpStream out, SharpStream... sources) throws IOException {
+ // check if the subtitle is already in srt and copy, this should never happen
+ String format = getArgumentAt(0, null);
+
+ if (format == null || format.equals("ttml")) {
+ SubtitleConverter ttmlDumper = new SubtitleConverter();
+
+ try {
+ ttmlDumper.dumpTTML(
+ sources[0],
+ out,
+ getArgumentAt(1, "true").equals("true"),
+ getArgumentAt(2, "true").equals("true")
+ );
+ } catch (Exception err) {
+ Log.e(TAG, "subtitle parse failed", err);
+
+ if (err instanceof IOException) {
+ return 1;
+ } else if (err instanceof ParseException) {
+ return 2;
+ } else if (err instanceof SAXException) {
+ return 3;
+ } else if (err instanceof ParserConfigurationException) {
+ return 4;
+ } else if (err instanceof XPathExpressionException) {
+ return 7;
+ }
+
+ return 8;
+ }
+
+ return OK_RESULT;
+ } else if (format.equals("srt")) {
+ byte[] buffer = new byte[8 * 1024];
+ int read;
+ while ((read = sources[0].read(buffer)) > 0) {
+ out.write(buffer, 0, read);
+ }
+ return OK_RESULT;
+ }
+
+ throw new UnsupportedOperationException("Can't convert this subtitle, unimplemented format: " + format);
+ }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
new file mode 100644
index 000000000..009a9a66b
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/WebMMuxer.java
@@ -0,0 +1,44 @@
+package us.shandian.giga.postprocessing;
+
+import org.schabi.newpipe.streams.WebMReader.TrackKind;
+import org.schabi.newpipe.streams.WebMReader.WebMTrack;
+import org.schabi.newpipe.streams.WebMWriter;
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+
+import us.shandian.giga.get.DownloadMission;
+
+/**
+ * @author kapodamy
+ */
+class WebMMuxer extends Postprocessing {
+
+ WebMMuxer(DownloadMission mission) {
+ super(mission);
+ recommendedReserve = 2048 * 1024;// 2 MiB
+ worksOnSameFile = true;
+ }
+
+ @Override
+ int process(SharpStream out, SharpStream... sources) throws IOException {
+ WebMWriter muxer = new WebMWriter(sources);
+ muxer.parseSources();
+
+ // youtube uses a webm with a fake video track that acts as a "cover image"
+ WebMTrack[] tracks = muxer.getTracksFromSource(1);
+ int audioTrackIndex = 0;
+ for (int i = 0; i < tracks.length; i++) {
+ if (tracks[i].kind == TrackKind.Audio) {
+ audioTrackIndex = i;
+ break;
+ }
+ }
+
+ muxer.selectTracks(0, audioTrackIndex);
+ muxer.build(out);
+
+ return OK_RESULT;
+ }
+
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java b/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java
new file mode 100644
index 000000000..cd62c5d22
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/io/ChunkFileInputStream.java
@@ -0,0 +1,153 @@
+package us.shandian.giga.postprocessing.io;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+public class ChunkFileInputStream extends SharpStream {
+
+ private RandomAccessFile source;
+ private final long offset;
+ private final long length;
+ private long position;
+
+ public ChunkFileInputStream(File file, long start, long end, String mode) throws IOException {
+ source = new RandomAccessFile(file, mode);
+ offset = start;
+ length = end - start;
+ position = 0;
+
+ if (length < 1) {
+ source.close();
+ throw new IOException("The chunk is empty or invalid");
+ }
+ if (source.length() < end) {
+ try {
+ throw new IOException(String.format("invalid file length. expected = %s found = %s", end, source.length()));
+ } finally {
+ source.close();
+ }
+ }
+
+ source.seek(offset);
+ }
+
+ /**
+ * Get absolute position on file
+ *
+ * @return the position
+ */
+ public long getFilePointer() {
+ return offset + position;
+ }
+
+ @Override
+ public int read() throws IOException {
+ if ((position + 1) > length) {
+ return 0;
+ }
+
+ int res = source.read();
+ if (res >= 0) {
+ position++;
+ }
+
+ return res;
+ }
+
+ @Override
+ public int read(byte b[]) throws IOException {
+ return read(b, 0, b.length);
+ }
+
+ @Override
+ public int read(byte b[], int off, int len) throws IOException {
+ if ((position + len) > length) {
+ len = (int) (length - position);
+ }
+ if (len == 0) {
+ return 0;
+ }
+
+ int res = source.read(b, off, len);
+ position += res;
+
+ return res;
+ }
+
+ @Override
+ public long skip(long pos) throws IOException {
+ pos = Math.min(pos + position, length);
+
+ if (pos == 0) {
+ return 0;
+ }
+
+ source.seek(offset + pos);
+
+ long oldPos = position;
+ position = pos;
+
+ return pos - oldPos;
+ }
+
+ @Override
+ public int available() {
+ return (int) (length - position);
+ }
+
+ @SuppressWarnings("EmptyCatchBlock")
+ @Override
+ public void dispose() {
+ try {
+ source.close();
+ } catch (IOException err) {
+ } finally {
+ source = null;
+ }
+ }
+
+ @Override
+ public boolean isDisposed() {
+ return source == null;
+ }
+
+ @Override
+ public void rewind() throws IOException {
+ position = 0;
+ source.seek(offset);
+ }
+
+ @Override
+ public boolean canRewind() {
+ return true;
+ }
+
+ @Override
+ public boolean canRead() {
+ return true;
+ }
+
+ @Override
+ public boolean canWrite() {
+ return false;
+ }
+
+ @Override
+ public void write(byte value) {
+ }
+
+ @Override
+ public void write(byte[] buffer) {
+ }
+
+ @Override
+ public void write(byte[] buffer, int offset, int count) {
+ }
+
+ @Override
+ public void flush() {
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java b/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java
new file mode 100644
index 000000000..d2fc82d33
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/io/CircularFile.java
@@ -0,0 +1,375 @@
+package us.shandian.giga.postprocessing.io;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.ArrayList;
+
+public class CircularFile extends SharpStream {
+
+ private final static int AUX_BUFFER_SIZE = 1024 * 1024;// 1 MiB
+ private final static int AUX_BUFFER_SIZE2 = 512 * 1024;// 512 KiB
+ private final static int NOTIFY_BYTES_INTERVAL = 64 * 1024;// 64 KiB
+ private final static int QUEUE_BUFFER_SIZE = 8 * 1024;// 8 KiB
+ private final static boolean IMMEDIATE_AUX_BUFFER_FLUSH = false;
+
+ private RandomAccessFile out;
+ private long position;
+ private long maxLengthKnown = -1;
+
+ private ArrayList auxiliaryBuffers;
+ private OffsetChecker callback;
+ private ManagedBuffer queue;
+ private long startOffset;
+ private ProgressReport onProgress;
+ private long reportPosition;
+
+ public CircularFile(File file, long offset, ProgressReport progressReport, OffsetChecker checker) throws IOException {
+ if (checker == null) {
+ throw new NullPointerException("checker is null");
+ }
+
+ try {
+ queue = new ManagedBuffer(QUEUE_BUFFER_SIZE);
+ out = new RandomAccessFile(file, "rw");
+ out.seek(offset);
+ position = offset;
+ } catch (IOException err) {
+ try {
+ if (out != null) {
+ out.close();
+ }
+ } catch (IOException e) {
+ // nothing to do
+ }
+ throw err;
+ }
+
+ auxiliaryBuffers = new ArrayList<>(15);
+ callback = checker;
+ startOffset = offset;
+ reportPosition = offset;
+ onProgress = progressReport;
+
+ }
+
+ /**
+ * Close the file without flushing any buffer
+ */
+ @Override
+ public void dispose() {
+ try {
+ auxiliaryBuffers = null;
+ if (out != null) {
+ out.close();
+ out = null;
+ }
+ } catch (IOException err) {
+ // nothing to do
+ }
+ }
+
+ /**
+ * Flush any buffer and close the output file. Use this method if the
+ * operation is successful
+ *
+ * @return the final length of the file
+ * @throws IOException if an I/O error occurs
+ */
+ public long finalizeFile() throws IOException {
+ flushEverything();
+
+ if (maxLengthKnown > -1) {
+ position = maxLengthKnown;
+ }
+ if (position < out.length()) {
+ out.setLength(position);
+ }
+
+ dispose();
+
+ return position;
+ }
+
+ @Override
+ public void write(byte b) throws IOException {
+ write(new byte[]{b}, 0, 1);
+ }
+
+ @Override
+ public void write(byte b[]) throws IOException {
+ write(b, 0, b.length);
+ }
+
+ @Override
+ public void write(byte b[], int off, int len) throws IOException {
+ if (len == 0) {
+ return;
+ }
+
+ long end = callback.check();
+ long available;
+
+ if (end == -1) {
+ available = Long.MAX_VALUE;
+ } else {
+ if (end < startOffset) {
+ throw new IOException("The reported offset is invalid. reported offset is " + String.valueOf(end));
+ }
+ available = end - position;
+ }
+
+ // Check if possible flush one or more auxiliary buffer
+ if (auxiliaryBuffers.size() > 0) {
+ ManagedBuffer aux = auxiliaryBuffers.get(0);
+
+ // check if there is enough space to flush it completely
+ while (available >= (aux.size + queue.size)) {
+ available -= aux.size;
+ writeQueue(aux.buffer, 0, aux.size);
+ aux.dereference();
+ auxiliaryBuffers.remove(0);
+
+ if (auxiliaryBuffers.size() < 1) {
+ aux = null;
+ break;
+ }
+ aux = auxiliaryBuffers.get(0);
+ }
+
+ if (IMMEDIATE_AUX_BUFFER_FLUSH) {
+ // try partial flush to avoid allocate another auxiliary buffer
+ if (aux != null && aux.available() < len && available > queue.size) {
+ int size = Math.min(aux.size, (int) available - queue.size);
+
+ writeQueue(aux.buffer, 0, size);
+ aux.dereference(size);
+
+ available -= size;
+ }
+ }
+ }
+
+ if (auxiliaryBuffers.size() < 1 && available > (len + queue.size)) {
+ writeQueue(b, off, len);
+ } else {
+ int i = auxiliaryBuffers.size() - 1;
+ while (len > 0) {
+ if (i < 0) {
+ // allocate a new auxiliary buffer
+ auxiliaryBuffers.add(new ManagedBuffer(AUX_BUFFER_SIZE));
+ i++;
+ }
+
+ ManagedBuffer aux = auxiliaryBuffers.get(i);
+ available = aux.available();
+
+ if (available < 1) {
+ // secondary auxiliary buffer
+ available = len;
+ aux = new ManagedBuffer(Math.max(len, AUX_BUFFER_SIZE2));
+ auxiliaryBuffers.add(aux);
+ i++;
+ } else {
+ available = Math.min(len, available);
+ }
+
+ aux.write(b, off, (int) available);
+
+ len -= available;
+ if (len > 0) off += available;
+ }
+ }
+ }
+
+ private void writeOutside(byte buffer[], int offset, int length) throws IOException {
+ out.write(buffer, offset, length);
+ position += length;
+
+ if (onProgress != null && position > reportPosition) {
+ reportPosition = position + NOTIFY_BYTES_INTERVAL;
+ onProgress.report(position);
+ }
+ }
+
+ private void writeQueue(byte[] buffer, int offset, int length) throws IOException {
+ while (length > 0) {
+ if (queue.available() < length) {
+ flushQueue();
+
+ if (length >= queue.buffer.length) {
+ writeOutside(buffer, offset, length);
+ return;
+ }
+ }
+
+ int size = Math.min(queue.available(), length);
+ queue.write(buffer, offset, size);
+
+ offset += size;
+ length -= size;
+ }
+
+ if (queue.size >= queue.buffer.length) {
+ flushQueue();
+ }
+ }
+
+ private void flushQueue() throws IOException {
+ writeOutside(queue.buffer, 0, queue.size);
+ queue.size = 0;
+ }
+
+ private void flushEverything() throws IOException {
+ flushQueue();
+
+ if (auxiliaryBuffers.size() > 0) {
+ for (ManagedBuffer aux : auxiliaryBuffers) {
+ writeOutside(aux.buffer, 0, aux.size);
+ aux.dereference();
+ }
+ auxiliaryBuffers.clear();
+ }
+ }
+
+ /**
+ * Flush any buffer directly to the file. Warning: use this method ONLY if
+ * all read dependencies are disposed
+ *
+ * @throws IOException if the dependencies are not disposed
+ */
+ @Override
+ public void flush() throws IOException {
+ if (callback.check() != -1) {
+ throw new IOException("All read dependencies of this file must be disposed first");
+ }
+ flushEverything();
+
+ // Save the current file length in case the method {@code rewind()} is called
+ if (position > maxLengthKnown) {
+ maxLengthKnown = position;
+ }
+ }
+
+ @Override
+ public void rewind() throws IOException {
+ flush();
+ out.seek(startOffset);
+
+ if (onProgress != null) {
+ onProgress.report(-position);
+ }
+
+ position = startOffset;
+ reportPosition = startOffset;
+
+ }
+
+ @Override
+ public long skip(long amount) throws IOException {
+ flush();
+ position += amount;
+
+ out.seek(position);
+
+ return amount;
+ }
+
+ @Override
+ public boolean isDisposed() {
+ return out == null;
+ }
+
+ @Override
+ public boolean canRewind() {
+ return true;
+ }
+
+ @Override
+ public boolean canWrite() {
+ return true;
+ }
+
+ //
+ @Override
+ public boolean canRead() {
+ return false;
+ }
+
+ @Override
+ public int read() {
+ throw new UnsupportedOperationException("write-only");
+ }
+
+ @Override
+ public int read(byte[] buffer) {
+ throw new UnsupportedOperationException("write-only");
+ }
+
+ @Override
+ public int read(byte[] buffer, int offset, int count) {
+ throw new UnsupportedOperationException("write-only");
+ }
+
+ @Override
+ public int available() {
+ throw new UnsupportedOperationException("write-only");
+ }
+//
+
+ public interface OffsetChecker {
+
+ /**
+ * Checks the amount of available space ahead
+ *
+ * @return absolute offset in the file where no more data SHOULD NOT be
+ * written. If the value is -1 the whole file will be used
+ */
+ long check();
+ }
+
+ public interface ProgressReport {
+
+ void report(long progress);
+ }
+
+ class ManagedBuffer {
+
+ byte[] buffer;
+ int size;
+
+ ManagedBuffer(int length) {
+ buffer = new byte[length];
+ }
+
+ void dereference() {
+ buffer = null;
+ size = 0;
+ }
+
+ void dereference(int amount) {
+ if (amount > size) {
+ throw new IndexOutOfBoundsException("Invalid dereference amount (" + amount + ">=" + size + ")");
+ }
+ size -= amount;
+ System.arraycopy(buffer, amount, buffer, 0, size);
+ }
+
+ protected int available() {
+ return buffer.length - size;
+ }
+
+ private void write(byte[] b, int off, int len) {
+ System.arraycopy(b, off, buffer, size, len);
+ size += len;
+ }
+
+ @Override
+ public String toString() {
+ return "holding: " + String.valueOf(size) + " length: " + String.valueOf(buffer.length) + " available: " + String.valueOf(available());
+ }
+
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java b/app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java
new file mode 100644
index 000000000..c1b675eef
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/io/FileStream.java
@@ -0,0 +1,126 @@
+package us.shandian.giga.postprocessing.io;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileChannel;
+
+/**
+ * @author kapodamy
+ */
+public class FileStream extends SharpStream {
+
+ public enum Mode {
+ Read,
+ ReadWrite
+ }
+
+ public RandomAccessFile source;
+ private final Mode mode;
+
+ public FileStream(String path, Mode mode) throws IOException {
+ String flags;
+
+ if (mode == Mode.Read) {
+ flags = "r";
+ } else {
+ flags = "rw";
+ }
+
+ this.mode = mode;
+ source = new RandomAccessFile(path, flags);
+ }
+
+ @Override
+ public int read() throws IOException {
+ return source.read();
+ }
+
+ @Override
+ public int read(byte b[]) throws IOException {
+ return read(b, 0, b.length);
+ }
+
+ @Override
+ public int read(byte b[], int off, int len) throws IOException {
+ return source.read(b, off, len);
+ }
+
+ @Override
+ public long skip(long pos) throws IOException {
+ FileChannel fc = source.getChannel();
+ fc.position(fc.position() + pos);
+ return pos;
+ }
+
+ @Override
+ public int available() {
+ try {
+ return (int) (source.length() - source.getFilePointer());
+ } catch (IOException ex) {
+ return 0;
+ }
+ }
+
+ @SuppressWarnings("EmptyCatchBlock")
+ @Override
+ public void dispose() {
+ try {
+ source.close();
+ } catch (IOException err) {
+
+ } finally {
+ source = null;
+ }
+ }
+
+ @Override
+ public boolean isDisposed() {
+ return source == null;
+ }
+
+ @Override
+ public void rewind() throws IOException {
+ source.getChannel().position(0);
+ }
+
+ @Override
+ public boolean canRewind() {
+ return true;
+ }
+
+ @Override
+ public boolean canRead() {
+ return mode == Mode.Read || mode == Mode.ReadWrite;
+ }
+
+ @Override
+ public boolean canWrite() {
+ return mode == Mode.ReadWrite;
+ }
+
+ @Override
+ public void write(byte value) throws IOException {
+ source.write(value);
+ }
+
+ @Override
+ public void write(byte[] buffer) throws IOException {
+ source.write(buffer);
+ }
+
+ @Override
+ public void write(byte[] buffer, int offset, int count) throws IOException {
+ source.write(buffer, offset, count);
+ }
+
+ @Override
+ public void flush() {
+ }
+
+ @Override
+ public void setLength(long length) throws IOException {
+ source.setLength(length);
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java b/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java
new file mode 100644
index 000000000..52e0775da
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/postprocessing/io/SharpInputStream.java
@@ -0,0 +1,59 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package us.shandian.giga.postprocessing.io;
+
+import android.support.annotation.NonNull;
+
+import org.schabi.newpipe.streams.io.SharpStream;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Wrapper for the classic {@link java.io.InputStream}
+ * @author kapodamy
+ */
+public class SharpInputStream extends InputStream {
+
+ private final SharpStream base;
+
+ public SharpInputStream(SharpStream base) throws IOException {
+ if (!base.canRead()) {
+ throw new IOException("The provided stream is not readable");
+ }
+ this.base = base;
+ }
+
+ @Override
+ public int read() throws IOException {
+ return base.read();
+ }
+
+ @Override
+ public int read(@NonNull byte[] bytes) throws IOException {
+ return base.read(bytes);
+ }
+
+ @Override
+ public int read(@NonNull byte[] bytes, int i, int i1) throws IOException {
+ return base.read(bytes, i, i1);
+ }
+
+ @Override
+ public long skip(long l) throws IOException {
+ return base.skip(l);
+ }
+
+ @Override
+ public int available() {
+ return base.available();
+ }
+
+ @Override
+ public void close() {
+ base.dispose();
+ }
+}
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
new file mode 100644
index 000000000..6bcf84745
--- /dev/null
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java
@@ -0,0 +1,676 @@
+package us.shandian.giga.service;
+
+import android.content.Context;
+import android.os.Handler;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.util.DiffUtil;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.schabi.newpipe.R;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.FinishedMission;
+import us.shandian.giga.get.Mission;
+import us.shandian.giga.get.sqlite.DownloadDataSource;
+import us.shandian.giga.util.Utility;
+
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
+public class DownloadManager {
+ private static final String TAG = DownloadManager.class.getSimpleName();
+
+ enum NetworkState {Unavailable, WifiOperating, MobileOperating, OtherOperating}
+
+ public final static int SPECIAL_NOTHING = 0;
+ public final static int SPECIAL_PENDING = 1;
+ public final static int SPECIAL_FINISHED = 2;
+
+ private final DownloadDataSource mDownloadDataSource;
+
+ private final ArrayList mMissionsPending = new ArrayList<>();
+ private final ArrayList mMissionsFinished;
+
+ private final Handler mHandler;
+ private final File mPendingMissionsDir;
+
+ private NetworkState mLastNetworkStatus = NetworkState.Unavailable;
+
+ int mPrefMaxRetry;
+ boolean mPrefCrossNetwork;
+
+ /**
+ * Create a new instance
+ *
+ * @param context Context for the data source for finished downloads
+ * @param handler Thread required for Messaging
+ */
+ DownloadManager(@NonNull Context context, Handler handler) {
+ if (DEBUG) {
+ Log.d(TAG, "new DownloadManager instance. 0x" + Integer.toHexString(this.hashCode()));
+ }
+
+ mDownloadDataSource = new DownloadDataSource(context);
+ mHandler = handler;
+ mMissionsFinished = loadFinishedMissions();
+ mPendingMissionsDir = getPendingDir(context);
+
+ if (!Utility.mkdir(mPendingMissionsDir, false)) {
+ throw new RuntimeException("failed to create pending_downloads in data directory");
+ }
+
+ loadPendingMissions();
+ }
+
+ private static File getPendingDir(@NonNull Context context) {
+ //File dir = new File(ContextCompat.getDataDir(context), "pending_downloads");
+ File dir = context.getExternalFilesDir("pending_downloads");
+
+ if (dir == null) {
+ // One of the following paths are not accessible ¿unmounted internal memory?
+ // /storage/emulated/0/Android/data/org.schabi.newpipe[.debug]/pending_downloads
+ // /sdcard/Android/data/org.schabi.newpipe[.debug]/pending_downloads
+ Log.w(TAG, "path to pending downloads are not accessible");
+ }
+
+ return dir;
+ }
+
+ /**
+ * Loads finished missions from the data source
+ */
+ private ArrayList loadFinishedMissions() {
+ ArrayList finishedMissions = mDownloadDataSource.loadFinishedMissions();
+
+ // missions always is stored by creation order, simply reverse the list
+ ArrayList result = new ArrayList<>(finishedMissions.size());
+ for (int i = finishedMissions.size() - 1; i >= 0; i--) {
+ FinishedMission mission = finishedMissions.get(i);
+ File file = mission.getDownloadedFile();
+
+ if (!file.isFile()) {
+ if (DEBUG) {
+ Log.d(TAG, "downloaded file removed: " + file.getAbsolutePath());
+ }
+ mDownloadDataSource.deleteMission(mission);
+ continue;
+ }
+
+ result.add(mission);
+ }
+
+ return result;
+ }
+
+ private void loadPendingMissions() {
+ File[] subs = mPendingMissionsDir.listFiles();
+
+ if (subs == null) {
+ Log.e(TAG, "listFiles() returned null");
+ return;
+ }
+ if (subs.length < 1) {
+ return;
+ }
+ if (DEBUG) {
+ Log.d(TAG, "Loading pending downloads from directory: " + mPendingMissionsDir.getAbsolutePath());
+ }
+
+ for (File sub : subs) {
+ if (sub.isFile()) {
+ DownloadMission mis = Utility.readFromFile(sub);
+
+ if (mis == null) {
+ //noinspection ResultOfMethodCallIgnored
+ sub.delete();
+ } else {
+ if (mis.isFinished()) {
+ //noinspection ResultOfMethodCallIgnored
+ sub.delete();
+ continue;
+ }
+
+ File dl = mis.getDownloadedFile();
+ boolean exists = dl.exists();
+
+ if (mis.postprocessingRunning && mis.postprocessingThis) {
+ // Incomplete post-processing results in a corrupted download file
+ // because the selected algorithm works on the same file to save space.
+ if (!dl.delete()) {
+ Log.w(TAG, "Unable to delete incomplete download file: " + sub.getPath());
+ }
+ exists = true;
+ mis.postprocessingRunning = false;
+ mis.errCode = DownloadMission.ERROR_POSTPROCESSING_FAILED;
+ mis.errObject = new RuntimeException("stopped unexpectedly");
+ } else if (exists && !dl.isFile()) {
+ // probably a folder, this should never happens
+ if (!sub.delete()) {
+ Log.w(TAG, "Unable to delete serialized file: " + sub.getPath());
+ }
+ continue;
+ }
+
+ if (!exists) {
+ // downloaded file deleted, reset mission state
+ DownloadMission m = new DownloadMission(mis.urls, mis.name, mis.location, mis.kind, mis.postprocessingName, mis.postprocessingArgs);
+ m.timestamp = mis.timestamp;
+ m.threadCount = mis.threadCount;
+ m.source = mis.source;
+ m.maxRetry = mis.maxRetry;
+ m.nearLength = mis.nearLength;
+ mis = m;
+ }
+
+ mis.running = false;
+ mis.recovered = exists;
+ mis.metadata = sub;
+ mis.mHandler = mHandler;
+
+ mMissionsPending.add(mis);
+ }
+ }
+ }
+
+ if (mMissionsPending.size() > 1) {
+ Collections.sort(mMissionsPending, (mission1, mission2) -> Long.compare(mission1.timestamp, mission2.timestamp));
+ }
+ }
+
+ /**
+ * Start a new download mission
+ *
+ * @param urls the list of urls to download
+ * @param location the location
+ * @param name the name of the file to create
+ * @param kind type of file (a: audio v: video s: subtitle ?: file-extension defined)
+ * @param threads the number of threads maximal used to download chunks of the file.
+ * @param psName the name of the required post-processing algorithm, or {@code null} to ignore.
+ * @param source source url of the resource
+ * @param psArgs the arguments for the post-processing algorithm.
+ */
+ void startMission(String[] urls, String location, String name, char kind, int threads,
+ String source, String psName, String[] psArgs, long nearLength) {
+ synchronized (this) {
+ // check for existing pending download
+ DownloadMission pendingMission = getPendingMission(location, name);
+ if (pendingMission != null) {
+ // generate unique filename (?)
+ try {
+ name = generateUniqueName(location, name);
+ } catch (Exception e) {
+ Log.e(TAG, "Unable to generate unique name", e);
+ name = System.currentTimeMillis() + name;
+ Log.i(TAG, "Using " + name);
+ }
+ } else {
+ // check for existing finished download
+ int index = getFinishedMissionIndex(location, name);
+ if (index >= 0) mDownloadDataSource.deleteMission(mMissionsFinished.remove(index));
+ }
+
+ DownloadMission mission = new DownloadMission(urls, name, location, kind, psName, psArgs);
+ mission.timestamp = System.currentTimeMillis();
+ mission.threadCount = threads;
+ mission.source = source;
+ mission.mHandler = mHandler;
+ mission.maxRetry = mPrefMaxRetry;
+ mission.nearLength = nearLength;
+
+ while (true) {
+ mission.metadata = new File(mPendingMissionsDir, String.valueOf(mission.timestamp));
+ if (!mission.metadata.isFile() && !mission.metadata.exists()) {
+ try {
+ if (!mission.metadata.createNewFile())
+ throw new RuntimeException("Cant create download metadata file");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ break;
+ }
+ mission.timestamp = System.currentTimeMillis();
+ }
+
+ mMissionsPending.add(mission);
+
+ // Before starting, save the state in case the internet connection is not available
+ Utility.writeToFile(mission.metadata, mission);
+
+ if (canDownloadInCurrentNetwork() && (getRunningMissionsCount() < 1)) {
+ mission.start();
+ mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_RUNNING);
+ }
+ }
+ }
+
+
+ public void resumeMission(DownloadMission mission) {
+ if (!mission.running) {
+ mission.start();
+ mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_RUNNING);
+ }
+ }
+
+ public void pauseMission(DownloadMission mission) {
+ if (mission.running) {
+ mission.pause();
+ mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
+ }
+ }
+
+ public void deleteMission(Mission mission) {
+ synchronized (this) {
+ if (mission instanceof DownloadMission) {
+ mMissionsPending.remove(mission);
+ } else if (mission instanceof FinishedMission) {
+ mMissionsFinished.remove(mission);
+ mDownloadDataSource.deleteMission(mission);
+ }
+
+ mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_DELETED);
+ mission.delete();
+ }
+ }
+
+
+ /**
+ * Get a pending mission by its location and name
+ *
+ * @param location the location
+ * @param name the name
+ * @return the mission or null if no such mission exists
+ */
+ @Nullable
+ private DownloadMission getPendingMission(String location, String name) {
+ for (DownloadMission mission : mMissionsPending) {
+ if (location.equalsIgnoreCase(mission.location) && name.equalsIgnoreCase(mission.name)) {
+ return mission;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Get a finished mission by its location and name
+ *
+ * @param location the location
+ * @param name the name
+ * @return the mission index or -1 if no such mission exists
+ */
+ private int getFinishedMissionIndex(String location, String name) {
+ for (int i = 0; i < mMissionsFinished.size(); i++) {
+ FinishedMission mission = mMissionsFinished.get(i);
+ if (location.equalsIgnoreCase(mission.location) && name.equalsIgnoreCase(mission.name)) {
+ return i;
+ }
+ }
+
+ return -1;
+ }
+
+ public Mission getAnyMission(String location, String name) {
+ synchronized (this) {
+ Mission mission = getPendingMission(location, name);
+ if (mission != null) return mission;
+
+ int idx = getFinishedMissionIndex(location, name);
+ if (idx >= 0) return mMissionsFinished.get(idx);
+ }
+
+ return null;
+ }
+
+ int getRunningMissionsCount() {
+ int count = 0;
+ synchronized (this) {
+ for (DownloadMission mission : mMissionsPending) {
+ if (mission.running && mission.errCode != DownloadMission.ERROR_POSTPROCESSING_FAILED && !mission.isFinished())
+ count++;
+ }
+ }
+
+ return count;
+ }
+
+ void pauseAllMissions() {
+ synchronized (this) {
+ for (DownloadMission mission : mMissionsPending) mission.pause();
+ }
+ }
+
+
+ /**
+ * Splits the filename into name and extension
+ *
+ * Dots are ignored if they appear: not at all, at the beginning of the file,
+ * at the end of the file
+ *
+ * @param name the name to split
+ * @return a string array with a length of 2 containing the name and the extension
+ */
+ private static String[] splitName(String name) {
+ int dotIndex = name.lastIndexOf('.');
+ if (dotIndex <= 0 || (dotIndex == name.length() - 1)) {
+ return new String[]{name, ""};
+ } else {
+ return new String[]{name.substring(0, dotIndex), name.substring(dotIndex + 1)};
+ }
+ }
+
+ /**
+ * Generates a unique file name.
+ *
+ * e.g. "myName (1).txt" if the name "myName.txt" exists.
+ *
+ * @param location the location (to check for existing files)
+ * @param name the name of the file
+ * @return the unique file name
+ * @throws IllegalArgumentException if the location is not a directory
+ * @throws SecurityException if the location is not readable
+ */
+ private static String generateUniqueName(String location, String name) {
+ if (location == null) throw new NullPointerException("location is null");
+ if (name == null) throw new NullPointerException("name is null");
+ File destination = new File(location);
+ if (!destination.isDirectory()) {
+ throw new IllegalArgumentException("location is not a directory: " + location);
+ }
+ final String[] nameParts = splitName(name);
+ String[] existingName = destination.list((dir, name1) -> name1.startsWith(nameParts[0]));
+ Arrays.sort(existingName);
+ String newName;
+ int downloadIndex = 0;
+ do {
+ newName = nameParts[0] + " (" + downloadIndex + ")." + nameParts[1];
+ ++downloadIndex;
+ if (downloadIndex == 1000) { // Probably an error on our side
+ throw new RuntimeException("Too many existing files");
+ }
+ } while (Arrays.binarySearch(existingName, newName) >= 0);
+ return newName;
+ }
+
+ /**
+ * Set a pending download as finished
+ *
+ * @param mission the desired mission
+ */
+ void setFinished(DownloadMission mission) {
+ synchronized (this) {
+ mMissionsPending.remove(mission);
+ mMissionsFinished.add(0, new FinishedMission(mission));
+ mDownloadDataSource.addMission(mission);
+ }
+ }
+
+ /**
+ * runs another mission in queue if possible
+ *
+ * @return true if exits pending missions running or a mission was started, otherwise, false
+ */
+ boolean runAnotherMission() {
+ synchronized (this) {
+ if (mMissionsPending.size() < 1) return false;
+
+ int i = getRunningMissionsCount();
+ if (i > 0) return true;
+
+ if (!canDownloadInCurrentNetwork()) return false;
+
+ for (DownloadMission mission : mMissionsPending) {
+ if (!mission.running && mission.errCode == DownloadMission.ERROR_NOTHING && mission.enqueued) {
+ resumeMission(mission);
+ return true;
+ }
+ }
+
+ return false;
+ }
+ }
+
+ public MissionIterator getIterator() {
+ return new MissionIterator();
+ }
+
+ /**
+ * Forget all finished downloads, but, doesn't delete any file
+ */
+ public void forgetFinishedDownloads() {
+ synchronized (this) {
+ for (FinishedMission mission : mMissionsFinished) {
+ mDownloadDataSource.deleteMission(mission);
+ }
+ mMissionsFinished.clear();
+ }
+ }
+
+ private boolean canDownloadInCurrentNetwork() {
+ if (mLastNetworkStatus == NetworkState.Unavailable) return false;
+ return !(mPrefCrossNetwork && mLastNetworkStatus == NetworkState.MobileOperating);
+ }
+
+ void handleConnectivityChange(NetworkState currentStatus) {
+ if (currentStatus == mLastNetworkStatus) return;
+
+ mLastNetworkStatus = currentStatus;
+
+ if (currentStatus == NetworkState.Unavailable) {
+ return;
+ } else if (currentStatus != NetworkState.MobileOperating || !mPrefCrossNetwork) {
+ return;
+ }
+
+ boolean flag = false;
+ synchronized (this) {
+ for (DownloadMission mission : mMissionsPending) {
+ if (mission.running && mission.isFinished() && !mission.postprocessingRunning) {
+ flag = true;
+ mission.pause();
+ }
+ }
+ }
+
+ if (flag) mHandler.sendEmptyMessage(DownloadManagerService.MESSAGE_PAUSED);
+ }
+
+ void updateMaximumAttempts() {
+ synchronized (this) {
+ for (DownloadMission mission : mMissionsPending) mission.maxRetry = mPrefMaxRetry;
+ }
+ }
+
+ /**
+ * Fast check for pending downloads. If exists, the user will be notified
+ * TODO: call this method in somewhere
+ *
+ * @param context the application context
+ */
+ public static void notifyUserPendingDownloads(Context context) {
+ int pending = getPendingDir(context).list().length;
+ if (pending < 1) return;
+
+ Toast.makeText(context, context.getString(
+ R.string.msg_pending_downloads,
+ String.valueOf(pending)
+ ), Toast.LENGTH_LONG).show();
+ }
+
+ void checkForRunningMission(String location, String name, DownloadManagerService.DMChecker check) {
+ boolean listed;
+ boolean finished = false;
+
+ synchronized (this) {
+ DownloadMission mission = getPendingMission(location, name);
+ if (mission != null) {
+ listed = true;
+ } else {
+ listed = getFinishedMissionIndex(location, name) >= 0;
+ finished = listed;
+ }
+ }
+
+ check.callback(listed, finished);
+ }
+
+ public class MissionIterator extends DiffUtil.Callback {
+ final Object FINISHED = new Object();
+ final Object PENDING = new Object();
+
+ ArrayList
Vrij en licht streamen voor Android.Bekijken op GitHubLicentie van NewPipe
- Hulp is altijd welkom, of je nu nieuwe ideeën hebt, vertalingen kan bijdragen, wijzigingen in het ontwerp, opschonen van of grote wijzigingen in de code. Hoe meer hulp, hoe beter het wordt!
+ Hulp is altijd welkom. Of je nu nieuwe ideeën hebt, vertalingen kan aanleveren, wijzigingen in het ontwerp kan verrichten, code kan opschonen of van grote wijzigingen voorzien. Hoe meer hulp, hoe beter het wordt!Licentie lezenBijdragenDownload
@@ -198,15 +198,15 @@ te openen in pop-upmodusVervangend tekenLetters en cijfers
- Meeste speciale tekens
+ Speciaalste tekens
- Abonneer
+ AbonnerenGeabonneerd
- Abonnement opgezegd
- Kan het abonnement niet veranderen
- Kan het abonnement niet vernieuwen
+ Gedeabonneerd
+ Kan abonnement niet wijzigen
+ Kan abonnement niet bijwerken
- Start
+ StartpaginaAbonnementenNieuw
@@ -224,7 +224,7 @@ te openen in pop-upmodusGeschiedenisGezocht
- Gekeken
+ BekekenGeschiedenis is uitgeschakeldGeschiedenisDe geschiedenis is leeg
@@ -232,12 +232,12 @@ te openen in pop-upmodus
SpelerGedrag
- Geschiedenis & Cache
+ Geschiedenis en cacheAfspeellijstOngedaan makenGeen resultaten
- Niets te zien
+ Niets, maar dan ook niets te zienGeen abonnees
@@ -258,29 +258,29 @@ te openen in pop-upmodus
Item verwijderd
-Wil je dit item uit je zoekgeschiedenis verwijderen?
-Tip weergeven voor ingedrukt houden om toe te voegen
- Toon tip wanneer achtergrond- of pop-upknop is ingedrukt op de video-detailpagina
+Wil je dit item verwijderen uit je zoekgeschiedenis?
+Tip tonen voor ingedrukt houden om toe te voegen
+ Toon tip als achtergrond- of pop-upknop wordt ingedrukt op de videogegevenspaginaToegevoegd aan wachtrij voor achtergrondspelerToegevoegd aan wachtrij voor pop-upspelerAlles afspelenDeze stream kan niet worden afgespeeldOnherstelbare spelerfout opgetreden
- Aan het herstellen van spelerfout
+ Bezig met herstellen na spelerfout
- Content van hoofdpagina
- Blanke Pagina
+ Inhoud van hoofdpagina
+ Blanco paginaKioskpaginaAbonnementenpaginaFeedpaginaKanaalpagina
- Selecteer een kanaal
+ Kies een kanaalNog niet geabonneerd op een kanaal
- Selecteer een kiosk
+ Kies een kioskKiosk
- Trending
+ PopulairTop 50Nieuw en populairAchtergrondspeler
@@ -293,28 +293,28 @@ te openen in pop-upmodus
Toevoegen aan wachtrij in achtergrondToevoegen aan wachtrij in pop-up
- Hier beginnen spelen
- Hier beginnen in achtergrond
- Hier beginnen in pop-up
+ Begin hier met afspelen
+ Begin hier met afspelen op achtergrond
+ Begin hier met afspelen in pop-upDonerenNewPipe wordt door vrijwilligers in hun vrije tijd ontwikkeld om jou de beste ervaring te brengen. Geef wat terug zodat onze ontwikkelaars NewPipe nóg beter kunnen maken terwijl ze van hun kopje koffie genieten.TeruggevenWebsiteBezoek de website van NewPipe voor meer informatie en het laatste nieuws.
- Standaardinhoudsland
+ Standaard inhoudslandDienstOriëntatie wijzigenVerplaatsen naar achtergrondVerplaatsen naar pop-up
- Verplaatsen naar normaal
+ Verplaatsen naar hoofdvensterMenu openenMenu sluiten
- Geen speler met streamondersteuning gevonden (je kan VLC installeren om het af te spelen)
+ Geen speler met streamondersteuning gevonden (je kan VLC installeren om af te spelen)AltijdEenmalig
- Externe spelers ondersteunen deze soorten koppelingen niet
+ Externe spelers ondersteunen dit soort links nietOngeldige URLGeen videostreams gevondenGeen audiostreams gevonden
@@ -324,20 +324,20 @@ te openen in pop-upmodus
Pop-upspelerAltijd vragen
- Info ophalen…
+ Bezig met ophalen van informatie…Bezig met laden van gevraagde inhoud
-Database importeren
- Database exporteren
- Dit zal je huidige geschiedenis en abonnementen overschrijven
- Exporteer geschiedenis, abonnementen en speellijsten
- Export voltooid
- Import voltooid
+Databank importeren
+ Databank exporteren
+ Dit overschrijft je huidige geschiedenis en abonnementen
+ Exporteer geschiedenis, abonnementen en afspeellijsten
+ Exporteren voltooid
+ Importeren voltooidGeen geldig ZIP-bestand
- Opgelet: kon niet alle bestanden importeren.
- Dit zal je huidige configuratie overschrijven.
+ Let op: niet alle bestanden konden worden geïmporteerd.
+ Dit overschrijft je huidige configuratie.Streambestand downloaden.
- Info tonen
+ Informatie tonenBladwijzers
@@ -345,22 +345,22 @@ te openen in pop-upmodus
Versleep om de volgorde te wijzigen
- Aanmaken
- Één verwijderen
+ Creëren
+ Eén verwijderenAlles verwijderenSluiten
- Hernoemen
+ Naam wijzigen
- Wil je dit item uit je kijkgeschiedenis verwijderen?
- Wil je alle items uit je geschiedenis verwijderen?
+ Wil je dit item verwijderen uit je kijkgeschiedenis?
+ Wil je alle items verwijderen uit je geschiedenis?Laatst afgespeeldMeest afgespeeldAltijd vragen
- Nieuwe afspeellijst aanmaken
+ Nieuwe afspeellijst creërenAfspeellijst verwijderen
- Afspeellijst hernoemen
+ Afspeellijstnaam wijzigenNaamToevoegen aan afspeellijstInstellen als miniatuur voor afspeellijst
@@ -376,7 +376,7 @@ te openen in pop-upmodus
Geen bijschriften
- Passen
+ InpassenOpvullenInzoomen
@@ -404,8 +404,8 @@ te openen in pop-upmodus
Ongeldige mapOngeldig bestand/Ongeldige inhoudsbron
- Het bestand bestaat niet of u beschikt niet over voldoende machtiging om het te lezen/er naar te schrijven
- De bestandsnaam mag niet leeg zijn
+ Het bestand bestaat niet of je bent onvoldoende gemachtigd om het te lezen/er naar te schrijven
+ De bestandsnaam mag niet blanco zijnEr is een fout opgetreden: %1$sImporteren/Exporteren
@@ -435,7 +435,7 @@ te openen in pop-upmodus
\n4. Kopieer de koppeling van de pagina waar je op terechtkomt (dat is je profiel-URL).
jouwID, soundcloud.com/jouwid
- Let op: deze actie kan veel MB’s van je netwerk gebruiken.
+ Let op: deze actie kan veel MB’s van je mobiele netwerk gebruiken.
\n
\nWil je doorgaan?Miniatuurvoorbeelden laden
@@ -456,7 +456,7 @@ te openen in pop-upmodusGeen streams beschikbaar voor downloadenBijschriften
- Bijschriftgrootte en achtergrondstijlen wijzigen. Vereist een herstart van de app
+ Bijschriftgrootte en -achtergrondstijlen wijzigen. Vereist een herstart van de appEr is geen app geïnstalleerd die dit bestand kan afspelen
@@ -464,22 +464,22 @@ te openen in pop-upmodus
Verwijdert de geschiedenis van afgespeelde streamsVerwijdert de gehele kijkgeschiedenis.
- Kijkgeschiedenis verwijderd.
+ Kijkgeschiedenis gewist.Zoekgeschiedenis wissenVerwijdert de gebruikte zoektermenVerwijdert de gehele geschiedenis.
- Zoekgeschiedenis verwijderd.
+ Zoekgeschiedenis gewist.1 item verwijderd.NewPipe is vrije software: je kan het gebruiken, bestuderen, delen en verbeteren zoveel je maar wil. Je kan het opnieuw uitgeven en/of aanpassen volgens de voorwaarden van de GNU General Public License, gepubliceerd door de Free Software Foundation, versie 3 van de licentie, of (indien gewenst) om het even welke latere versie.Wil je ook de instellingen importeren?NewPipe\'s privacybeleid
- Het NewPipe-project neemt privacy serieus. Daarom verzamelt de app geen gegevens zonder jouw toestemming.
-\nNewPipe\'s privacybeleid legt gedetailleerd uit welke gegevens verstuurd en opgeslagen worden als je een crashrapport verstuurd.
+ Het NewPipe-project neemt privacy serieus. Daarom verzamelt de app geen gegevens zonder jouw toestemming.
+\nNewPipe\'s privacybeleid legt gedetailleerd uit welke gegevens verstuurd en opgeslagen worden als je een crashrapport verstuurt.Privacybeleid lezen
- Om de Europese Algemene Verordening Gegevensbescherming (ook wel: AVG of GDPR) na te leven, wijzen we je op het nieuwe privacybeleid van NewPipe. Lees dit zorgvuldig.
-\nJe moet het beleid accepteren om ons het bugrapport te kunnen sturen.
+ Om de Europese Algemene Verordening Gegevensbescherming (ook wel: AVG of GDPR) na te leven, wijzen we je op het nieuwe privacybeleid van NewPipe. Lees dit zorgvuldig.
+\nJe moet het beleid accepteren om ons het foutrapport te kunnen sturen.AccepterenWeigerenOngelimiteerd
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 560284f6a..c307caead 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -13,9 +13,19 @@
ਡਾਊਨਲੋਡ ਸਟਰੀਮ ਫਾਈਲ.ਖੋਜੋਸੇਟਿੰਗਾਂ
- ਕੀ ਤੁਹਾਡਾ ਮਤਲਬ: %1$s ?
+ ਕੀ ਤੁਹਾਡਾ ਮਤਲਬ: %1$s\?ਭੇਜੋBrowser ਚੁਣੋਉਲਟਾਨਾ
- ਹੋਰ ਪਲੇਅਰ ਵਰਤਣਾ
+ ਹੋਰ ਪਲੇਅਰ ਵਰਤਤੋ
+ ਕੁਝ ਵੀਡੀਓ ਰੈਸੋਲੂਸ਼ਨ ਚੁਣਨ ਨਾਲ ਆਡੀਓ ਮੌਜੂਦ ਨਹੀਂ ਹੋਵੇਗੀ
+ ਬਾਹਰੀ ਆਡੀਓ ਪਲੇਅਰ ਦੀ ਵਰਤੋਂ ਕਰੋ
+ NewPipe ਪੋਪਉਪ ਮੋਡ
+ ਸਅਬਸਕਰਾਇਬ
+ ਮੈਂਬਰ ਬਣਏ
+ ਚੈਨਲ ਸਦੱਸਤਾ ਰੱਦ ਕੀਤੀ ਗਈ
+ ਸਦੱਸਤਾ ਨੂੰ ਬਦਲਣ ਵਿਚ ਅਸਮਰੱਥ ਹੈ
+ ਜਾਣਕਾਰੀ
+
+ ਮੁੱਖ
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index fa885e51b..d25acce8d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -43,7 +43,7 @@
Następny filmPokaż \'następne\' i \'podobne\' filmyURL nieobsługiwany
- Domyślny język zawartości
+ Domyślny język zawartościWideo i audioWyglądInne
@@ -144,7 +144,7 @@
KanałTakPóźniej
- Wyłączone
+ WyłączonyFiltrOdświeżWyczyść
@@ -481,4 +481,18 @@
Brak limituLimit przy użyciu danych mobilnych
-
+ Kanały
+ Playlisty
+ Utwory
+ Użytkownicy
+ Przewiń w przód podczas ciszy
+ Krok
+ Zresetuj
+
+ Zminimalizuj podczas przełączenia aplikacji
+ "Akcja podczas przełączenia do innej aplikacji z głównego odtwarzacza — %s"
+ Zminimalizuj
+ Zminimalizuj do odtwarzania w tle
+ Zminimalizuj do odtwarzania w okienku
+
+
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4e08f4ee5..82a54c90c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -57,7 +57,7 @@
Reportar um erroTentar novamenteRotação
- Idioma de conteúdo preferido
+ Idioma de conteúdo preferidoConfiguraçõesAparênciaOutros
@@ -254,7 +254,7 @@ abrir em modo popup
Em AltaTop 50Novos e tendências
-"Mostrar dica \"mantenha pressionado\" para enfileirar"
+"Mostrar dica \"mantenha pressionado para enfileirar\""Mostrar dica quando o botão de plano de fundo ou de popup for pressionado na página de detalhes do vídeoAdicionado a fila do reprodutor em plano de fundoAdicionado a fila no reprodutor popup
@@ -291,7 +291,7 @@ abrir em modo popup
Alterar a orientaçãoAlterar para Plano de FundoAlterar para Popup
- Aletar para principal
+ Alterar para o PrincipalReprodutores externos não suportam estes tipos de linksURL inválida
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d8ca1a265..b27715fa3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -30,7 +30,7 @@
Vídeo seguinteMostrar vídeos \'seguintes\' e \'semelhantes\'URL não suportado
- Idioma padrão do conteúdo
+ Idioma padrão do conteúdoVídeo e áudioMiniatura de vídeos
@@ -184,7 +184,7 @@
SobreColaboradoresLicenças
- Aplicação leve, simples e grátis de YouTube para Android.
+ Aplicação leve livre de YouTube para Android.Ver no GitHubLicença do NewPipeSe tem ideias de tradução, alterações de design, limpeza de código ou alterações de código pesado—ajuda é sempre bem-vinda. Quanto mais se faz melhor fica!
@@ -293,7 +293,7 @@
Importar base de dadosExportar base de dadosIrá sobrepor o seu histórico atual e subscrições
- Exportar histórico, subscrições e listas de reprodução.
+ Exportar histórico, subscrições e listas de reproduçãoEm lista de espera no reprodutor em segundo planoEm lista de espera no reprodutor popupMudar para segundo plano
@@ -318,7 +318,7 @@
Utilizar pesquisa rápidaA pesquisa rápida permite que a pesquisa seja mais rápida mas diminui a qualidade da precisãoCarregar miniaturas
- Desative para parar o carregamento das miniaturas e poupar dados e memória. Se alterar esta opção limpa a cache de memória e do disco.
+ Desative para parar o carregamento das miniaturas e poupar dados e memória. Se alterar esta opção limpa a cache de memória e do discoCache de imagens limpaPaís padrão para o conteúdoDepuração
@@ -333,7 +333,7 @@
DescartarSite
- Para obter mais informações e saber as novidades do NewPipe, aceda ao nosso site.
+ Visite ao website NewPipe para obter mais informações e saber as novidades.Página \"kiosk\"Página da fonteExportação terminada
@@ -364,7 +364,7 @@
Perguntar sempreA obter informação…
- O conteúdo requisitado está a carregar
+ O conteúdo requisitado está carregandoCriar Nova Lista de ReproduçãoApagar Lista de Reprodução
@@ -379,7 +379,7 @@
Thumbnail da Lista de Reprodução modificadaSem Legenda
- ZOOM
+ ZoomGerado automaticamente
@@ -398,24 +398,47 @@
Importação de subscrições falhouExportação de subscrições falhou
- Para importar as tuas subscrições do Google vais precisar do ficheiro de exportação, que pode ser descarregado com auxílio destas instruções:
-\n
-\n1. Vai a esta hiperligação: %1$s
-\n2. Inicia a tua sessão quando requisitado
-\n3. O descarregamento deve começar (esse é o ficheiro de exportação)
- Para importar as contas que segue no SoundCloud, terá que saber o link ou id do seu perfil. Se souber, basta escrever um deles no campo abaixo e estará tudo pronto.
+ Para importar as tuas subscrições do Youtube vais precisar do ficheiro de exportação, que pode ser descarregado com auxílio destas instruções:
\n
-\nSe não souber, pode seguir estas etapas:
+\n1. Vai a esta hiperligação: %1$s
+\n2. Inicia a tua sessão quando requisitado
+\n3. O descarregamento deve começar (esse é o ficheiro de exportação)
+ Para importar as contas SoundCloud, vais precisar do link ou id do seu perfil que pode ser descarregado com auxílio destas instruções:
\n
\n1. Ative \"modo desktop\" num navegador da internet (o site não está disponível para dispositivos móveis)
\n2. Vá a este url: %1$s
\n3. Inicie sessão na sua conta quando solicitado
-\n4. Copie o link para o qual foi redirecionado (este é o link do seu perfil)
- seuid, soundcloud.com/seuid
+\n4. Copie o link para o qual foi redirecionado.
+ seuID, soundcloud.com/seuIDControlo de velocidade de reproduçãoTempoNightcorePredefinidoLimpar histórico de exibição
+ Auto anexar um fluxo relacionado quando jogar o último fluxo em uma fila não repetitiva
+ Mostrar dica \"mantenha pressionado para enfileirar\"
+ Mostrar dica quando o botão de plano de fundo ou de popup for pressionado na página de detalhes do vídeo
+ Canais
+ Listas de reprodução
+ Faixas
+ Utilizadores
+ Deleta o histórico de videos já reproduzidos
+ Deleta o histórico de videos já reproduzidos.
+ Histórico de já assistidos deletado.
+ Deleta histórico de pesquisa
+ Deleta histórico de palavras chave pesquisadas
+ Deleta histórico de pesquisa completo.
+ Histórico de pesquisa deletado.
+ 1 elemento deletado.
+
+ Nehum aplicativo instalada para reproduzir este arquivo
+
+ NewPipe é desenvolvido por voluntários que usam seu tempo para trazer a melhor experiência para você. Retribua para ajudar os desenvolvedores a tornarem o NewPipe ainda melhor enquanto desfrutam uma xícara de café.
+ Retribuir
+ Política de privacidade do NewPipe
+ O projeto NewPipe leva a sua privacidade muito a sério. Sendo assim, o aplicativo não coleta nenhum dado sem seu consentimento.
+\nA polícia de privacidade do NewPipe explica em detalhes qual dado é enviado e salvo quando você envia um relatório de erros.
+ Ler a política de privacidade
+ Próximo stream automaticamente em lista de espera
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a45b48199..cf7b5510a 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -41,7 +41,7 @@
Următorul videoclipArată videoclipurile care urmeazăURL nesuportat
- Limba dorită a conținutului
+ Limba dorită a conținutuluiVideo & AudioAspectAltele
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 12de382ea..3fad6b288 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -30,7 +30,7 @@
Следующее видеоURL не поддерживается\"Следующее\" и \"Похожие\" видео
- Язык контента по умолчанию
+ Язык контента по умолчаниюВидео и аудиоВнешний видДругое
@@ -470,7 +470,7 @@
Удалить историю запросов поискаУдалить историю воспроизведённых потоковВся история поиска будет удалена.
- История поиска удалена
+ История поиска удалена.1 элемент удалён.NewPipe — свободное программное обеспечение: вы можете использовать, изучать и улучшать его по своему усмотрению. В частности, вы можете распространять и/или изменять его в соответствии с условиями GNU General Public License, опубликованной Free Software Foundation, либо версии 3, либо (по вашему выбору) любой более поздней версии.
@@ -490,6 +490,7 @@
Предел разрешения в мобильной сетиКаналыПлейлисты
+ ВидеоДорожкиПользователиПроматывать тишину
@@ -502,4 +503,26 @@
Фоновый плеерПлеер в окне
+ Вид списка
+ Список
+ Сетка
+ Автоматически
+
+ Менять яркость плеера жестом
+ Жест яркости
+ Загрузка на внешний накопитель невозможна. Сбросить расположение папки загрузки?
+ Внешний накопитель недоступен
+ Вкладки, видимые на главной странице
+ По умолчанию
+ Хотите восстановить умолчания?
+ Ошибка чтения сохранённых вкладок. Используются вкладки по умолчанию
+ Выбор
+ Количество подписчиков недоступно
+ Переключить вид
+ Выберите вкладку
+ Новая вкладка
+ Отписаться
+ Менять громкость плеера жестом
+ Жест громкости
+
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 0fefdd04e..a7359b0d7 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -29,7 +29,7 @@
Prehrať cez KodiAplikácia Kore nie je nainštalovaná. Chcete ju nainštalovať?Zobraziť možnosť \"Prehrať cez Kodi\"
- Zobrazovať možnosť prehrať video cez mediálne centrum Kodi
+ Zobrazovať možnosť prehrať video cez multimediálne centrum KodiZvukPredvolený zvukový formátTéma
@@ -40,7 +40,7 @@
Ďalšie videoUkázať \'ďalšie\' a \'podobné\' videáURL nie je podporovaná
- Preferovaný jazyk obsahu
+ Preferovaný jazyk obsahuVideo & ZvukVzhľadIné
@@ -309,10 +309,10 @@
PremenovaťPrispieť
- Aplikácia NewPipe je vyvíjaná dobrovoľníkmi vo voľnom čase. Ak sa vám aplikácia páči a chceli by ste odmeniť vývojárov, teraz je ten najlepši čas. Podporte vývojárov aby mohli NewPipe zlepšovať a zároveň si pochutnávať na šálke kávy!
+ Aplikácia NewPipe je vyvíjaná dobrovoľníkmi vo voľnom čase. Ak sa vám aplikácia páči, odmeňte vývojárov aby mohli NewPipe naďalej vylepšovať. Určite ich poteší napríklad šálka dobrej kávy.DarujWebstránka
- Ak chcete získať ďalšie informácie a novinky o NewPipe navštívte naše webové stránky.
+ "Pre viac informácií a noviniek navštívte webstránku NewPipe."Chcete odstrániť túto položku z histórie vyhľadávania?Chcete odstrániť túto položku z histórie pozretých videí?Ste si istý, že chcete vymazať všetky položky z histórie?
@@ -377,7 +377,7 @@
Miniatúra zoznamu skladieb bola zmenenáNemožno odstrániť zoznam skladieb
- Bez popisu
+ Bez titulkovPrispôsobiťVyplniť
@@ -417,14 +417,14 @@
Automaticky vygenerované
- Nastavenie titulkov
+ TitulkyUpravte mierku textu titulkov a štýly pozadia. Vyžaduje reštart prehrávačaPovoliť službu LeakCanaryMonitorovanie pretečenia pamäte môže spôsobiť, že aplikácia nebude reagovaťNahlásiť mimo-cyklické chyby
- Vynútenie hlásenia nedodržateľných výnimiek Rx, ktoré sa vyskytnú mimo časového cyklu fragmentu alebo aktivity po zlikvidovaní
+ Vynútiť hlásenie výnimiek nedoručiteľných Rx mimo časového cyklu fragmentov alebo aktivity po zneškodneníImport/Export
\n
@@ -449,16 +449,13 @@
\n2. Po výzve sa prihláste do svojho účtu
\n3. Sťahovanie by malo začať (to je exportovaný zoznam)
\n
- "Importovať SoundCloud profil zadaním URL adresy alebo vášho ID:
-\n
-\nAk nepoznáte ani URL ani ID vašeho profilu, môžete postupovať nasledovne:
-\n
-\n1. V niektorom prehliadači povoľte režim \"desktop\" (web nie je dostupný pre mobilné zariadenia)
-\n2. Prejdite na túto adresu URL: %1$s
+ "Importovať SoundCloud profil zadaním URL adresy alebo vášho ID:
+\n
+\n1. Prepnite režim na \"desktop\" (web nie je dostupný pre mobilné zariadenia)
+\n2. Prejdite na túto URL adresu: %1$s
\n3. Po výzve sa prihláste do svojho účtu
-\n4. Skopírujte adresu URL, na ktorú ste boli presmerovaní (to je adresa vášho profilu).
-\n"
- ID,soundcloud.com/ID
+\n4. Skopírujte adresu URL, na ktorú ste boli presmerovaní. "
+ vašeID, soundcloud.com/vašeidOperácia môže byť náročná na počet prenesených dát.
\n
@@ -467,7 +464,7 @@
Ovládanie rýchlosti prehrávaniaRýchlosťVýška
- "Zvoľnenie (môže spôsobovať skreslenie)"
+ "Spomalenie (môže spôsobovať skreslenie)"Nightcore režimPredvolenéVymazať históriu pozretí
@@ -493,4 +490,18 @@
Bez limituLimitovať rozlíšenie pri použití mobilných dát
-
+ Kanály
+ Zoznamy skladieb
+ Skladby
+ Používatelia
+ Pretáčať tiché pasáže
+ Krok
+ Vynulovať
+
+ Minimalizovať pri prepnutí aplikácie
+ Akcia pri prepnutí na inú aplikáciu z hlavného prehrávača videa — %s
+ Nič
+ Prehrávať na pozadí
+ Prehrávať v okne
+
+
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index d2d6d4343..ec2a0bea5 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -29,7 +29,7 @@
Naslednji videoPokaži naslednji video in podobne posnetkeZapis naslova URL ni podprt.
- Privzeti jezik vsebine
+ Privzeti jezik vsebineVideo in ZvokSličica predogleda videaSličica predogleda videa
@@ -91,7 +91,7 @@
Opomba (v angleščini):Dovoljenje za dostop do shrambe je zavrnjenoSamodejno predvajanje
- Samodejno predvaja vsebino, če je NewPipe klican iz drugega programa
+ Predvaja vsebino, če je program zagnan iz drugega programaPošlji poročilo o napakiPoročilo uporabnika
@@ -320,4 +320,5 @@ odpiranje v pojavnem načinuOpustiPreimenuj
+ Naloži sličice
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 86d15b020..ec31c4a97 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -30,7 +30,7 @@
ShkarkoVideoja tjetërShërbimi
- Gjuha e dëshiruar e përmbajtjeve
+ Gjuha e dëshiruar e përmbajtjeveAplikacioni për videoSjelljaVideo & Audio
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 60f99e254..fa3011936 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -28,7 +28,7 @@
Следећи видеоУРЛ није подржанПрикажи следећи и слични видео
- Подразумевани језик садржаја
+ Подразумевани језик садржајаВидео и аудиоОсталоСличица видео прегледа
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index ed426cc13..ddf3888f5 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -10,10 +10,10 @@
Ladda nerSökInställningar
- Menade du: %1$s ?
+ Menade du: %1$s\?Dela medVälj webbläsare
- rotering
+ rotationAnvänd extern videospelareNågra upplösningar kommer INTE ha ljud när det här alternativet är aktiveratAnvänd extern ljudspelare
@@ -57,7 +57,7 @@
Nästa videoVisa \'nästkommande\' och \'liknande\' videorWebbadressen stöds inte
- Standard innehållsspråk
+ Standard innehållsspråkVideo & LjudPopup-rutaUtseende
@@ -109,7 +109,7 @@
%1$s visningarPrenumereraPrenumererad
- Prenumerationen togs bort
+ Prenumeration avslutadKunde inte ändra prenumerationKunde inte uppdatera prenumeration
@@ -286,10 +286,10 @@
Bokmärken
- Lägga till
+ Lägg tillAnvända snabb inexakt sökning
- Ladda miniatyrer
+ Ladda miniatyrbilderInaktivera för att stoppa alla miniatyrbilder från att ladda och spara på data och minnesanvändning. Ändring av detta kommer att rensa cache-minnetBild cacheminnet var rensadTjänst
@@ -396,7 +396,7 @@
Vill du ta bort den här spellistan?Spellistan skapadesTillagad i spellistan
- "Spellistans miniatyrbild förändrades "
+ Spellistans miniatyrbild förändradesKunde inte ta bort spellistanIngen textning
@@ -449,7 +449,7 @@
Uppspelningshastighet KontrollerTempo
- Pitch
+ TonhöjdAvlänka (kan orsaka förvrängning)Snabbspola vid frånvaro av ljudSteg
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index dc14446e7..b566977d5 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -53,7 +53,7 @@
తదుపరి వీడియో మరియు ఇలాంటి వీడియోచిట్కాను అనుబంధించడానికి హోల్డ్ను చూపుUrl మద్దతు లేదు
- డిఫాల్ట్ భాష
+ డిఫాల్ట్ భాషప్లేయర్ప్రవర్తనవీడియో & ఆడియో
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e7715d545..bffad3ed8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -11,7 +11,7 @@
İndirAraAyarlar
- Bunu mu demek istediniz: %1$s ?
+ Bunu mu demek istediniz: %1$s\?Şununla paylaşTarayıcı seçdöndürme
@@ -42,7 +42,7 @@
Sonraki video\'Sonraki\' ve \'benzer\' videoları gösterURL desteklenmiyor
- Öntanımlı içerik dili
+ Öntanımlı içerik diliSesVideo ve SesGörünüm
@@ -65,7 +65,7 @@
Web sitesi tümüyle ayrıştırılamadıİçerik kullanılabilir değilGEMA tarafından engellendi
- Bu, henüz desteklenmeyen, bir CANLI AKIŞ.
+ Bu, henüz desteklenmeyen bir CANLI AKIŞ.Herhangi bir akış alınamadıResim yüklenemediUygulama/arayüz çöktü
@@ -254,7 +254,7 @@
Geçmiş temizlendiÖge silindiBu içeriği arama geçmişinden silmek istiyor musunuz?
-\"Kuyruğa almak İçin bas\" ipucunu göster
+\"Kuyruğa almak için basılı tut\" ipucunu gösterVideo ayrıntıları sayfasında arka plan veya açılır oynatıcı düğmesine basıldığında ipucu gösterArka plan oynatıcıda kuyruğa eklendiAçılır oynatıcıda kuyruğa eklendi
@@ -272,7 +272,7 @@
Abonelik SayfasıBesleme SayfasıKanal Sayfası
- Bir kanal seç
+ Kanal seçHenüz abone olunan kanal yokKöşk seç
@@ -285,7 +285,7 @@
KaldırAyrıntılarSes Ayarları
- Kuyruğa Almak İçin Bas
+ Kuyruğa Almak İçin Basılı TutArka Planda Kuyruğa AlAçılır Oynatıcıda Kuyruğa AlBurada Oynatmaya Başla
@@ -334,9 +334,9 @@
Akış dosyasını indir.Bilgileri göster
- Yer imleri
+ Yer İmleri
- Şuna Ekle
+ Listeye EkleYeniden sıralamak için sürükle
@@ -380,7 +380,7 @@
Normal yazı tipiDaha büyük yazı tipiHata Ayıklama
- Yakında burada bir şeyler görünecek ;D
+ Yakında burada bir şeyler görünecek :)Kendiliğinden Üretilmiş
@@ -435,7 +435,7 @@
\n
\nDevam etmek istiyor musunuz?
Küçük resimleri yükle
- Küçük resimlerin hepsinin yüklenmesini engellemek ve bellek ve veri kullanımını azaltmak için devre dışı bırakın. Bunu değiştirmek, hem bellekteki hem de diskteki resim önbelleğini temizler
+ Küçük resimlerin tümünün yüklenmesini engellemek, bellek ve veri kullanımını azaltmak için devre dışı bırakın. Bunu değiştirmek, hem bellekteki hem de diskteki resim önbelleğini temizlerResim önbelleği temizlendiÖnbelleklenmiş üst veriyi temizleÖnbelleklenmiş tüm web sayfası verisini kaldır
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 084c85920..1dccd25cf 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -10,7 +10,7 @@
ЗавантажитиШукатиНалаштування
- Чи ви мали на увазі: %1$s ?
+ Чи ви мали на увазі: %1$s\?Поділитись зОберіть переглядачобертання
@@ -44,7 +44,7 @@
Наступний відеозаписЯвляти \"наступні\" й \"схожі\" відеоURL не підтримується
- Переважна мова контенту
+ Переважна мова контентуВідео та АвдіоЗовнішній виглядІнше
@@ -483,8 +483,12 @@
До тлового програвачаЗменшити до віконного програвачу
-Канали
+ КаналиПлейлистиСтежкиКористувачі
-
+
+ Вигляд списку
+ Список
+ Сiтка
+
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index a55f01085..b5203fbc0 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -28,14 +28,14 @@
Đường dẫn để lưu trữ âm thanh đã tải xuốngNhập đường dẫn tải xuống cho tệp âm thanh
- Tự động phát khi được gọi từ một ứng dụng khác
- Tự động phát một video khi NewPipe được gọi từ một ứng dụng khác
+ Tự động phát
+ Phát video khi NewPipe được gọi từ một ứng dụng khácĐộ phân giải mặc địnhĐộ phân giải popup mặc địnhHiển thị độ phân giải cao hơnChỉ một số thiết bị hỗ trợ chơi các video 2K / 4KPhát với Kodi
- Ứng dụng Kore không tìm thấy. Cài đặt Kore?
+ Không tìm thấy ứng dụng Kore. Cài đặt nó?Hiển thị tùy chọn \"Phát với Kodi\"Hiển thị tùy chọn để phát video qua trung tâm media KodiÂm thanh
@@ -47,7 +47,7 @@
TốiĐenNhớ kích thước và vị trí bật lên
- Nhớ kích thước và vị trí cuối cùng được đặt vào cửa sổ bật lên
+ Nhớ kích thước và vị trí bật lên cuối cùngĐiều khiển cử chỉ trình phátSử dụng cử chỉ để kiểm soát độ sáng và âm lượng của trình phátĐề xuất tìm kiếm
@@ -56,7 +56,7 @@
Tải vềVideo tiếp theo
- Hiển thị các video tiếp theo và tương tự
+ Hiển thị video \'tiếp theo\' và \'tương tự\'URL không được hỗ trợHiển thịKhác
@@ -65,7 +65,7 @@
PhátNội dungHiển thị nội dung bị hạn chế độ tuổi
- Video bị giới hạn về tuổi. Bật chế độ cho phép hiển thị video bị hạn chế về độ tuổi ở trong cài đặt trước.
+ Video giới hạn độ tuổi người xem. Cho phép các tài liệu đó có thể từ Cài đặt.Trực tiếpTải xuốngTải xuống
@@ -84,20 +84,20 @@
LỗiLỗi kết nối mạngKhông thể tải tất cả các thumbnails
- Không thể giải mã chữ ký URL của video.
- Không thể phân tích trang web.
- Không thể phân tích trang web hoàn toàn.
- Nội dung không có sẵn.
- Chặn bởi GEMA.
- Không thể thiết lập trình đơn tải xuống.
- Đây là một video phát trực tiếp. Chúng chưa được hỗ trợ.
- Không thể lấy bất kỳ luồng nào.
+ Không thể giải mã chữ ký URL video
+ Không thể phân tích cú pháp trang web
+ Không thể phân tích cú pháp hoàn toàn trang web
+ Nội dung không khả dụng
+ Chặn bởi GEMA
+ Không thể thiết lập menu tải xuống
+ Đây là STREAM LIVE, chưa được hỗ trợ.
+ Không thể lấy bất kỳ luồng nàoKhông thể tải hình ảnhỨng dụng / Giao diện người dùng bị lỗiXin lỗi, điều đó không nên xảy ra.Báo lỗi qua emailXin lỗi, một số lỗi đã xảy ra.
- BÁo CÁO
+ BÁO CÁOThông tin:Chuyện gì đã xảy ra:Gì: \\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version:
@@ -123,7 +123,7 @@
Thử lạiQuyền truy cập vào bộ nhớ đã bị từ chốiSử dụng trình phát cũ
- Máy nghe nhạc Mediaframework tích hợp sẵn.
+ Máy nghe nhạc Mediaframework tích hợp sẵnngàn
@@ -132,7 +132,7 @@
Bắt đầuDừng
- Xem
+ ChơiXóachecksum
@@ -148,7 +148,7 @@
NewPipe đang tải xuốngChạm để biết chi tiếtVui lòng đợi …
- Sao chép vào clipboard.
+ Sao chép vào clipboardHãy chọn một thư mục tải về có sẵn.Sự cho phép này là cần thiết để
\nMở trong chế độ bật lên
@@ -168,17 +168,17 @@
Cộng tác viênGiấy phépGiao diện trực quan nhẹ cho Android.
- Xem trên Github
+ Xem trên GitHubGiấy phép của NewPipeCho dù bạn có ý tưởng, dịch, thay đổi thiết kế, làm sạch mã hoặc thay đổi mã, sự trợ giúp luôn được hoan nghênh. Càng làm nhiều thì càng tốt!Đọc giấy phépSự đóng gópQuay
- Ngôn ngữ nội dung ưu tiên
+ Ngôn ngữ nội dung ưu tiênVideo & Âm thanh
- Bật lên
- Lịch sử
- Lịch sử
+ Cửa sổ
+ Lịch sử & bộ nhớ cache
+ Lịch sử & bộ nhớ cacheDanh sáchKhông tìm thấyTheo dõi
@@ -187,4 +187,276 @@
Không thể thay đổi tình trạng theo dõiKhông thể cập nhật tình trạng theo dõi
-
+ Không tìm thấy trình phát luồng nào (bạn có thể cài đặt VLC để phát)
+ Tải xuống tệp luồng.
+ Hiển thị thông tin
+
+ main
+ Đăng ký
+ Dấu trang
+
+ Có gì mới
+
+ Thêm vào
+
+ Sử dụng tìm kiếm không chính xác nhanh
+ Tìm kiếm không chính xác cho phép người chơi tìm kiếm vị trí nhanh hơn với độ chính xác giảm
+ Tải hình thu nhỏ
+ Vô hiệu hóa để ngăn chặn tất cả các hình thu nhỏ tải và lưu dữ liệu và sử dụng bộ nhớ. Thay đổi điều này sẽ xóa bộ nhớ cache hình ảnh trong bộ nhớ và trên đĩa
+ Đã xóa bộ nhớ cache hình ảnh
+ Xóa siêu dữ liệu đã lưu vào bộ nhớ cache
+ Xóa tất cả dữ liệu trang web được lưu trong bộ nhớ cache
+ Đã xóa bộ nhớ cache siêu dữ liệu
+ Tự động phát tiếp theo theo hàng
+ Tự động thêm một luồng có liên quan khi phát luồng cuối cùng trong hàng đợi không lặp lại
+ Lịch sử tìm kiếm
+ Lưu trữ truy vấn tìm kiếm cục bộ
+ Theo dõi các video đã xem
+ Tiếp tục lấy tiêu điểm
+ Tiếp tục phát sau khi bị gián đoạn (ví dụ: cuộc gọi điện thoại)
+ Hiển thị mẹo \"giữ để nối thêm\"
+ Hiển thị mẹo khi nhấn nút nền hoặc bật lên trên trang chi tiết video
+ Quốc gia nội dung mặc định
+ Dịch vụ
+ Phát
+ Hành vi
+ Gỡ lỗi
+ Đã xếp hàng đợi trên trình phát nền
+ Xếp hàng đợi trên trình phát bật lên
+ Kênh
+ Danh sách phát
+ Bản nhạc
+ Người dùng
+ Hủy bỏ
+ Chơi tất cả
+ Luôn luôn
+ Chỉ một lần
+ Tập tin
+
+ Thông báo NewPipe
+ Thông báo cho nền mới và Trình phát Popup
+
+ [Không xác định]
+
+ Chuyển đổi hướng màn hình
+ Chuyển sang nền
+ Chuyển sang Popup
+ Chuyển sang Main
+
+ Nhập cơ sở dữ liệu
+ Xuất cơ sở dữ liệu
+ Sẽ ghi đè lịch sử và đăng ký hiện tại của bạn
+ Xuất lịch sử, đăng ký và danh sách phát
+ Xóa lịch sử xem
+ Xóa lịch sử của các luồng đã phát
+ Xóa toàn bộ lịch sử xem.
+ Đã xóa lịch sử xem.
+ Xóa lịch sử tìm kiếm
+ Xóa lịch sử của từ khóa tìm kiếm
+ Xóa toàn bộ lịch sử tìm kiếm.
+ Đã xóa lịch sử tìm kiếm.
+ Không thể phát luồng này
+ Đã xảy ra lỗi trình phát không thể khôi phục
+ Phục hồi từ lỗi trình phát
+ Người chơi bên ngoài không hỗ trợ các loại liên kết này
+ URL không hợp lệ
+ Không tìm thấy luồng video nào
+ Không tìm thấy luồng âm thanh nào
+ Thư mục không hợp lệ
+ Nguồn tệp / nội dung không hợp lệ
+ Tệp không tồn tại hoặc không đủ quyền đọc hoặc ghi vào tệp
+ Tên tệp không được để trống
+ Đã xảy ra lỗi: %1$s
+ Không có luồng nào để tải xuống
+
+ Không có gì ở đây Nhưng dế
+ Kéo để sắp xếp lại
+
+ Không có người đăng ký
+
+ %s người đăng kí
+
+
+ Không có lượt xem nào
+
+ %s lượt xem
+
+
+ Không có video nào
+
+ %s video
+
+
+ Tạo nên
+ Xóa một
+ Xóa hết
+ Bỏ qua
+ Đổi tên
+
+ Đã xóa 1 mục.
+
+ Tải về
+ Các ký tự được cho phép trong tên tệp
+ Ký tự không hợp lệ được thay thế bằng giá trị này
+ Ký tự thay thế
+
+ Chữ cái và chữ số
+ Hầu hết các ký tự đặc biệt
+
+ Không có ứng dụng nào được cài đặt để phát tệp này
+
+ Đóng góp
+ NewPipe được phát triển bởi các tình nguyện viên dành thời gian mang lại cho bạn những trải nghiệm tốt nhất. Hãy trở lại để giúp các nhà phát triển làm cho NewPipe thậm chí còn tốt hơn trong khi thưởng thức một tách cà phê.
+ Trả lại
+ Trang mạng
+ Truy cập trang web NewPipe để biết thêm thông tin và tin tức.
+ Chính sách bảo mật của NewPipe
+ Dự án NewPipe rất coi trọng quyền riêng tư của bạn. Do đó, ứng dụng không thu thập bất kỳ dữ liệu nào mà không có sự đồng ý của bạn.
+\nChính sách bảo mật của NewPipe giải thích chi tiết dữ liệu nào được gửi và lưu trữ khi bạn gửi báo cáo sự cố.
+ Đọc chính sách bảo mật
+ NewPipe là phần mềm miễn phí copyleft: Bạn có thể sử dụng, chia sẻ nghiên cứu và cải thiện nó theo ý muốn của bạn. Cụ thể bạn có thể phân phối lại và / hoặc sửa đổi nó theo các điều khoản của Giấy phép Công cộng GNU như được xuất bản bởi Quỹ Phần mềm Tự do, hoặc phiên bản 3 của Giấy phép, hoặc (tùy chọn của bạn) bất kỳ phiên bản nào sau này.
+ Lịch sử
+ Đã tìm kiếm
+ Đã xem
+ Lịch sử bị tắt
+ Lịch sử
+ Lịch sử trống
+ Đã xóa lịch sử
+ Đã xóa mục
+ Bạn có muốn xóa mục này khỏi lịch sử tìm kiếm không?
+ Bạn có muốn xóa mục này khỏi lịch sử xem không?
+ Bạn có chắc chắn muốn xóa tất cả các mục khỏi lịch sử không?
+ Lần chơi cuối
+ Hầu hết phát
+
+ Nội dung trang chính
+ Trang trống
+ Trang chủ
+ Trang đăng ký
+ Trang nguồn cấp dữ liệu
+ Trang kênh
+ Chọn kênh
+ Chưa có kênh nào được đăng ký
+ Chọn Trang chủ
+ Xuất xong
+ Nhập hoàn tất
+ Không có tệp ZIP hợp lệ
+ Cảnh báo: Không thể nhập tất cả các tệp.
+ Thao tác này sẽ ghi đè cài đặt hiện tại của bạn.
+ Bạn cũng muốn nhập cài đặt?
+
+ Trang chủ
+ Xu hướng
+ Mới & hot
+ Trình phát nền
+ Trình phát Popup
+ Tẩy xoá
+ Chi tiết
+ Cài đặt âm thanh
+ Giữ để Enqueue
+ Phát trên nền
+ Phát qua cửa sổ
+ Bắt đầu chơi ở đây
+ Bắt đầu ở đây trên nền
+ Bắt đầu ở đây trên Popup
+
+ Mở ngăn kéo
+ Đóng ngăn
+ Một cái gì đó sẽ xuất hiện ở đây sớm ;D
+
+
+ Hành động \'mở\' được ưu tiên
+ Hành động mặc định khi mở nội dung — %s
+
+ Trình phát video
+ Trình phát nền
+ Trình phát Popup
+ Luôn luôn hỏi
+
+ Đang nhận thông tin…
+ Đang tải nội dung được yêu cầu
+
+ Tạo danh sách mới
+ Xóa danh sách phát
+ Đổi tên danh sách phát
+ Tên
+ Thêm vào danh sách phát
+ Đặt làm Hình thu nhỏ của danh sách phát
+
+ Đánh dấu trang danh sách phát
+ Xóa dấu trang
+
+ Bạn có muốn xóa danh sách phát này không?
+ Đã tạo danh sách phát
+ Đã thêm vào danh sách phát
+ Đã thay đổi hình thu nhỏ của danh sách phát
+ Không thể xóa danh sách phát
+
+ Không có phụ đề
+
+ Phù hợp
+ Lấp đầy
+ Thu phóng
+
+ Tự động tạo ra
+
+ Phụ đề
+ Sửa đổi tỷ lệ văn bản chú thích của người chơi và kiểu nền. Yêu cầu khởi động lại ứng dụng để có hiệu lực
+
+ Bật LeakCanary
+ Theo dõi rò rỉ bộ nhớ có thể khiến ứng dụng trở nên không phản hồi khi đổ xô đống
+
+ Báo cáo lỗi ngoài vòng đời
+ Buộc báo cáo ngoại lệ Rx không thể gửi được bên ngoài vòng đời của mảnh hoặc hoạt động sau khi xử lý
+
+ Nhập khẩu/xuất khẩu
+ Nhập
+ Nhập từ
+ Xuất sang
+
+ Đang nhập…
+ Đang xuất …
+
+ Nhập tệp
+ Xuất trước
+
+ Không thể nhập đăng ký
+ Không thể xuất đăng ký
+
+ Nhập đăng ký YouTube bằng cách tải xuống tệp xuất:
+\n
+\n1. Truy cập URL này: %1$s
+\n2. Đăng nhập khi được hỏi
+\n3. Quá trình tải xuống sẽ bắt đầu (đó là tệp xuất)
+ Nhập hồ sơ SoundCloud bằng cách nhập URL hoặc ID của bạn:
+\n
+\n1. Bật \"chế độ màn hình\" trong trình duyệt web (trang web không khả dụng cho thiết bị di động)
+\n2. Truy cập URL này: %1$s
+\n3. Đăng nhập khi được hỏi
+\n4. Sao chép URL tiểu sử mà bạn đã được chuyển hướng đến.
+ Hãy nhớ rằng hoạt động này có thể là mạng đắt tiền.
+\n
+\nBạn có muốn tiếp tục?
+
+ Điều khiển tốc độ phát lại
+ Speed
+ Chiều cao
+ Hủy liên kết (có thể gây méo)
+ Tua đi nhanh trong khi im lặng
+ Tiếp theo
+ Cài lại
+
+ Để tuân thủ Quy định bảo vệ dữ liệu chung của châu Âu (GDPR), chúng tôi sẽ thu hút sự chú ý của bạn đến chính sách bảo mật của NewPipe. Vui lòng đọc kỹ.
+\nBạn phải chấp nhận nó để gửi cho chúng tôi báo cáo lỗi.
+ Chấp nhận
+ Từ chối
+
+ Không giới hạn
+ Giới hạn độ phân giải khi sử dụng dữ liệu di động
+ Giảm thiểu trên công tắc ứng dụng
+ Hành động khi chuyển sang ứng dụng khác từ trình phát video chính — %s
+ không ai
+ Thu nhỏ xuống trình phát nền
+ Thu nhỏ trình phát bật lên
+
+
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 39dfefe48..55cfad9ef 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -34,7 +34,7 @@
即将播放显示下一部和相似的视频不支援此网址
- 默认内容语言
+ 默认内容语言视频和音频外观其他
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index a8e847694..506705536 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -30,7 +30,7 @@
下一部影片顯示下一部及相關的影片不支援此網址
- 預設內容語言
+ 預設內容語言影片及聲音外觀其他
@@ -55,7 +55,7 @@
未能建立下載路徑「%1$s」已建立下載路徑「%1$s」
- 內容被 GEMA 封鎖。
+ 內容被 GEMA 封鎖按一下搜尋按鈕以開始操作自動撥放當其他應用程式要求播放影片時，NewPipe 將會自動播放
@@ -69,9 +69,9 @@
無法為影片地址的簽署解碼。無法讀取網站。無法完全讀取網站。
- 無法設定下載清單。
+ 無法設定下載清單此內容是一個直播串流，所以暫時未能播放。
- 無法取得任何串流。
+ 無法取得任何串流抱歉，這是不應該發生的。透過電郵彙報問題抱歉，程式出現了問題。
@@ -114,7 +114,7 @@
NewPipe 正在下載按一下以查看詳情請稍候…
- 已複製至剪貼板。
+ 已複製至剪貼板請選擇下載資料夾。在畫中畫模式開啟
@@ -130,7 +130,7 @@
所有頻道是
- 稍候
+ 稍後無法取得圖片應用程式或介面出現問題事件：\\n請求：\\n內容語言：\\n服務：\\nGMT 時間：\\nPackage：\\n版本：\\n作業系統版本：
@@ -165,7 +165,7 @@
最佳解像度調整大小
- 使用舊的內置 Mediaframework 播放器。
+ 使用舊的內置 Mediaframework 播放器B關於 NewPipe
@@ -179,7 +179,7 @@
貢獻者特許在 Android 上運作自由輕便的 Youtube 前端。
- 檢視我們的 Github
+ 檢視我們的 GitHubNewPipe 的特許無論您僅想分享您對 NewPipe 的一些構思，還是願意設計和翻譯程式介面，甚至想幫我們整理或重新編寫原始碼，我們都無任歡迎。貢獻更多，應用程式便會變得更好！檢閱特許
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8c4466a2e..e8a9e714c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,11 +1,11 @@
- 點播%1$s次
- %1$s發布
- 找不到串流播放器，您要安裝VLC吗？
+ 點播 %1$s 次
+ %1$s 發布
+ 找不到串流播放器，您要安裝 VLC 嗎？安裝取消
- 用瀏覽器開啟
+ 以瀏覽器開啟分享下載搜尋
@@ -20,11 +20,11 @@
已下載影片的存放路徑輸入影片下載路徑預設解析度
- 用Kodi播放
- 顯示用Kodi媒體中心播放影片的選項
+ 用 Kodi 播放
+ 顯示用 Kodi 媒體中心播放影片的選項聲音
- 找不到Kore，您要安裝Kore嗎？
- 顯示「用Kodi播放」的選項
+ 找不到 Kore ，您要安裝 Kore 嗎？
+ 顯示「用 Kodi 播放」的選項預設音訊格式主題灰暗
@@ -34,11 +34,11 @@
下一部影片顯示「下一部」與「相關」的影片不支援此網址
- 預設內容語言
+ 預設內容語言影片和音訊外觀其他
- 在背景播放
+ 背景播放中播放網路錯誤
@@ -48,37 +48,37 @@
喜歡不喜歡使用 Tor
- (實驗性功能)強制使用 Tor 下載(暫時不支援串流影片)。
+ (實驗性) 強迫下載流量繞經 Tor 以加強隱私 (暫未支援串流影片)。音訊下載路徑已下載音訊的存放路徑輸入音訊檔案的下載路徑無法建立下載目錄「%1$s」已建立下載目錄「%1$s」
-輕觸搜尋按鈕開始使用NewPipe
+輕觸搜尋按鈕開始使用 NewPipe以懸浮視窗開啟勾選後，部分解析度的影片將沒有聲音
- NewPipe懸浮視窗模式
+ NewPipe 懸浮視窗模式背景播放自動播放
- NewPipe 被其他應用程式呼叫時播放影片
+ 當 NewPipe 被其他應用程式呼叫時播放影片懸浮視窗預設解析度顯示更高的解析度
- 只有部分裝置能播2K及4K影片
+ 只有部分裝置能播 2K 及 4K 影片預設影片格式純黑記住懸浮視窗大小和位置
- 記住上次懸浮視窗的大小和位置
+ 記住上次使用時懸浮視窗的大小和位置播放器手勢控制
- 使用手勢來控制亮度及播放器的音量
+ 使用手勢來控制播放器的亮度及音量搜尋建議
- 在搜尋時顯示搜尋建議
+ 搜尋時顯示搜尋建議懸浮視窗
- 在懸浮視窗中播放
+ 以懸浮視窗播放中內容
- 顯示受年齡限制的內容
- 此影片具有年齡限制，請先在設定中關閉年齡限制。
+ 顯示具有年齡限制的內容
+ 有年齡限制的影片。可於設定中選擇允許此種內容。下載下載錯誤回報
@@ -92,7 +92,7 @@
清除最佳解析度
- 重新設定大小
+ 調整大小錯誤無法載入所有縮圖無法解析影片 URL 簽章
@@ -105,7 +105,7 @@
無法取得串流無法載入圖片應用程式或界面已停止運作
- 抱歉，這不應該發生的。
+ 抱歉，這是不該發生的。使用電子郵件回報錯誤抱歉，發生了一些問題。回報
@@ -123,8 +123,8 @@
音訊重試無法存取儲存空間
- 使用舊的播放器
- 舊型內建媒體播放器
+ 使用舊式播放器
+ 舊型內建 Mediaframework 播放器千
@@ -147,7 +147,7 @@
檔案已存在錯誤的網址或網路無法使用NewPipe 下載中
- 輕觸顯示詳細資訊
+ 輕觸以顯示詳細資訊請稍候…已複製至剪貼簿請選擇下載資料夾
@@ -167,7 +167,7 @@
無法更新訂閱主頁
- 訂閱
+ 訂閱清單新鮮事
@@ -175,7 +175,7 @@
在本機儲存搜尋紀錄歷史紀錄與快取記錄觀看過的影片
- 在取得視窗焦點時繼續播放
+ 取得視窗焦點時繼續播放在干擾結束後繼續播放（例如有來電）播放器行為
@@ -222,10 +222,10 @@
關於貢獻者授權條款
- Android 上開放且輕巧的 YouTube 串流應用程式。
+ Android 上自由且輕巧的 YouTube 串流播放器。在 GitHub 上檢視NewPipe 使用的授權條款
- 不管你有什麼點子，翻譯、設計、程式碼整理，或者程式碼撰寫，我們永遠歡迎你來幫忙。完成的越多，NewPipe 也會更好！
+ 不管你有什麼點子——翻譯、設計、程式碼整理，或者程式碼撰寫——我們永遠歡迎你來幫忙。完成的越多，NewPipe 也會更好！閱讀授權條款貢獻
@@ -238,12 +238,12 @@
已清除歷史紀錄項目已刪除確定要刪除此項搜尋紀錄嗎？
-找不到串流播放器（您可以安裝 VLC播放）
- 顯示「鎖定到附加」提示
+找不到串流播放器（您可以安裝 VLC 播放）
+ 顯示「長按以新增」提示預設內容國家服務
- 在背景播放器上等候
- 在懸浮視窗播放器上等候
+ 已新增至背景播放佇列
+ 已新增至懸浮視窗播放佇列全部播放總是僅一次
@@ -257,9 +257,9 @@
無法播放此串流發生無法復原的播放器錯誤
- 從播放器錯誤中恢復
- 在背景或是影片詳細資訊頁面上按下浮模按鈕時顯示提示
- 外部播放器不支援這類型的連結
+ 正在從播放器錯誤中復原
+ 在影片詳細資訊頁按下背景播放或懸浮視窗按鈕時顯示提示
+ 外部播放器不支援此類型連結無效的 URL找不到影片串流找不到音訊串流
@@ -270,8 +270,8 @@
匯出資料庫將覆蓋您目前的歷史記錄和訂閱匯出歷史記錄、訂閱和播放清單
- 返回
- 欲了解更多關於 NewPipe 的資訊和新聞，請造訪我們的網站。
+ 回饋
+ 如欲了解更多有關 NewPipe 的資訊和新聞，請造訪我們的網站。首頁內容空白頁面互動導覽頁面
@@ -279,10 +279,10 @@
提要頁面頻道頁面選擇頻道
- 尚未訂閱頻道
+ 尚未訂閱任何頻道選擇互動導覽
- 匯出完成
- 匯入完成
+ 匯出已完成
+ 匯入已完成無有效的 ZIP 檔案警告：無法匯入所有檔案。這將覆蓋您目前的設定。
@@ -296,20 +296,20 @@
移除詳細資訊音訊設定
- 在背景佇列
- 在懸浮視窗佇列
- 在此開始播放
- 在背景這裡開始
- 在懸浮視窗這裡開始
+ 新增至背景佇列
+ 新增至懸浮視窗佇列
+ 從這裡開始播放
+ 從這裡開始以背景播放
+ 從這裡開始以懸浮視窗播放
- 維持在佇列
- NewPipe 由志願者所開發，他們花費了空閒時間將獲得的最佳體驗帶給您。現在是時候回過頭來，讓我們的開發人員可以能夠在享受一杯咖啡的同時，讓 NewPipe 變得更好。
+ 長按以新增至佇列
+ NewPipe 由志願者所開發，他們耗費時間務求為您帶來最佳體驗。現在是時候回過頭來，讓我們的開發人員能夠在使 NewPipe 更臻完美的同時，享受一杯咖啡。打開抽屜關閉抽屜
- 影片播放
- 背景播放
- 懸浮視窗播放
+ 影片播放器
+ 背景播放器
+ 懸浮視窗播放器總是詢問正在取得資訊…
@@ -321,16 +321,16 @@
新增至
- 拖曳重新排序
+ 拖曳以重新排序建立
- 刪除一個
+ 刪除全部刪除退出
- 更改名稱
+ 重新命名
- 您是否要從觀看記錄中刪除這個項目嗎？
- 您確實要刪除歷史記錄中的所有項目嗎？
+ 您是否要刪除此項觀看記錄？
+ 您確定要刪除歷史記錄中的所有項目嗎？上一次播放最常播放
@@ -338,23 +338,23 @@
建立新的播放清單刪除播放清單
- 重命名播放清單
+ 重新命名播放清單名稱
- 增加至播放清單
+ 新增至播放清單設為播放清單縮圖
- 書簽播放清單
- 移除書簽
+ 將播放清單加入書籤
+ 移除書籤您是否要刪除此播放清單？已建立播放清單
- 加入到播放清單
+ 已新增至播放清單播放清單縮圖已更改無法刪除播放清單沒有字幕
- 適合的
+ 合適的填滿縮放
@@ -363,7 +363,7 @@
正常字體加大字體
- 某些東西很快就會出現 ;D
+ 某些東西即將在此出現 ;D監測流失
@@ -378,9 +378,9 @@
強制報告在處理完片段或活動週期外發生的無法傳遞的 Rx 異常使用粗略但快速的尋找
- 粗略尋找讓播放器更快找到影片的進度位置
- 自動播放隊列中下一部影片
- 在非重複播放佇列中的最後一個串流上開始播放時，自動附上相關串流
+ 粗略的尋找能讓播放器以降低的精確度更快找到影片的進度位置
+ 自動將下一部影片新增至佇列
+ 在非重複播放佇列中最後一個串流開始播放時，自動新增相關串流同步檔案
@@ -388,12 +388,12 @@
無效的目錄無效的檔案/內容來源檔案名稱不能留空
- 發生錯誤：%1$s
+ 發生錯誤： %1$s匯入/匯出匯入
- 匯入來自
- 匯出到
+ 匯入自
+ 匯出至正在匯入…正在匯出…
@@ -404,75 +404,75 @@
之前的匯出
- 檔案不存在或沒有足夠的權限讀取或寫入
+ 檔案不存在或權限不足以讀取或寫入該檔案透過下載匯出檔案來匯入您的 YouTube 訂閱：
\n
-\n1. 轉到此網址：%1$s
-\n2. 當被詢問時登入您的帳戶
+\n1. 移至此網址：%1$s
+\n2. 當被詢問時登入
\n3. 下載應該開始 ( 這就是匯出的檔案 )yourID, soundcloud.com/yourid
- 請記住，此操作可能會造成網路昂貴花費。
-\n
-\n您想繼續嗎？
-透過輸入 URL 或您的 ID 來匯入 SoundCloud 檔案：
+ 請記住，此操作可造成昂貴網路花費。
\n
-\n1. 在一些瀏覽器中啟用「桌面模式」(該網站不適用於行動裝置)
-\n2. 移至此網址：%1$s
-\n3. 詢問時登入到您的帳號
-\n4. 複製您被重新導向到的網址。
+\n您是否希望繼續？
+透過輸入 URL 或您的 ID 來匯入 SoundCloud 個人設定檔：
+\n
+\n1. 在瀏覽器中啟用「桌面模式」(該網站不適用於行動裝置)
+\n2. 移至此網址： %1$s
+\n3. 當被詢問時登入
+\n4. 複製您被重新導向到的個人設定檔網址。載入縮圖
- 停用後，NewPipe將不再載入縮圖，減少數據使用與騰空儲存空間，亦會清除記憶體和磁碟上的縮圖快取
+ 停用後 NewPipe 將不再載入縮圖，減少數據和儲存空間的用量。改變此選項時將清除記憶體和磁碟上的縮圖快取已清除圖片快取
- 抹除快取中介資料
+ 清除快取中介資料移除所有網頁的快取資料已清除中介資料快取播放速度控制
- 節拍
- 間距
+ 節奏
+ 音高解除連結（可能導致失真）Nightcore預設偏好的「開啟」動作
- 開起內容時的預設動作 — %s
+ 開啟內容時的預設動作 — %s沒有可供下載的串流字幕
- 調整播放器字幕大小與背景樣式。必須重新啟動應用程式才會生效
+ 調整播放器字幕文字大小與背景樣式。必須重新啟動應用程式才會生效未安裝可播放此檔案的應用程式清除觀看歷史刪除播放過的串流歷史
- 刪除全部的觀看歷史。
+ 刪除所有觀看歷史。觀看歷史已刪除。清除搜尋歷史刪除搜尋關鍵字的歷史
- 刪除全部的搜尋歷史。
+ 刪除所有搜尋歷史。搜尋歷史已刪除。已刪除 1 個項目。
- NewPipe 是一個 Copyleft 的自由軟體：您可以隨意使用、研究、分享並改進它。您可以在遵守由自由軟體基金會所發佈的 GNU 通用公共授權條款的狀況下自由地再散佈及／或修改它，授權條款預設使用第三版，但您也可以選擇更新的版本。
- 您是否同時的匯入設定？
+ NewPipe 是一個 Copyleft 的自由軟體：您可以隨意使用、研究、分享並改進它。在遵守由自由軟體基金會所發佈的 GNU 通用公共授權條款的狀況下，您可以自由地再散佈及／或修改它；授權條款預設使用第三版，但您也可以選擇更新的版本。
+ 您是否要同時匯入設定？NewPipe 的隱私政策
- NewPipe 專案非常重視您的隱私。因此，未經您的同意應用程式不會收集任何的資料。
-\nNewPipe 的隱私權政策，詳細說明了當您發送錯誤回報時，什麼資料才會進行傳送及儲存。
+ NewPipe 專案非常重視您的隱私。因此，未經您同意此程式不會收集任何資料。
+\nNewPipe 的隱私權政策詳細說明了當您發送錯誤回報時，什麼資料會被傳送及儲存。閱讀隱私政策
- 為了符合歐洲通用資料保護條例 ( GDPR ) ，我們請您注意 NewPipe 的隱私政策。請您務必仔細閱讀。
+ 為配合歐洲通用資料保護條例 ( GDPR ) ，我們在此請您注意 NewPipe 的隱私政策。請務必仔細閱讀。
\n您必須接受它才能向我們發送錯誤報告。接受
- 下降
+ 拒絕沒有限制
- 當您使用行動網路時限制解析度
- 在應用程式切換時最小化
- 當從主影片播放器切換到其他應用程式時要進行的動作 — %s
+ 使用行動網路時限制解析度
+ 切換應用程式時最小化
+ 從主影片播放器切換到其他應用程式時要執行的動作 — %s無最小化為背景播放器最小化為彈出式播放器
-在靜音時快轉
+靜音時快轉步進重設
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 515f1d46f..5741d1b4f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -63,6 +63,8 @@
#000000#CD5656#BC211D
+ #008ea4
+ #005a71#FFFFFF
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e7af3231e..229c00533 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,6 +12,8 @@
124dp70dp
+ 164dp
+ 92dp94dp
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 1a56e2d40..be0709b66 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -19,7 +19,8 @@
autoplay_through_intentuse_oldplayer
- player_gesture_controls
+ volume_gesture_control
+ brightness_gesture_controlresume_on_audio_focus_gainpopup_remember_size_pos_keyuse_inexact_seek_key
@@ -105,6 +106,8 @@
last_orientation_landscape_key
+ last_resize_mode
+
debug_pref_screen_keyallow_heap_dumping_key
@@ -139,7 +142,7 @@
show_hold_to_appendenGB
- search_language
+ content_languagecontent_countryshow_age_restricted_contentuse_tor
@@ -172,6 +175,24 @@
@string/charset_most_special_characters_value
+
+ downloads_max_retry
+ 3
+
+ @string/minimize_on_exit_none_description
+ 1
+ 2
+ 3
+ 4
+ 5
+ 7
+ 10
+ 15
+
+
+ cross_network_downloads
+
+ default_download_threadspreferred_open_action_key
@@ -372,8 +393,8 @@
AndorraAngolaAnguilla
- Antarctica
- Antiguaand Barbuda
+ Antartica
+ Antigua and BarbudaArgentinaArmeniaAruba
@@ -391,9 +412,9 @@
BermudaBhutanBolivia
- Bosniaand Herzegovina
+ Bosnia and HerzegovinaBotswana
- BouvetIsland
+ Bouvet IslandBrazilBritish Virgin IslandsBritish Indian Ocean Territory
@@ -404,23 +425,23 @@
CambodiaCameroonCanada
- CapeVerde
+ Cape VerdeCayman IslandsCentral African RepublicChadChileChina
- HongKong, China
- Macao,China
+ Hong Kong (China)
+ Macao (China)Christmas Island
- Cocos(Keeling) Islands
+ Cocos (Keeling) IslandsColombiaComoros
- Congo(Brazzaville)
- Congo, (Kinshasa)
+ Brazzaville (Congo)
+ Kinshasa (Congo)Cook Islands
- CostaRica
- Côted\'Ivoire
+ Costa Rica
+ Côte d\'IvoireCroatiaCubaCyprus
@@ -431,8 +452,8 @@
Dominican RepublicEcuadorEgypt
- ElSalvador
- EquatorialGuinea
+ El Salvador
+ Equatorial GuineaEritreaEstoniaEthiopia
@@ -461,8 +482,8 @@
Guinea-BissauGuyanaHaiti
- Heardand Mcdonald Islands
- HolySee (Vatican City State)
+ Heard and McDonald Islands
+ Holy See (Vatican City State)HondurasHungaryIceland
@@ -471,7 +492,7 @@
IranIraqIreland
- Isleof Man
+ Isle of ManIsraelItalyJamaica
@@ -481,8 +502,8 @@
KazakhstanKenyaKiribati
- Korea(North)
- Korea(South)
+ North Korea
+ South KoreaKuwaitKyrgyzstanLao
@@ -501,7 +522,7 @@
MaldivesMaliMalta
- MarshallIslands
+ Marshall IslandsMartiniqueMauritaniaMauritius
@@ -533,7 +554,7 @@
OmanPakistanPalau
- Palestinian Territory
+ PalestinePanamaPapua New GuineaParaguay
@@ -542,71 +563,71 @@
PitcairnPolandPortugal
- PuertoRico
+ Puerto RicoQatarRéunionRomaniaRussian FederationRwanda
- Saint-Barthélemy
+ Saint BarthélemySaint Helena
- Saint KittsandNevis
- SaintLucia
- Saint-Martin(Frenchpart)
- SaintPierreandMiquelon
- Saint Vincentand Grenadines
+ Saint Kitts and Nevis
+ Saint Lucia
+ Saint Martin
+ Saint Pierre and Miquelon
+ Saint Vincent and GrenadinesSamoaSan Marino
- Sao Tomeand Principe
- SaudiArabia
+ Sao Tome and Principe
+ Saudi ArabiaSenegalSerbiaSeychelles
- SierraLeone
+ Sierra LeoneSingaporeSlovakiaSlovenia
- SolomonIslands
+ Solomon IslandsSomalia
- SouthAfrica
- South Georgiaandthe South Sandwich Islands
+ South Africa
+ South Georgia and South Sandwich IslandsSouth SudanSpainSri LankaSudanSuriname
- Svalbardand Jan Mayen Islands
+ Svalbard and Jan Mayen IslandsSwazilandSwedenSwitzerland
- Syrian ArabRepublic(Syria)
- Taiwan, Republicof China
+ Syrian Arab Republic (Syria)
+ TaiwanTajikistanTanzaniaThailand
- Timor-Leste
+ Timor LesteTogoTokelauTonga
- Trinidadand Tobago
+ Trinidad and TobagoTunisiaTurkeyTurkmenistan
- Turksand Caicos Islands
+ Turks and Caicos IslandsTuvaluUgandaUkraineUnited Arab EmiratesUnited Kingdom
- USA
+ United StatesMinor Outlying IslandsUruguayUzbekistanVanuatu
- Venezuela (BolivarianRepublic)
- VietNam
- Virgin Islands,
- Wallisand Futuna Islands
+ Venezuela (Bolivarian Republic)
+ Vietnam
+ Virgin Islands
+ Wallis and Futuna IslandsWestern SaharaYemenZambia
@@ -879,5 +900,18 @@
144p
+ list_view_mode
+ auto
-
\ No newline at end of file
+
+ auto
+ list
+ grid
+
+
+ @string/auto
+ @string/list
+ @string/grid
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd00ddce1..12a5d8ca7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
%1$s viewsPublished on %1$sNo stream player found. Do you want to install VLC?
- No stream player found (you can install VLC to play it)
+ No stream player found (you can install VLC to play it).InstallCancelhttps://f-droid.org/repository/browse/?fdfilter=vlc&fdid=org.videolan.vlc
@@ -13,28 +13,29 @@
Open in popup modeShareDownload
- Download stream file.
+ Download stream fileSearchSettings
- Did you mean: %1$s ?
+ Did you mean: %1$s\?Share withChoose browserrotationUse external video player
- Some resolutions will NOT have audio when this option is enabled
+ Removes audio at SOME resolutionsUse external audio playerNewPipe popup modeRSSSubscribeSubscribed
+ UnsubscribeChannel unsubscribed
- Unable to change subscription
- Unable to update subscription
+ Could not change subscription
+ Could not update subscriptionShow infoMainSubscriptions
- Bookmarks
+ Bookmarked PlaylistsNew TabChoose Tab
@@ -48,8 +49,8 @@
Path to store downloaded videos inEnter download path for videos
- Audio download path
- Path to store downloaded audio in
+ Audio download folder
+ Downloaded audio is stored hereEnter download path for audio filesAutoplay
@@ -75,7 +76,7 @@
Use fast inexact seekInexact seek allows the player to seek to positions faster with reduced precisionLoad thumbnails
- Disable to stop all thumbnails from loading and save on data and memory usage. Changing this will clear both in-memory and on-disk image cache.
+ When off no thumbnails load, saving data and memory usage. Changes clear both in-memory and on-disk image cache.Show commentsDisable to stop showing commentsImage cache wiped
@@ -84,8 +85,10 @@
Metadata cache wipedAuto-queue next streamAuto-append a related stream when playing the last stream in a non-repeating queue.
- Player gesture controls
- Use gestures to control the brightness and volume of the player
+ Volume gesture control
+ Use gestures to control the volume of the player
+ Brightness gesture control
+ Use gestures to control the brightness of the playerSearch suggestionsShow suggestions when searchingSearch history
@@ -95,18 +98,19 @@
Resume on focus gainContinue playing after interruptions (e.g. phone calls)Download
- Next video
- Show \'next\' and \'similar\' videos
- Show \"hold to append\" tip
+ Up next
+ Autoplay
+ Show \'Next\' and \'Similar\' videos
+ Show \"Hold to append\" tipShow tip when background or popup button is pressed on video details page
- URL not supported
+ Unsupported URLDefault content countryService
- Default content language
+ Default content languagePlayerBehavior
- Video & Audio
- History & Cache
+ Video & audio
+ History & cachePopupAppearanceOther
@@ -118,8 +122,8 @@
https://www.c3s.cc/PlayContent
- Show age restricted content
- Age Restricted Video. Allowing such material is possible from Settings.
+ Age restricted content
+ Show age Restricted Video. Allowing such material is possible from \"Settings\".liveLIVEDownloads
@@ -143,6 +147,7 @@
ResizingBest resolutionUndo
+ File deletedPlay AllAlwaysJust Once
@@ -150,7 +155,7 @@
newpipeNewPipe Notification
- Notifications for NewPipe Background and Popup Players
+ Notifications for NewPipe background and popup players[Unknown]
@@ -161,29 +166,29 @@
Import databaseExport database
- Will override your current history and subscriptions
- Export history, subscriptions and playlists.
+ Overrides your current history and subscriptions
+ Export history, subscriptions and playlistsClear watch history
- Deletes the history of played streams.
- Delete whole watch history.
+ Deletes the history of played streams
+ Delete entire watch history?Watch history deleted.Clear search history
- Deletes history of search keywords.
- Delete whole search history.
+ Deletes history of search keywords
+ Delete entire search history?Search history deleted.Error
- External storage not available.
- Download to external SD Card is not possible yet. Should the download place be reset?
+ External storage unavailable
+ Download to external SD card is not possible yet. Reset download folder location?Network errorCould not load all thumbnailsCould not decrypt video URL signatureCould not parse websiteCould not parse website completely
- Content not available
+ Content unavailableBlocked by GEMACould not set up download menu
- This is a LIVE STREAM, which is not yet supported.
+ Live streams are not supported yetCould not get any streamCould not load imageApp/UI crashed
@@ -194,10 +199,10 @@
Invalid URLNo video streams foundNo audio streams found
- Invalid directory
- Invalid file/content source
- File doesn\'t exist or insufficient permission to read or write to it
- File name cannot be empty
+ No such folder
+ No such file/content source
+ The file doesn\'t exist or permission to read or write to it is lacking
+ Filename cannot be emptyAn error occurred: %1$sNo streams available to downloadUsing default tabs, error while reading saved tabs
@@ -230,7 +235,7 @@
No results@string/no_videos@string/no_comments
- Nothing Here But Crickets
+ Nothing here but cricketsDrag to reorderCannot create download directory \'%1$s\'
@@ -240,8 +245,6 @@
AudioRetryStorage access permission denied
- Use old player
- Old built-in Mediaframework playerKM
@@ -293,7 +296,7 @@
FilenameThreadsError
- Server unsupported
+ Unsupported serverFile already existsMalformed URL or Internet not availableNewPipe Downloading
@@ -308,8 +311,8 @@
MD5SHA-1reCAPTCHA
- reCAPTCHA Challenge
- reCAPTCHA Challenge requested
+ reCAPTCHA challenge
+ reCAPTCHA challenge requested
@@ -354,7 +357,7 @@
https://newpipe.schabi.org/legal/privacy/Read privacy policyNewPipe\'s License
- NewPipe is copyleft libre software: You can use, study share and improve it at your will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ NewPipe is copyleft libre software: You can use, study share and improve it at will. Specifically you can redistribute and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.Read license
@@ -362,7 +365,7 @@
HistorySearchedWatched
- History is disabled
+ History is turned offHistoryThe history is emptyHistory cleared
@@ -383,10 +386,10 @@
Feed PageChannel PageSelect a channel
- No channel subscribed yet
+ No channel subscriptions yetSelect a kiosk
- Export complete
- Import complete
+ Exported
+ ImportedNo valid ZIP fileWarning: Could not import all files.This will override your current setup.
@@ -401,17 +404,17 @@
%1$s/%2$s
- Background Player
- Popup Player
+ Background player
+ Popup playerRemoveDetailsAudio Settings
- Hold To Enqueue
- Enqueue on Background
- Enqueue on Popup
- Start Playing Here
- Start Here on Background
- Start Here on Popup
+ Hold To enqueue
+ Enqueue when backgrounded
+ Enqueue on new popup
+ Start playing here
+ Start here when backgrounded
+ Start here on new popupOpen Drawer
@@ -435,9 +438,9 @@
"Loading requested content"
- Create New Playlist
- Delete Playlist
- Rename Playlist
+ New Playlist
+ Delete
+ RenameNameAdd To PlaylistSet as Playlist Thumbnail
@@ -445,11 +448,11 @@
Bookmark PlaylistRemove Bookmark
- Do you want to delete this playlist?
+ Delete this playlist?Playlist created
- Added to playlist
- Playlist thumbnail changed
- Could not delete playlist
+ Playlisted
+ Playlist thumbnail changed.
+ Could not delete playlist.No Captions
@@ -468,11 +471,11 @@
Enable LeakCanaryMemory leak monitoring may cause the app to become unresponsive when heap dumping
- Report Out-of-lifecycle Errors
+ Report out-of-lifecycle errorsForce reporting of undeliverable Rx exceptions outside of fragment or activity lifecycle after disposal
- Import/Export
+ Import/exportImportImport fromExport to
@@ -523,10 +526,61 @@
- Minimize on application switch
- Action when switching to other application from main video player — %s
+ Minimize on app switch
+ Action when switching to other app from main video player — %sNoneMinimize to background playerMinimize to popup player
+ List view mode
+ List
+ Grid
+ Auto
+ Switch View
+
+
+ Finished
+ In queue
+
+ paused
+ queued
+ post-processing
+
+ Queue
+
+ Action denied by the system
+
+
+ Download failed
+ Download finished
+ %s downloads finished
+
+
+ Generate unique name
+ Overwrite
+ A downloaded file with this name already exists
+ There is a download in progress with this name
+
+
+ Show error
+ Code
+ The file can not be created
+ The destination folder can not be created
+ Permission denied by the system
+ Secure connection failed
+ Can not found the server
+ Can not connect to the server
+ The server does not send data
+ The server does not accept multi-threaded downloads, retry with @string/msg_threads = 1
+ Requested Range Not Satisfiable
+ Not found
+ Post-processing failed
+
+ Clear finished downloads
+ You have %s pending downloads, goto Downloads to continue
+ Stop
+ Maximum retry
+ Maximum number of attempts before canceling the download
+ Pause on switching to mobile data
+ Not all downloads can be suspended, in those cases, will be restarted
diff --git a/app/src/main/res/xml/appearance_settings.xml b/app/src/main/res/xml/appearance_settings.xml
index 1f711b510..437736ab0 100644
--- a/app/src/main/res/xml/appearance_settings.xml
+++ b/app/src/main/res/xml/appearance_settings.xml
@@ -22,6 +22,14 @@
android:title="@string/show_hold_to_append_title"
android:summary="@string/show_hold_to_append_summary"/>
+
+
-
+ android:title="@string/content_language_title"/>
-
-
+
+
+
+
diff --git a/app/src/main/res/xml/video_audio_settings.xml b/app/src/main/res/xml/video_audio_settings.xml
index a547ffaf2..f4492d33d 100644
--- a/app/src/main/res/xml/video_audio_settings.xml
+++ b/app/src/main/res/xml/video_audio_settings.xml
@@ -64,12 +64,6 @@
android:key="@string/use_external_audio_player_key"
android:title="@string/use_external_audio_player_title"/>
-
-
+
+
+ android:key="@string/volume_gesture_control_key"
+ android:summary="@string/volume_gesture_control_summary"
+ android:title="@string/volume_gesture_control_title"/>
+
+ missions;
-
- @org.junit.Before
- public void setUp() throws Exception {
- downloadDataSource = mock(DownloadDataSource.class);
- missions = new ArrayList<>();
- for(int i = 0; i < 50; ++i){
- missions.add(generateFinishedDownloadMission());
- }
- when(downloadDataSource.loadMissions()).thenReturn(new ArrayList<>(missions));
- downloadManager = new DownloadManagerImpl(new ArrayList<>(), downloadDataSource);
- }
-
- @Test(expected = NullPointerException.class)
- public void testConstructorWithNullAsDownloadDataSource() {
- new DownloadManagerImpl(new ArrayList<>(), null);
- }
-
-
- private static DownloadMission generateFinishedDownloadMission() throws IOException {
- File file = File.createTempFile("newpipetest", ".mp4");
- file.deleteOnExit();
- RandomAccessFile randomAccessFile = new RandomAccessFile(file, "rw");
- randomAccessFile.setLength(1000);
- randomAccessFile.close();
- DownloadMission downloadMission = new DownloadMission(file.getName(),
- "http://google.com/?q=how+to+google", file.getParent());
- downloadMission.blocks = 1000;
- downloadMission.done = 1000;
- downloadMission.finished = true;
- return spy(downloadMission);
- }
-
- private static void assertMissionEquals(String message, DownloadMission expected, DownloadMission actual) {
- if(expected == actual) return;
- assertEquals(message + ": Name", expected.name, actual.name);
- assertEquals(message + ": Location", expected.location, actual.location);
- assertEquals(message + ": Url", expected.url, actual.url);
- }
-
- @Test
- public void testThatMissionsAreLoaded() throws IOException {
- ArrayList missions = new ArrayList<>();
- long millis = System.currentTimeMillis();
- for(int i = 0; i < 50; ++i){
- DownloadMission mission = generateFinishedDownloadMission();
- mission.timestamp = millis - i; // reverse order by timestamp
- missions.add(mission);
- }
-
- downloadDataSource = mock(DownloadDataSource.class);
- when(downloadDataSource.loadMissions()).thenReturn(new ArrayList<>(missions));
- downloadManager = new DownloadManagerImpl(new ArrayList<>(), downloadDataSource);
- verify(downloadDataSource, times(1)).loadMissions();
-
- assertEquals(50, downloadManager.getCount());
-
- for(int i = 0; i < 50; ++i) {
- assertMissionEquals("mission " + i, missions.get(50 - 1 - i), downloadManager.getMission(i));
- }
- }
-
- @Ignore
- @Test
- public void startMission() throws Exception {
- DownloadMission mission = missions.get(0);
- mission = spy(mission);
- missions.set(0, mission);
- String url = "https://github.com/favicon.ico";
- // create a temp file and delete it so we have a temp directory
- File tempFile = File.createTempFile("favicon",".ico");
- String name = tempFile.getName();
- String location = tempFile.getParent();
- assertTrue(tempFile.delete());
- int id = downloadManager.startMission(url, location, name, true, 10);
- }
-
- @Test
- public void resumeMission() {
- DownloadMission mission = missions.get(0);
- mission.running = true;
- verify(mission, never()).start();
- downloadManager.resumeMission(0);
- verify(mission, never()).start();
- mission.running = false;
- downloadManager.resumeMission(0);
- verify(mission, times(1)).start();
- }
-
- @Test
- public void pauseMission() {
- DownloadMission mission = missions.get(0);
- mission.running = false;
- downloadManager.pauseMission(0);
- verify(mission, never()).pause();
- mission.running = true;
- downloadManager.pauseMission(0);
- verify(mission, times(1)).pause();
- }
-
- @Test
- public void deleteMission() {
- DownloadMission mission = missions.get(0);
- assertEquals(mission, downloadManager.getMission(0));
- downloadManager.deleteMission(0);
- verify(mission, times(1)).delete();
- assertNotEquals(mission, downloadManager.getMission(0));
- assertEquals(49, downloadManager.getCount());
- }
-
- @Test(expected = RuntimeException.class)
- public void getMissionWithNegativeIndex() {
- downloadManager.getMission(-1);
- }
-
- @Test
- public void getMission() {
- assertSame(missions.get(0), downloadManager.getMission(0));
- assertSame(missions.get(1), downloadManager.getMission(1));
- }
-
- @Test
- public void sortByTimestamp() {
- ArrayList downloadMissions = new ArrayList<>();
- DownloadMission mission = new DownloadMission();
- mission.timestamp = 0;
-
- DownloadMission mission1 = new DownloadMission();
- mission1.timestamp = Integer.MAX_VALUE + 1L;
-
- DownloadMission mission2 = new DownloadMission();
- mission2.timestamp = 2L * Integer.MAX_VALUE ;
-
- DownloadMission mission3 = new DownloadMission();
- mission3.timestamp = 2L * Integer.MAX_VALUE + 5L;
-
-
- downloadMissions.add(mission3);
- downloadMissions.add(mission1);
- downloadMissions.add(mission2);
- downloadMissions.add(mission);
-
-
- DownloadManagerImpl.sortByTimestamp(downloadMissions);
-
- assertEquals(mission, downloadMissions.get(0));
- assertEquals(mission1, downloadMissions.get(1));
- assertEquals(mission2, downloadMissions.get(2));
- assertEquals(mission3, downloadMissions.get(3));
- }
-
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 20c8a0dfc..a95f6dcc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.android.tools.build:gradle:3.2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -16,8 +16,8 @@ buildscript {
allprojects {
repositories {
jcenter()
- maven { url 'https://jitpack.io' }
google()
- maven { url 'https://clojars.org/repo' }
+ maven { url "https://jitpack.io" }
+ maven { url "https://clojars.org/repo" }
}
}
diff --git a/fastlane/metadata/android/en-US/changelogs/69.txt b/fastlane/metadata/android/en-US/changelogs/69.txt
new file mode 100644
index 000000000..c8262d1b0
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/69.txt
@@ -0,0 +1,19 @@
+### New
+- Long-tap delete and share in subscriptions #1516
+- Tablet UI and grid list layout #1617
+
+### Improvements
+- store and reload the last used aspect ratio #1748
+- Enable linear layout in Downloads activity with full video names #1771
+- Delete and share subscriptions directly from within the subscriptions tab #1516
+- Enqueuing now triggers video playing if the play queue has already ended #1783
+- Separate settings for volume and brightness gestures #1644
+- Add support for Localization #1792
+
+### Fixes
+- Fix time parsing for . format, so NewPipe can be used in Finland
+- Fix subscription count
+- Add foreground service permission for API 28+ devices #1830
+
+### Known Bugs
+- Playback state can not be saved on Android P
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png
new file mode 100644
index 000000000..c1f4599c2
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png
index 6e11014a8..10897c0eb 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png
deleted file mode 100644
index 10c70b54d..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png
new file mode 100644
index 000000000..91af82879
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png
new file mode 100644
index 000000000..e362a1975
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png differ
-
-
-
-
-
+
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_1.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_2.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_3.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_4.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_5.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_6.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_7.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_8.png)
-[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_9.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_01.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_02.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_03.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_04.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_05.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_06.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_07.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_08.png)
+[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_09.png)
[
](fastlane/metadata/android/en-US/images/phoneScreenshots/shot_10.png)
+[
](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_11.png)
+[
](fastlane/metadata/android/en-US/images/tenInchScreenshots/shot_12.png)
## Description
-NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without Google Services installed. Also, you don't need a YouTube account to use NewPipe, and it's FLOSS.
+NewPipe does not use any Google framework libraries, nor the YouTube API. Websites are only parsed to fetch required info, so this app can be used on devices without Google services installed. Also, you don't need a YouTube account to use NewPipe, which is copylefted libre software.
### Features
* Search videos
-* Display general information about a video
+* Display general info about videos
* Watch YouTube videos
* Listen to YouTube videos
* Popup mode (floating player)
-* Select the streaming player to watch the video with
-* Download videos
+* Select streaming player to watch video with
+* Download videos
* Download audio only
* Open a video in Kodi
-* Show Next/Related videos
+* Show next/related videos
* Search YouTube in a specific language
* Watch/Block age restricted material
-* Display general information about channels
+* Display general info about channels
* Search channels
* Watch videos from a channel
* Orbot/Tor support (not yet directly)
-* 1080p/2k/4k support
+* 1080p/2K/4K support
* View history
* Subscribe to channels
* Search history
-* Search/Watch Playlists
-* Watch as queues Playlists
-* Queuing videos
+* Search/watch playlists
+* Watch as enqueued playlists
+* Enqueue videos
* Local playlists
* Subtitles
-* Multi-service support (eg. SoundCloud in NewPipe Beta)
+* Multi-service support (e.g. SoundCloud \[beta\])
+* Livestream support
### Coming Features
-* Livestream support
* Cast to UPnP and Cast
* Show comments
-* ... and many more
+* … and many more
## Contribution
Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome.
@@ -77,26 +80,31 @@ The more is done the better it gets!
If you'd like to get involved, check our [contribution notes](.github/CONTRIBUTING.md).
## Donate
-If you like NewPipe we'd be happy about a donation. You can either donate via Bitcoin, Bountysource or Liberapay. For further information about donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).
+If you like NewPipe we'd be happy about a donation. You can either send bitcoin or donate via Bountysource or Liberapay. For further info on donating to NewPipe, please visit our [website](https://newpipe.schabi.org/donate).
