- Supporting multiple dates in trakt history

- Fixed some errors

Author: MrMamen

app/manifest.json

@@ -1,7 +1,7 @@
 {
     "name": "__MSG_appName__",
     "short_name": "__MSG_appShortName__",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "manifest_version": 2,
     "description": "__MSG_appDescription__",
     "icons": {

app/scripts/src/content/item-parser.js

@@ -24,23 +24,26 @@ ItemParser.parse = function parse(callback) {
   var typeElement = document.querySelector("meta[name=type]");
   if (typeElement) {
     switch(typeElement.getAttribute("content")) {
+      //Old format
       case 'program':
         type = "movie";
         mainTitle = document.querySelector("meta[name=title]").getAttribute("content");
+        item = new Item({ title: mainTitle, type: type });
         break;
       case 'episode':
+        type = "show";
+        mainTitle = document.querySelector("meta[name=title]").getAttribute("content");
+        Rollbar.info("Seems to not be a season based series", mainTitle);
         return;
       default:
         Rollbar.error("Unknown series/movie type", typeElement.getAttribute("content"));
         return;
     }
   } else {
+    //new format as of july 2018 "/serie/narvestad-tar-ferie/sesong/1/episode/6"
     type = "show";
     mainTitle = document.querySelector(".tv-series-hero__title").textContent;
-  }
-  if (type === 'show') {
     var uri = document.querySelector("a.tv-series-episodes__episode-link--active").getAttribute("href");
-    //format as of july 2018 "/serie/narvestad-tar-ferie/sesong/1/episode/6"
     if (!uri.split('/')[3] || uri.split('/')[3] !== 'sesong') {
       Rollbar.error("Unexpected URL-format", uri);
       return;
@@ -57,8 +60,6 @@ ItemParser.parse = function parse(callback) {
       type: type,
       nrkId: nrkSeriesId
     });
-  } else {
-    item = new Item({ title: mainTitle, type: type });
   }
   callback.call(this, item);
 };

app/scripts/src/history-sync/actions/activity-action-creators.js

@@ -1,6 +1,5 @@
 import ViewingActivityAppDispatcher from '../dispatcher/viewing-activity-app-dispatcher';
 import ActionTypes from '../constants/activity-constants';
-import NRKWebAPIUtils from '../utils/nrk-web-api-utils';
 
 export default class ActivityActionCreators {
   static receiveActivities(activities) {

app/scripts/src/history-sync/components/activity-list-item.js

@@ -35,17 +35,23 @@ export default class ActivityListItem extends React.Component {
       nrkTitle += " (S"+nrk.season+"E"+nrk.episode+")";
     }
     let nrkUrl = `https://tv.nrk.no/program/${nrk.id}`;
-    let trakt = activity.trakt;
+    let traktArray = activity.trakt;
     let traktDate, traktUrl, traktTitle;
 
-    if (trakt) {
-      traktDate = trakt.date ? trakt.date.format('MMMM Do YYYY, HH:mm:ss') : '-';
-      traktUrl = trakt.season ? `https://trakt.tv/shows/${trakt.show.ids.slug}/seasons/${trakt.season}/episodes/${trakt.number}` : `https://trakt.tv/movies/${trakt.ids.slug}`;
-      if (trakt.show && trakt.title){
-        traktTitle = `${trakt.show.title}: ${trakt.title}`;
-      } else {
-        traktTitle = trakt.show ? trakt.show.title : trakt.title;
-      }
+    if (traktArray) {
+      traktArray.forEach((trakt, index)=> {
+        if (index === 0){
+          traktDate = trakt.date ? trakt.date.format('MMMM Do YYYY, HH:mm:ss') : '-';
+          traktUrl = trakt.season ? `https://trakt.tv/shows/${trakt.show.ids.slug}/seasons/${trakt.season}/episodes/${trakt.number}` : `https://trakt.tv/movies/${trakt.ids.slug}`;
+          if (trakt.show && trakt.title){
+            traktTitle = `${trakt.show.title}: ${trakt.title}`;
+          } else {
+            traktTitle = trakt.show ? trakt.show.title : trakt.title;
+          }
+        } else {
+          traktDate += " & " + (trakt.date ? trakt.date.format('MMMM Do YYYY, HH:mm:ss') : '-');
+        }
+      })
     }
 
     let formId = `${nrk.id}--add`;
@@ -55,7 +61,7 @@ export default class ActivityListItem extends React.Component {
         <span className='mdl-list__item-primary-content'>
           <TmdbImage
             className='mdl-list__item-avatar'
-            item={trakt}
+            item={traktArray[0]}
             imageHost={this.props.imageHost}
             imageWidth={this.props.imageWidth}
           />

app/scripts/src/history-sync/utils/trakt-web-api-utils.js

@@ -63,7 +63,7 @@ export default class TraktWebAPIUtils {
         })
         .catch((status, response) => {
           let nrk = Object.assign(options.item, { date: options.date });
-          resolve(Object.assign({ nrk }, { add: false }));
+          resolve(Object.assign({ nrk, trakt: [] }, { add: false }));
         });
     });
   }
@@ -75,15 +75,19 @@ export default class TraktWebAPIUtils {
         url: TraktWebAPIUtils.activityUrl(options.result.activity),
         success: function(response) {
           let exclude = false;
-          let history = JSON.parse(response)[0];
-          let date;
-
-          if (history && history.watched_at) {
-            date = moment(history.watched_at);
-            exclude = date.diff(options.result.date, 'days') == 0;
-          }
-          let trakt = Object.assign(options.result.activity, { date: date });
-          let nrk = Object.assign(options.item, { date: options.date });
+          let allHistory = JSON.parse(response);
+          let trakt = [];
+
+          allHistory.forEach((history) => {
+            let date;
+            if (history && history.watched_at) {
+              date = moment(history.watched_at);
+              exclude = exclude || date.diff(options.result.date, 'days') == 0;
+            }
+            trakt.push(Object.assign({}, options.result.activity, {date: date.clone()}));
+          });
+
+          let nrk = Object.assign(options.item, {date: options.date});
           exclude = exclude || (options.item.progress.percentageWatched < options.item.progress.percentageAssumedFinished);
 
           resolve(Object.assign({ nrk, trakt }, { add: !exclude }));

package.json

@@ -9,7 +9,7 @@
   "private": true,
   "dependencies": {
     "flux": "^2.1.1",
-    "moment": "2.19.3",
+    "moment": "2.22.2",
     "react": "0.13.3",
     "react-router": "2.0.0-rc5",
     "rollbar": "^2.4.4"