X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fassets%2Fplayer%2Futils.ts;h=54f1313105e02562480c24630f2bf4d7f4f99038;hb=f0a3988066f72a28bb44520af072f18d91d77dde;hp=ce7aaea2afa45ec8f0d623f50130810c73f4ceb8;hpb=e945b184a0f29b47c33bbd05578f3493ca9c8e6c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index ce7aaea2a..54f131310 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -1,4 +1,4 @@
-import { is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n'
+import { VideoFile } from '../../../../shared/models/videos'
 
 function toTitleCase (str: string) {
   return str.charAt(0).toUpperCase() + str.slice(1)
@@ -12,74 +12,76 @@ const dictionaryBytes: Array<{max: number, type: string}> = [
   { max: 1073741824, type: 'MB' },
   { max: 1.0995116e12, type: 'GB' }
 ]
-function bytes (value) {
+function bytes (value: number) {
   const format = dictionaryBytes.find(d => value < d.max) || dictionaryBytes[dictionaryBytes.length - 1]
   const calc = Math.floor(value / (format.max / 1024)).toString()
 
   return [ calc, format.type ]
 }
 
-function getStoredVolume () {
-  const value = getLocalStorage('volume')
-  if (value !== null && value !== undefined) {
-    const valueNumber = parseFloat(value)
-    if (isNaN(valueNumber)) return undefined
-
-    return valueNumber
-  }
-
-  return undefined
+function isMobile () {
+  return /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
 }
 
-function getStoredMute () {
-  const value = getLocalStorage('mute')
-  if (value !== null && value !== undefined) return value === 'true'
+function buildVideoLink (time?: number, url?: string) {
+  if (!url) url = window.location.origin + window.location.pathname.replace('/embed/', '/watch/')
 
-  return undefined
-}
+  if (time) {
+    const timeInt = Math.floor(time)
 
-function getAverageBandwidth () {
-  const value = getLocalStorage('average-bandwidth')
-  if (value !== null && value !== undefined) {
-    const valueNumber = parseInt(value, 10)
-    if (isNaN(valueNumber)) return undefined
+    const params = new URLSearchParams(window.location.search)
+    params.set('start', secondsToTime(timeInt))
 
-    return valueNumber
+    return url + '?' + params.toString()
   }
 
-  return undefined
+  return url
 }
 
-function saveVolumeInStore (value: number) {
-  return setLocalStorage('volume', value.toString())
-}
+function timeToInt (time: number | string) {
+  if (!time) return 0
+  if (typeof time === 'number') return time
 
-function saveMuteInStore (value: boolean) {
-  return setLocalStorage('mute', value.toString())
-}
+  const reg = /^((\d+)[h:])?((\d+)[m:])?((\d+)s?)?$/
+  const matches = time.match(reg)
 
-function saveAverageBandwidth (value: number) {
-  return setLocalStorage('average-bandwidth', value.toString())
-}
+  if (!matches) return 0
 
-function isMobile () {
-  return /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
+  const hours = parseInt(matches[2] || '0', 10)
+  const minutes = parseInt(matches[4] || '0', 10)
+  const seconds = parseInt(matches[6] || '0', 10)
+
+  return hours * 3600 + minutes * 60 + seconds
 }
 
-function buildVideoLink (time?: number) {
-  let href = window.location.href.replace('/embed/', '/watch/')
-  if (time) {
-    const timeInt = Math.floor(time)
+function secondsToTime (seconds: number, full = false, symbol?: string) {
+  let time = ''
 
-    if (window.location.search) href += '&start=' + timeInt
-    else href += '?start=' + timeInt
-  }
+  const hourSymbol = (symbol || 'h')
+  const minuteSymbol = (symbol || 'm')
+  const secondsSymbol = full ? '' : 's'
 
-  return href
+  let hours = Math.floor(seconds / 3600)
+  if (hours >= 1) time = hours + hourSymbol
+  else if (full) time = '0' + hourSymbol
+
+  seconds %= 3600
+  let minutes = Math.floor(seconds / 60)
+  if (minutes >= 1 && minutes < 10 && full) time += '0' + minutes + minuteSymbol
+  else if (minutes >= 1) time += minutes + minuteSymbol
+  else if (full) time += '00' + minuteSymbol
+
+  seconds %= 60
+  if (seconds >= 1 && seconds < 10 && full) time += '0' + seconds + secondsSymbol
+  else if (seconds >= 1) time += seconds + secondsSymbol
+  else if (full) time += '00'
+
+  return time
 }
 
 function buildVideoEmbed (embedUrl: string) {
   return '<iframe width="560" height="315" ' +
+    'sandbox="allow-same-origin allow-scripts" ' +
     'src="' + embedUrl + '" ' +
     'frameborder="0" allowfullscreen>' +
     '</iframe>'
@@ -97,35 +99,53 @@ function copyToClipboard (text: string) {
   document.body.removeChild(el)
 }
 
-export {
-  toTitleCase,
-  buildVideoLink,
-  getStoredVolume,
-  saveVolumeInStore,
-  saveAverageBandwidth,
-  getAverageBandwidth,
-  saveMuteInStore,
-  buildVideoEmbed,
-  getStoredMute,
-  copyToClipboard,
-  isMobile,
-  bytes
+function videoFileMaxByResolution (files: VideoFile[]) {
+  let max = files[0]
+
+  for (let i = 1; i < files.length; i++) {
+    const file = files[i]
+    if (max.resolution.id < file.resolution.id) max = file
+  }
+
+  return max
 }
 
-// ---------------------------------------------------------------------------
+function videoFileMinByResolution (files: VideoFile[]) {
+  let min = files[0]
 
-const KEY_PREFIX = 'peertube-videojs-'
+  for (let i = 1; i < files.length; i++) {
+    const file = files[i]
+    if (min.resolution.id > file.resolution.id) min = file
+  }
 
-function getLocalStorage (key: string) {
-  try {
-    return localStorage.getItem(KEY_PREFIX + key)
-  } catch {
-    return undefined
+  return min
+}
+
+function getRtcConfig () {
+  return {
+    iceServers: [
+      {
+        urls: 'stun:stun.stunprotocol.org'
+      },
+      {
+        urls: 'stun:stun.framasoft.org'
+      }
+    ]
   }
 }
 
-function setLocalStorage (key: string, value: string) {
-  try {
-    localStorage.setItem(KEY_PREFIX + key, value)
-  } catch { /* empty */ }
+// ---------------------------------------------------------------------------
+
+export {
+  getRtcConfig,
+  toTitleCase,
+  timeToInt,
+  secondsToTime,
+  buildVideoLink,
+  buildVideoEmbed,
+  videoFileMaxByResolution,
+  videoFileMinByResolution,
+  copyToClipboard,
+  isMobile,
+  bytes
 }