Merge branch 'release/5.0.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / assets / player / peertube-player-local-storage.ts

diff --git a/client/src/assets/player/peertube-player-local-storage.ts b/client/src/assets/player/peertube-player-local-storage.ts
index cf2cfb472e6b4bbdf80e41e1eecd810847f5ea40..64040abf1d5ae4736bf71144fc99e757e68744de 100644 (file)
--- a/client/src/assets/player/peertube-player-local-storage.ts
+++ b/client/src/assets/player/peertube-player-local-storage.ts
@@ -1,3 +1,5 @@
+import { logger } from '@root-helpers/logger'
+
 function getStoredVolume () {
   const value = getLocalStorage('volume')
   if (value !== null && value !== undefined) {
@@ -10,14 +12,6 @@ function getStoredVolume () {
   return undefined
 }
 
-function getStoredP2PEnabled (): boolean {
-  const value = getLocalStorage('webtorrent_enabled')
-  if (value !== null && value !== undefined) return value === 'true'
-
-  // By default webtorrent is enabled
-  return true
-}
-
 function getStoredMute () {
   const value = getLocalStorage('mute')
   if (value !== null && value !== undefined) return value === 'true'
@@ -45,6 +39,7 @@ function saveTheaterInStore (enabled: boolean) {
 }
 
 function saveAverageBandwidth (value: number) {
+  /** used to choose the most fitting resolution */
   return setLocalStorage('average-bandwidth', value.toString())
 }
 
@@ -68,9 +63,10 @@ function getStoredLastSubtitle () {
   return getLocalStorage('last-subtitle')
 }
 
-function saveVideoWatchHistory(videoUUID: string, duration: number) {
+function saveVideoWatchHistory (videoUUID: string, duration: number) {
   return setLocalStorage(`video-watch-history`, JSON.stringify({
     ...getStoredVideoWatchHistory(),
+
     [videoUUID]: {
       duration,
       date: `${(new Date()).toISOString()}`
@@ -78,13 +74,16 @@ function saveVideoWatchHistory(videoUUID: string, duration: number) {
   }))
 }
 
-function getStoredVideoWatchHistory(videoUUID?: string) {
+function getStoredVideoWatchHistory (videoUUID?: string) {
   let data
 
   try {
-    data = JSON.parse(getLocalStorage('video-watch-history'))
+    const value = getLocalStorage('video-watch-history')
+    if (!value) return {}
+
+    data = JSON.parse(value)
   } catch (error) {
-    console.error('Cannot parse video watch history from local storage: ', error)
+    logger.error('Cannot parse video watch history from local storage/', error)
   }
 
   data = data || {}
@@ -94,8 +93,9 @@ function getStoredVideoWatchHistory(videoUUID?: string) {
   return data
 }
 
-function cleanupVideoWatch() {
+function cleanupVideoWatch () {
   const data = getStoredVideoWatchHistory()
+  if (!data) return
 
   const newData = Object.keys(data).reduce((acc, videoUUID) => {
     const date = Date.parse(data[videoUUID].date)
@@ -117,7 +117,6 @@ function cleanupVideoWatch() {
 
 export {
   getStoredVolume,
-  getStoredP2PEnabled,
   getStoredMute,
   getStoredTheater,
   saveVolumeInStore,