Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Add ability to mark an item as played #6773

Merged
merged 7 commits into from
Aug 1, 2021
Merged

Add ability to mark an item as played #6773

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fd2ebc
Add ability to mark an item as played
nschulzke Jul 27, 2021
2b41f71
Change played to watched
nschulzke Jul 27, 2021
f451bdb
Do not add Mark as Watched to a live stream.
nschulzke Jul 27, 2021
4c63281
Fetch the stream info via a network request if no duration is found w…
nschulzke Jul 27, 2021
bdd16e0
Add comments describing the purpose of the markAsWatched method
nschulzke Jul 28, 2021
0e12cde
Save the fetched duration to the database so that it can render the v…
nschulzke Jul 30, 2021
dc0a28b
Upsert the complete info if we fetch it for marking as watched
nschulzke Jul 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,31 +101,31 @@ public Maybe<Long> markAsWatched(final StreamInfoItem info) {

final OffsetDateTime currentTime = OffsetDateTime.now(ZoneOffset.UTC);
return Maybe.fromCallable(() -> database.runInTransaction(() -> {
final long streamId = streamTable.upsert(new StreamEntity(info));

long duration = info.getDuration();
// Duration will not exist if the item was loaded with fast mode, so fetch it if empty
if (duration < 0) {
duration = ExtractorHelper.getStreamInfo(
if (info.getDuration() < 0) {
final long duration = ExtractorHelper.getStreamInfo(
info.getServiceId(),
info.getUrl(),
false)
.subscribeOn(Schedulers.io())
.blockingGet()
.getDuration();
info.setDuration(duration);
}
// Upsert to get a stream ID and update durations if we fetched one
final long streamId = streamTable.upsert(new StreamEntity(info));
Stypox marked this conversation as resolved.
Show resolved Hide resolved

// Update the stream progress to the full duration of the video
final List<StreamStateEntity> states = streamStateTable.getState(streamId)
.blockingFirst();
if (!states.isEmpty()) {
final StreamStateEntity entity = states.get(0);
entity.setProgressMillis(duration * 1000);
entity.setProgressMillis(info.getDuration() * 1000);
streamStateTable.update(entity);
} else {
final StreamStateEntity entity = new StreamStateEntity(
streamId,
duration * 1000
info.getDuration() * 1000
);
streamStateTable.insert(entity);
}
Expand Down