@saooti/octopus-sdk 33.0.0 → 33.0.2

package/src/components/mixins/player/playerLogic.ts

@@ -172,24 +172,7 @@ export const playerLogic = defineComponent({
         this.playerError = true;
       }
     },
-    onTimeUpdate(event: Event): void {
-      const mediaTarget = (event.currentTarget as HTMLMediaElement);
-      if (this.podcast || this.live) {
-        if (!this.downloadId) {
-          return;
-        }
-        if (
-          this.live &&
-          0 === this.listenTime &&
-          0 !== mediaTarget.currentTime
-        ) {
-          this.notListenTime = mediaTarget.currentTime;
-          this.listenTime = 1;
-        } else {
-          this.listenTime =
-            mediaTarget.currentTime - this.notListenTime;
-        }
-      }
+    streamDurationForSafari(mediaTarget:HTMLMediaElement){
       let streamDuration = mediaTarget.duration;
       if(Infinity===streamDuration){
         const seekable = mediaTarget.seekable;
@@ -199,15 +182,16 @@ export const playerLogic = defineComponent({
           streamDuration = mediaTarget.currentTime;
         }
       }
-      if (!streamDuration) return;
-      if (!mediaTarget.currentTime) return;
-      if (!this.live) {
-        this.displayAlertBar = false;
-        this.percentLiveProgress = 100;
-        this.$store.commit('playerTotalTime', streamDuration);
-        this.$store.commit('playerElapsed', mediaTarget.currentTime / streamDuration);
-        return;
-      }
+      return streamDuration;
+    },
+    onTimeUpdatePodcast(streamDuration:number, currentTime:number){
+      this.displayAlertBar = false;
+      this.percentLiveProgress = 100;
+      this.$store.commit('playerTotalTime', streamDuration);
+      this.$store.commit('playerElapsed', currentTime / streamDuration);
+    },
+    onTimeUpdateLive(streamDuration: number, currentTime:number){
+      if(!this.live){return;}
       const scheduledDuration = this.live.duration / 1000;
       if (scheduledDuration > streamDuration) {
         this.displayAlertBar = false;
@@ -215,15 +199,42 @@ export const playerLogic = defineComponent({
         this.$store.commit('playerTotalTime', scheduledDuration);
         this.$store.commit(
           'playerElapsed',
-          mediaTarget.currentTime / scheduledDuration
+          currentTime / scheduledDuration
         );
       } else {
         this.percentLiveProgress = 100;
         this.displayAlertBar = true;
         this.durationLivePosition = (scheduledDuration / streamDuration) * 100;
         this.$store.commit('playerTotalTime', streamDuration);
-        this.$store.commit('playerElapsed', mediaTarget.currentTime / streamDuration);
+        this.$store.commit('playerElapsed', currentTime / streamDuration);
+      }
+    },
+    onTimeUpdate(event: Event): void {
+      const mediaTarget = (event.currentTarget as HTMLMediaElement);
+      if (this.podcast || this.live) {
+        if (!this.downloadId) {
+          return;
+        }
+        if (
+          this.live &&
+          0 === this.listenTime &&
+          0 !== mediaTarget.currentTime
+        ) {
+          this.notListenTime = mediaTarget.currentTime;
+          this.listenTime = 1;
+        } else {
+          this.listenTime =
+            mediaTarget.currentTime - this.notListenTime;
+        }
+      }
+      let streamDuration = this.streamDurationForSafari(mediaTarget);
+      if (!streamDuration) return;
+      if (!mediaTarget.currentTime) return;
+      if (!this.live) {
+        this.onTimeUpdatePodcast(streamDuration,mediaTarget.currentTime);
+        return;
       }
+      this.onTimeUpdateLive(streamDuration,mediaTarget.currentTime);
     },
     onFinished(): void {
       this.setDownloadId(null);

package/src/components/pages/Podcast.vue

@@ -71,6 +71,10 @@
         :title="$t('More episodes of this emission')"
         :button-text="$t('All podcast emission button')"
       />
+      <PodcastInlineList
+        :podcastId="podcastId"
+        title="Les recommendations de Vincent !"
+      />
       <PodcastInlineList
         v-for="c in categories"
         :key="c.id"

package/src/helper/duration.ts

@@ -1,43 +1,14 @@
 export default {
+  formatToString(value: number){
+    if (value < 10) {
+      return '0' + value;
+    }
+    return value.toString();
+  },
   formatDuration(totalSeconds: number): string {
     const hours = Math.floor(totalSeconds / 3600);
     const minutes = Math.floor((totalSeconds - hours * 3600) / 60);
     const seconds = totalSeconds - hours * 3600 - minutes * 60;
-    let hoursString = "";
-    let minutesString = "";
-    let secondsString = "";
-
-    if (hours > 0) {
-      if (hours < 10) {
-        hoursString = '0' + hours;
-      }else{
-        hoursString = hours.toString();
-      }
-      if (minutes < 10) {
-        minutesString = '0' + minutes;
-      }else{
-        minutesString = minutes.toString();
-      }
-      if (seconds < 10) {
-        secondsString = '0' + seconds;
-      }else{
-        secondsString = seconds.toString();
-      }
-
-      return hoursString + "'" + minutesString + "'" + secondsString + "'";
-    } else {
-      if (minutes < 10) {
-        minutesString = '0' + minutes;
-      }else{
-        minutesString = minutes.toString();
-      }
-      if (seconds < 10) {
-        secondsString = '0' + seconds;
-      }else{
-        secondsString = seconds.toString();
-      }
-
-      return minutesString + "'" + secondsString + "'";
-    }
+    return (hours > 0? this.formatToString(hours)+"'":"") + this.formatToString(minutes) +"'"+ this.formatToString(seconds)+"'";
   },
 };

package/src/i18n.ts

@@ -8,7 +8,7 @@ import 'moment/dist/locale/fr.js';
 import 'moment/dist/locale/it.js';
 import 'moment/dist/locale/sl.js';
 
-export function setupI18n(options = { locale: 'en' }, isEducation: boolean) {
+export function setupI18n(options: { locale: string }, isEducation: boolean) {
   const i18n = createI18n(options)
   loadLocaleMessages(i18n.global, options.locale, isEducation);
   return i18n;

package/src/locale/it.ts

@@ -67,7 +67,6 @@ export default{
     Episode: 'Episodio', 
     'Episode name image': "Immagine dell'episodio {name}", 
     'More episodes of this emission': "Altri episodi di questa serie", 
-    'More episodes of this category : {name}': "Altri episodi della categoria: {name}", 
     'All podcast emission button': "Seleziona tutte le serie",
     Duration: 'Durata: {duration}', 
     Animator: 'Host',

package/src/main.ts

@@ -6,19 +6,12 @@ import {setupI18n} from './i18n';
 import router from '@/router/router';
 import store from '@/store/AppStore';
 import paramStore from '@/store/paramStore';
-/* import 'popper.js/dist/popper.min.js'; */
-/* import 'jquery/src/jquery.js'; */
-/* import 'jquery';
-import 'bootstrap/dist/js/bootstrap.bundle.min.js';
- */
 
-
-//TODO
 const nameEQ = 'octopus-language=';
 const ca = document.cookie.split(';');
 let language = "";
-for (let i = 0; i < ca.length; i++) {
-  let c = ca[i];
+for (let valueCookie of ca) {
+  let c = valueCookie;
   while (c.charAt(0) == ' ') c = c.substring(1, c.length);
   if (0 === c.indexOf(nameEQ)){
     language = c.substring(nameEQ.length, c.length);
@@ -26,7 +19,7 @@ for (let i = 0; i < ca.length; i++) {
   }
 }
 if(0===language.length){
-  const navigatorLang = navigator.language /* || navigator.userLanguage */;
+  const navigatorLang = navigator.language;
   language = 'fr';
   if(navigatorLang.includes('en')){
     language = 'en';

package/src/sass/_variables.scss

@@ -2,7 +2,7 @@
 $body-bg: #f8fafc;
 
 // Typography
-$font-family-sans-serif: 'Roboto', sans-serif;
+$font-family-sans-serif: sans-serif;
 $font-size-base: 0.9rem;
 $line-height-base: 1.6;
 $primary: #32815C;

package/src/store/class/adserver/adserverConfig.ts

@@ -1,7 +1,7 @@
 import { AdserverTiming } from "./adserverTiming";
 
 export interface AdserverConfig {
-  activeServer?: string | undefined; // SOUNDCAST, ADSWIZZ, TARGETSPOT
+  activeServer?: string; // SOUNDCAST, ADSWIZZ, TARGETSPOT
   config: {[key:string]:  Array<AdserverTiming>};
   minIntervalDuration?: number;
   minTailDuration?: number;

package/src/store/class/general/emission.ts

@@ -4,7 +4,7 @@ import { Person } from '../user/person';
 
 export interface Emission {
   imageUrl?: string;
-  annotations?: {[key: string]:string|number|boolean|undefined}|undefined;
+  annotations?: {[key: string]:string|number|boolean|undefined};
   description: string;
   emissionId: number;
   iabIds?: Array<number>;

package/src/store/class/general/organisation.ts

@@ -4,7 +4,7 @@ export interface Organisation{
   imageUrl: string;
   admin?: Person;
   comments?: string;
-  attributes?: {[key: string]:string|number|boolean|undefined}|undefined;
+  attributes?: {[key: string]:string|number|boolean|undefined};
   description?: string;
   id: string;
   location?: {

package/src/store/class/general/podcast.ts

@@ -5,7 +5,7 @@ import { Person } from '../user/person';
 export interface Podcast {
   imageUrl?: string;
   animators?: Array<Participant>;
-  annotations?:{[key: string]:string|number|boolean|undefined}|undefined;
+  annotations?:{[key: string]:string|number|boolean|undefined};
   audioStorageUrl: string;
   audioUrl: string;
   article?: string;

package/src/store/paramStore.ts

@@ -1,7 +1,7 @@
 import octopusApi from '@saooti/octopus-api';
 import { Category } from './class/general/category';
 
-const state:paramStore = {
+const state:ParamStore = {
   generalParameters: {
     organisationId:'ecbd98d9-79bd-4312-ad5e-fc7c1c4a191c',
     authenticated: true,
@@ -89,12 +89,13 @@ const state:paramStore = {
     studioUrl: 'http://studio.dev2.saooti.org/',
     playerUrl: 'https://playerbeta.dev2.saooti.org/',
     speechToTextUrl:'https://speech2text.dev2.saooti.org/',
+    recoUrl: 'https://reco.dev2.saooti.org/',
     organisationId: undefined,
     rubriqueIdFilter: undefined,
   },
 };
 export interface GeneralParameters{
-  organisationId?: string|undefined,
+  organisationId?: string,
   authenticated?: boolean,
   isAdmin?: boolean,
   isRoleLive?: boolean,
@@ -122,7 +123,7 @@ export interface PodcastPage{
   downloadButton?: boolean,
   hlsUri?: string,
   mainRubrique?: number,
-  resourceUrl?: string |undefined,
+  resourceUrl?: string,
   podcastItemShowEmission?: boolean,
   clickPlayGoPage?:boolean,
   listTypeClassic?:boolean,
@@ -133,16 +134,16 @@ export interface PodcastsPage{
     MonetizableFilter?: boolean,
     podcastShadow?: boolean,
     podcastBorderBottom?: boolean,
-    titlePage?: string|undefined,
+    titlePage?: string,
     emissionChooser?: boolean,
 }
 export interface EmissionsPage{
   smallItems?: boolean,
   lightItems?: boolean,
-  titlePage?: string|undefined,
+  titlePage?: string,
   itemPlayer?: boolean,
-  rubriquage?: number|undefined,
-  mainRubrique?: number|undefined,
+  rubriquage?: number,
+  mainRubrique?: number,
   buttonMore?: boolean,
   overflowScroll?: boolean,
   titleInImage?: boolean,
@@ -154,10 +155,10 @@ export interface EmissionPage{
 }
 export interface IntervenantPage{
   lightStyle?: boolean,
-  titlePage?: string|undefined
+  titlePage?: string
 }
 export interface IntervenantsPage{
-  titlePage?: string|undefined
+  titlePage?: string
 }
 export interface SearchPage{
   hideBar?: boolean
@@ -167,7 +168,7 @@ export interface Player{
   emissionName?: boolean
 }
 export interface Footer{
-  contactLink?: string|undefined
+  contactLink?: string
 }
 export interface Organisation{
   imageUrl?: string,
@@ -181,7 +182,8 @@ export interface OctopusApi{
   studioUrl?: string,
   playerUrl?: string,
   speechToTextUrl?:string,
-  organisationId?: string | undefined,
+  recoUrl?:string,
+  organisationId?: string,
   oAuthParam?: {
     accessToken: string,
     refreshToken: string,
@@ -189,7 +191,7 @@ export interface OctopusApi{
   },
   rubriqueIdFilter?: Array<number>,
 }
-export interface paramStore{
+export interface ParamStore{
   generalParameters:GeneralParameters,
   podcastPage: PodcastPage,
   podcastsPage: PodcastsPage,
@@ -206,7 +208,7 @@ export interface paramStore{
 const definedProps = (obj: GeneralParameters|PodcastPage|PodcastsPage|EmissionsPage|EmissionPage|IntervenantPage|IntervenantsPage|SearchPage|Player|Footer|Organisation|OctopusApi) => Object.fromEntries(
   Object.entries(obj).filter(([, v]) => v !== undefined)
 );
-const initialize = function initialize(initObject: paramStore): Promise<void> {
+const initialize = function initialize(initObject: ParamStore): Promise<void> {
   return new Promise<void>((resolve, reject) => {
     state.generalParameters =  Object.assign(state.generalParameters, definedProps(initObject.generalParameters));
     if(!state.generalParameters.authenticated){