Mirrored_Repos/Piped
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped.git synced 2026-06-02 04:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4245 from t6fb3m59/upstream-pr

Browse Source 
Fix position saving for videos and have history update when opened
This commit is contained in:
Kavin
2026-06-01 06:35:33 +05:30
committed by GitHub
parent 7714f10eed 174ca1a072
commit 5321c71841
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/HistoryPage.vue
View File

@@ -61,7 +61,7 @@
</template> </template>
<script setup> <script setup>
import { ref, onMounted, onActivated, onDeactivated } from "vue"; import { ref, onActivated, onDeactivated } from "vue";
import VideoItem from "./VideoItem.vue"; import VideoItem from "./VideoItem.vue";
import SortingSelector from "./SortingSelector.vue"; import SortingSelector from "./SortingSelector.vue";
import ExportHistoryModal from "./ExportHistoryModal.vue"; import ExportHistoryModal from "./ExportHistoryModal.vue";
@@ -73,8 +73,8 @@ let currentVideoCount = 0;
const videoStep = 100; const videoStep = 100;
const videosStore = []; const videosStore = [];
const videos = ref([]); const videos = ref([]);
const autoDeleteHistory = ref(false); const autoDeleteHistory = ref(getPreferenceBoolean("autoDeleteWatchHistory", false));
const autoDeleteDelayHours = ref("24"); const autoDeleteDelayHours = ref(getPreferenceString("autoDeleteWatchHistoryDelayHours", "24"));
const showExportModal = ref(false); const showExportModal = ref(false);
const showImportModal = ref(false); const showImportModal = ref(false);
@@ -109,11 +109,12 @@ function onChange() {
setPreference("autoDeleteWatchHistoryDelayHours", autoDeleteDelayHours.value); setPreference("autoDeleteWatchHistoryDelayHours", autoDeleteDelayHours.value);
} }
onMounted(() => { function loadHistory() {
autoDeleteHistory.value = getPreferenceBoolean("autoDeleteWatchHistory", false); videosStore.length = 0;
autoDeleteDelayHours.value = getPreferenceString("autoDeleteWatchHistoryDelayHours", "24"); currentVideoCount = 0;
videos.value = [];
(async () => { return (async () => {
if (window.db && getPreferenceBoolean("watchHistory", false)) { if (window.db && getPreferenceBoolean("watchHistory", false)) {
var tx = window.db.transaction("watch_history", "readwrite"); var tx = window.db.transaction("watch_history", "readwrite");
var store = tx.objectStore("watch_history"); var store = tx.objectStore("watch_history");
@@ -148,10 +149,11 @@ onMounted(() => {
})().then(() => { })().then(() => {
loadMoreVideos(); loadMoreVideos();
}); });
}); }
onActivated(() => { onActivated(() => {
document.title = "Watch History - Piped"; document.title = "Watch History - Piped";
loadHistory();
window.addEventListener("scroll", handleScroll); window.addEventListener("scroll", handleScroll);
}); });

20
src/components/VideoPlayer.vue
View File

@@ -326,7 +326,7 @@ async function updateProgressDatabase(time) {
if (new Date().getTime() - lastUpdate.value < 500) return; if (new Date().getTime() - lastUpdate.value < 500) return;
lastUpdate.value = new Date().getTime(); lastUpdate.value = new Date().getTime();
if (!initialSeekComplete.value || !props.video.id || !window.db) return; if (!initialSeekComplete.value || destroying.value || !props.video.id || !window.db) return;
var tx = window.db.transaction("watch_history", "readwrite"); var tx = window.db.transaction("watch_history", "readwrite");
var store = tx.objectStore("watch_history"); var store = tx.objectStore("watch_history");
@@ -448,7 +448,6 @@ async function setPlayerAttrs(localPlayer, el, uri, mime, shaka) {
if (time) { if (time) {
startTime = parseTimeParam(time); startTime = parseTimeParam(time);
initialSeekComplete.value = true;
} else if (window.db && getPreferenceBoolean("watchHistory", false)) { } else if (window.db && getPreferenceBoolean("watchHistory", false)) {
await new Promise(resolve => { await new Promise(resolve => {
var tx = window.db.transaction("watch_history", "readonly"); var tx = window.db.transaction("watch_history", "readonly");
@@ -464,18 +463,19 @@ async function setPlayerAttrs(localPlayer, el, uri, mime, shaka) {
} }
resolve(); resolve();
}; };
tx.oncomplete = () => {
initialSeekComplete.value = true;
};
}); });
} else {
initialSeekComplete.value = true;
} }
playerInstance playerInstance
.load(uri, startTime, mime) .load(uri, null, mime)
.then(async () => { .then(async () => {
// Player.load()'s startTime arg does not reliably perform the
// initial seek; apply it here. See shaka-project/shaka-player#6241.
if (startTime > 0) {
el.currentTime = startTime;
await new Promise(resolve => el.addEventListener("seeked", resolve, { once: true }));
}
initialSeekComplete.value = true;
let lang = "en"; let lang = "en";
const prefLang = getPreferenceString("hl", "en").substr(0, 2); const prefLang = getPreferenceString("hl", "en").substr(0, 2);
const audioTracks = playerInstance.getAudioTracks(); const audioTracks = playerInstance.getAudioTracks();
@@ -573,6 +573,8 @@ async function setPlayerAttrs(localPlayer, el, uri, mime, shaka) {
} }
async function loadVideo() { async function loadVideo() {
initialSeekComplete.value = false;
updateSponsors(); updateSponsors();
const el = videoEl.value; const el = videoEl.value;