npm - nuvio-tizen - Versions diffs - 1.8.2 → 1.8.3 - Mend

nuvio-tizen 1.8.2 → 1.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/css/style.css CHANGED Viewed

@@ -76,7 +76,8 @@ html, body {
 /* Filled selection for list rows / buttons */
 .pill.focusable.focused, .stream.focusable.focused, .ep.focusable.focused { background: #818cf8; color: #0e1117; }
 /* Keep secondary lines readable on the bright selected background */
-.stream.focusable.focused .s-sub, .ep.focusable.focused .ep-sub { color: #17203a; }
+.stream.focusable.focused .s-sub, .ep.focusable.focused .ep-sub,
+.ep.focusable.focused .ep-ov, .ep.focusable.focused .ep-rating { color: #17203a; }
 .gear.focusable.focused { opacity: 1; color: #818cf8; }
@@ -89,12 +90,23 @@ html, body {
 .detail-desc { font-size: 22px; line-height: 1.45; color: #cfd3dc; max-height: 200px; overflow: hidden; margin-bottom: 26px; }
 .btn-row { margin-top: 10px; }
 .pill { display: inline-block; padding: 14px 30px; margin-right: 16px; border-radius: 30px; background: #1a1f2b; font-size: 22px; border: 4px solid transparent; }
+/* selected season: grey with light text; focus must still win (higher specificity below) */
+.season-bar .pill.season-sel { background: #2a3346; color: #c7cbd4; }
+.season-bar .pill.focusable.focused { background: #818cf8; color: #0e1117; }
 /* Episode + stream lists */
 .list-panel { position: absolute; top: 640px; left: 60px; right: 60px; bottom: 40px; overflow: hidden; }
 .season-bar { margin-bottom: 14px; white-space: nowrap; }
 .ep, .stream { display: block; padding: 16px 22px; margin-bottom: 10px; background: #161b26; border-radius: 8px; font-size: 22px; border: 4px solid transparent; white-space: normal; }
 .ep .ep-sub, .stream .s-sub { display: block; font-size: 17px; color: #9aa2b1; margin-top: 4px; }
+/* episode rows with thumbnail + rating */
+.ep-row { display: flex; align-items: flex-start; padding: 12px 16px; }
+.ep-thumb { width: 120px; height: 68px; flex: 0 0 120px; margin-right: 18px; border-radius: 6px; background-color: #0e1117; background-size: cover; background-position: center; }
+.ep-body { flex: 1; min-width: 0; }
+.ep-line { font-size: 22px; }
+.ep-rating { color: #ffd257; font-size: 19px; }
+.ep-ov { display: block; font-size: 17px; color: #9aa2b1; margin-top: 6px; max-height: 44px; overflow: hidden; }
 .list-scroll { position: absolute; top: 0; left: 0; right: 0; bottom: 0; overflow: hidden; }
 /* Settings */

package/index.html CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=1920, height=1080, user-scalable=no">
     <title>Nuvio</title>
-    <link rel="stylesheet" href="css/style.css?v=1.8.2">
+    <link rel="stylesheet" href="css/style.css?v=1.8.3">
 </head>
 <body>
     <!-- CSS-applied sentinel (kept off-screen); app.js waits for its width before rendering -->
@@ -47,13 +47,13 @@
     <!-- Load order matters: polyfills -> util -> data -> input -> player -> views -> app -->
     <!-- ?v= busts the TV webview cache on every release (keep in sync with package.json) -->
-    <script src="js/polyfills.js?v=1.8.2"></script>
-    <script src="js/util.js?v=1.8.2"></script>
-    <script src="js/stremio.js?v=1.8.2"></script>
-    <script src="js/keys.js?v=1.8.2"></script>
-    <script src="js/focus.js?v=1.8.2"></script>
-    <script src="js/player.js?v=1.8.2"></script>
-    <script src="js/views.js?v=1.8.2"></script>
-    <script src="js/app.js?v=1.8.2"></script>
+    <script src="js/polyfills.js?v=1.8.3"></script>
+    <script src="js/util.js?v=1.8.3"></script>
+    <script src="js/stremio.js?v=1.8.3"></script>
+    <script src="js/keys.js?v=1.8.3"></script>
+    <script src="js/focus.js?v=1.8.3"></script>
+    <script src="js/player.js?v=1.8.3"></script>
+    <script src="js/views.js?v=1.8.3"></script>
+    <script src="js/app.js?v=1.8.3"></script>
 </body>
 </html>

package/js/app.js CHANGED Viewed

@@ -49,7 +49,12 @@ var App = (function () {
         var f = _stack.pop();
         if (!f) { tryExitApp(); return; }
         showScreen(f.screen);
-        Focus.setScope(screenEl(f.screen), f.focus);
+        // Refresh home when returning if Continue Watching / poster / addons changed.
+        if (f.screen === 'home' && Views.homeDirty()) {
+            Views.renderHome();
+        } else {
+            Focus.setScope(screenEl(f.screen), f.focus);
+        }
     }
     function tryExitApp() {

package/js/stremio.js CHANGED Viewed

@@ -251,6 +251,56 @@ var Stremio = (function () {
         });
     }
+    // ---- TMDB / MDBList (uses keys from Integrations) ----
+    var TMDB_IMG = 'https://image.tmdb.org/t/p/';
+    var _tmdbIdCache = {};
+    var _tmdbSeasonCache = {};
+    function tmdbKey() { return getIntegrations().tmdb; }
+    function tmdbImg(path, size) { return path ? (TMDB_IMG + (size || 'w300') + path) : ''; }
+    function tmdbValidate(key) {
+        if (!key) { return Promise.resolve(false); }
+        return U.getJSON('https://api.themoviedb.org/3/configuration?api_key=' + encodeURIComponent(key), 8000)
+            .then(function () { return true; }, function () { return false; });
+    }
+    function mdblistValidate(key) {
+        if (!key) { return Promise.resolve(false); }
+        return U.getJSON('https://api.mdblist.com/user?apikey=' + encodeURIComponent(key), 8000)
+            .then(function (r) { return !!(r && !r.error); }, function () { return false; });
+    }
+    // imdb id (tt..) -> TMDB tv id, cached.
+    function tmdbFindTvId(imdbId) {
+        var key = tmdbKey();
+        if (!key || !imdbId) { return Promise.resolve(null); }
+        if (_tmdbIdCache[imdbId] !== undefined) { return Promise.resolve(_tmdbIdCache[imdbId]); }
+        return U.getJSON('https://api.themoviedb.org/3/find/' + encodeURIComponent(imdbId) +
+            '?api_key=' + encodeURIComponent(key) + '&external_source=imdb_id', 9000)
+            .then(function (r) {
+                var id = (r && r.tv_results && r.tv_results[0]) ? r.tv_results[0].id : null;
+                _tmdbIdCache[imdbId] = id; return id;
+            }, function () { _tmdbIdCache[imdbId] = null; return null; });
+    }
+    // One request per season → { episodeNumber: {still, rating, overview, name} }.
+    function tmdbSeasonEpisodes(tvId, season) {
+        var key = tmdbKey();
+        if (!key || !tvId) { return Promise.resolve(null); }
+        var ck = tvId + ':' + season;
+        if (_tmdbSeasonCache[ck] !== undefined) { return Promise.resolve(_tmdbSeasonCache[ck]); }
+        return U.getJSON('https://api.themoviedb.org/3/tv/' + tvId + '/season/' + season +
+            '?api_key=' + encodeURIComponent(key), 12000)
+            .then(function (r) {
+                var map = {};
+                ((r && r.episodes) || []).forEach(function (ep) {
+                    map[ep.episode_number] = { still: tmdbImg(ep.still_path, 'w300'),
+                        rating: ep.vote_average, overview: ep.overview, name: ep.name };
+                });
+                _tmdbSeasonCache[ck] = map; return map;
+            }, function () { _tmdbSeasonCache[ck] = null; return null; });
+    }
     // ---- Skip segments (TheIntroDB) ----
     // GET https://api.theintrodb.org/v3/media?imdb_id=tt..[&season=&episode=][&duration_ms=]
     // Returns { intro, recap, credits, preview } arrays of {start,end} in seconds (null = open).
@@ -366,6 +416,8 @@ var Stremio = (function () {
         getAddonUrls: getAddonUrls, addAddon: addAddon, removeAddon: removeAddon, resetAddons: resetAddons,
         getIntegrations: getIntegrations, setIntegration: setIntegration, getPrefs: getPrefs, setPref: setPref,
         getIntroSegments: getIntroSegments,
+        tmdbValidate: tmdbValidate, mdblistValidate: mdblistValidate,
+        tmdbFindTvId: tmdbFindTvId, tmdbSeasonEpisodes: tmdbSeasonEpisodes, tmdbImg: tmdbImg,
         loadAddons: loadAddons, listCatalogs: listCatalogs, getCatalog: getCatalog,
         getMeta: getMeta, getStreams: getStreams, getSubtitles: getSubtitles,
         getSearchCatalogs: getSearchCatalogs, search: search,

package/js/views.js CHANGED Viewed

@@ -102,72 +102,94 @@ var Views = (function () {
     }
     // ================= HOME =================
+    var _catalogCache = null;   // [{name,type,metas}] — avoids refetch on re-render
+    var _homeDirty = false;     // set when Continue Watching / poster / addons changed
+    function markHomeDirty() { _homeDirty = true; }
+    function homeDirty() { return _homeDirty; }
+    function clearCatalogCache() { _catalogCache = null; _homeDirty = true; }
+    function focusHome(s) {
+        var firstCard = s.querySelector('.rows .card.focusable');
+        Focus.setScope(s, firstCard || undefined);
+    }
+    function continueCard(e) {
+        var c = posterCard({ id: e.id.split(':')[0], type: e.type, name: e.name, poster: e.poster }, e.type);
+        // For a series, keep the full episode id so detail opens on the right season/episode.
+        c.__onselect = function () {
+            App.openDetail(e.type, e.id.split(':')[0],
+                { name: e.name, poster: e.poster, type: e.type },
+                e.type === 'series' ? e.id : null);
+        };
+        c.__onlongpress = function () {
+            confirm('Remove “' + (e.name || 'this') + '” from Continue Watching?', 'Remove', function () {
+                Player.removeProgress(e.type, e.id);
+                U.toast('Removed from Continue Watching');
+                renderHome();
+            });
+        };
+        if (e.duration) {
+            var p = U.el('div', 'prog');
+            p.style.width = Math.min(100, (e.position / e.duration * 100)) + '%';
+            c.appendChild(p);
+        }
+        return c;
+    }
     function renderHome() {
+        _homeDirty = false;
         var s = scr('home');
         U.clear(s);
         s.appendChild(header(true, true));
         var rows = U.el('div', 'rows');
         s.appendChild(rows);
-        // Continue watching
+        // Continue watching (always fresh — it's local)
         var cont = Player.continueList();
         if (cont.length) {
-            rows.appendChild(buildRow('Continue Watching   ·   hold OK to remove', cont.map(function (e) {
-                var c = posterCard({ id: e.id.split(':')[0], type: e.type, name: e.name, poster: e.poster }, e.type);
-                // For a series, keep the full episode id so detail opens on the right
-                // season and focuses the exact episode being resumed.
-                c.__onselect = function () {
-                    App.openDetail(e.type, e.id.split(':')[0],
-                        { name: e.name, poster: e.poster, type: e.type },
-                        e.type === 'series' ? e.id : null);
-                };
-                // Long-press (hold OK) removes the item from Continue Watching.
-                c.__onlongpress = function () {
-                    confirm('Remove “' + (e.name || 'this') + '” from Continue Watching?', 'Remove', function () {
-                        Player.removeProgress(e.type, e.id);
-                        U.toast('Removed from Continue Watching');
-                        renderHome();
-                    });
-                };
-                if (e.duration) {
-                    var p = U.el('div', 'prog');
-                    p.style.width = Math.min(100, (e.position / e.duration * 100)) + '%';
-                    c.appendChild(p);
-                }
-                return c;
-            })));
+            rows.appendChild(buildRow('Continue Watching   ·   hold OK to remove', cont.map(continueCard)));
+        }
+        // Catalog rows: use cache for an instant re-render; fetch only when cold.
+        if (_catalogCache) {
+            _catalogCache.forEach(function (c) {
+                var row = buildRow(c.name, c.metas.map(function (m) { return posterCard(m, c.type); }));
+                row.setAttribute('data-filled', '1');
+                rows.appendChild(row);
+            });
+            focusHome(s);
+            return;
         }
         U.spinner(true);
         Stremio.listCatalogs().then(function (cats) {
             var pick = cats.slice(0, 10);
-            // Render placeholder rows in order, fill as data arrives.
-            var rowNodes = pick.map(function (cat) {
-                var placeholder = buildRow(cat.name, []);
-                rows.appendChild(placeholder);
-                return placeholder;
-            });
-            Focus.setScope(s);
+            var rowNodes = pick.map(function (cat) { var ph = buildRow(cat.name, []); rows.appendChild(ph); return ph; });
+            focusHome(s);
             U.spinner(false);
+            var cache = pick.map(function (cat) { return { name: cat.name, type: cat.type, metas: [] }; });
             var tasks = pick.map(function (cat, i) {
                 return function () {
                     return Stremio.getCatalog(cat).then(function (metas) {
-                        fillRow(rowNodes[i], metas.slice(0, 24), cat.type);
+                        var slice = metas.slice(0, 24);
+                        cache[i].metas = slice;
+                        fillRow(rowNodes[i], slice, cat.type);
                     });
                 };
             });
             U.settleAll(tasks, 3).then(function () {
-                // Remove empty rows, refresh focus scope.
                 for (var i = rowNodes.length - 1; i >= 0; i--) {
                     if (!rowNodes[i].getAttribute('data-filled')) { rows.removeChild(rowNodes[i]); }
                 }
-                if (!Focus.current()) { Focus.setScope(s); }
+                _catalogCache = cache.filter(function (c) { return c.metas && c.metas.length; });
+                if (!Focus.current()) { focusHome(s); }
             });
         }, function (err) {
             U.spinner(false);
             U.toast('Failed to load addons. Check network / Settings.');
-            Focus.setScope(s);
+            focusHome(s);
         });
     }
@@ -287,8 +309,7 @@ var Views = (function () {
         var panel = U.el('div', 'list-panel');
         var bar = U.el('div', 'season-bar');
         ss.forEach(function (sn) {
-            var p = U.el('div', 'pill focusable', 'Season ' + sn);
-            if (sn === _d.season) { p.style.background = '#2a3346'; }
+            var p = U.el('div', 'pill focusable' + (sn === _d.season ? ' season-sel' : ''), 'Season ' + sn);
             p.__onselect = function () { _d.season = sn; drawDetail(); };
             bar.appendChild(p);
         });
@@ -300,26 +321,58 @@ var Views = (function () {
         listScroll.style.height = '340px';
         var eps = meta.videos.filter(function (v) { return (v.season === undefined ? 1 : v.season) === _d.season; });
         eps.sort(function (a, b) { return (a.episode || 0) - (b.episode || 0); });
+        var epRefs = [];
         eps.forEach(function (v) {
             var watched = Player.isWatched('series', v.id);
-            var e = U.el('div', 'ep focusable' + (watched ? ' watched' : ''));
-            e.appendChild(document.createTextNode((watched ? '✓ ' : '') + 'E' + (v.episode || '?') + '  ' + (v.title || v.name || '')));
-            if (v.overview) { e.appendChild(U.el('span', 'ep-sub', v.overview)); }
+            var e = U.el('div', 'ep ep-row focusable' + (watched ? ' watched' : ''));
+            var thumb = U.el('div', 'ep-thumb');
+            if (v.thumbnail) { thumb.style.backgroundImage = 'url("' + v.thumbnail + '")'; }
+            e.appendChild(thumb);
+            var body = U.el('div', 'ep-body');
+            var line = U.el('div', 'ep-line');
+            line.appendChild(document.createTextNode((watched ? '✓ ' : '') + 'E' + (v.episode || '?') + '  ' + (v.title || v.name || '')));
+            var rating = U.el('span', 'ep-rating', '');
+            line.appendChild(rating);
+            body.appendChild(line);
+            var ov = U.el('span', 'ep-ov', v.overview || '');
+            body.appendChild(ov);
+            e.appendChild(body);
             e.__onselect = function () {
                 openStreams(v.id, _d.meta.name + '  S' + _d.season + 'E' + (v.episode || ''));
             };
-            // Long-press toggles watched/unwatched.
             e.__onlongpress = function () {
                 var now = !Player.isWatched('series', v.id);
                 Player.setWatched('series', v.id, now);
                 U.toast(now ? 'Marked watched' : 'Marked unwatched');
-                _d.target = v.id;   // keep focus on this episode after re-render
+                _d.target = v.id;
                 drawDetail();
             };
             if (_d.target && v.id === _d.target) { _d._epFocus = e; }
             listScroll.appendChild(e);
+            epRefs.push({ num: v.episode, thumb: thumb, rating: rating, ov: ov });
         });
         panel.appendChild(listScroll);
+        // Enrich with TMDB episode images + ratings (one request per season) if a key is set.
+        if (Stremio.getIntegrations().tmdb) {
+            var seasonAtFetch = _d.season;
+            Stremio.tmdbFindTvId(_d.id).then(function (tvId) {
+                if (!tvId || _d.season !== seasonAtFetch) { return; }
+                return Stremio.tmdbSeasonEpisodes(tvId, seasonAtFetch).then(function (map) {
+                    if (!map || _d.season !== seasonAtFetch) { return; }
+                    epRefs.forEach(function (r) {
+                        var ep = map[r.num];
+                        if (!ep) { return; }
+                        if (ep.still && !r.thumb.style.backgroundImage) { r.thumb.style.backgroundImage = 'url("' + ep.still + '")'; }
+                        if (ep.rating) { r.rating.textContent = '  ★ ' + (Math.round(ep.rating * 10) / 10); }
+                        if (ep.overview && !r.ov.textContent) { r.ov.textContent = ep.overview; }
+                    });
+                });
+            });
+        }
         return panel;
     }
@@ -420,6 +473,7 @@ var Views = (function () {
     }
     function startPlayback(stream, videoId, label) {
+        markHomeDirty();   // progress/watched will change → refresh Continue Watching on return
         var ctx = { url: stream.url, type: _d.type, id: videoId, name: label,
             poster: _d.meta.poster, streams: playableSources() };
         if (_d.type === 'series' && _d.meta.videos) {
@@ -480,8 +534,9 @@ var Views = (function () {
         input.className = 'focusable';
         input.placeholder = 'Search movies & series…';
         input.__onselect = function () { input.focus(); };
+        // Enter (or the Search button) runs the search. No onchange — it fires on blur
+        // when moving to a result and would re-run the search and steal focus.
         input.onkeydown = function (ev) { if (ev.keyCode === 13) { if (ev.stopPropagation) { ev.stopPropagation(); } runSearch(input.value); } };
-        input.onchange = function () { runSearch(input.value); };
         bar.appendChild(input);
         var go = U.el('div', 'pill focusable search-go', 'Search');
@@ -554,6 +609,18 @@ var Views = (function () {
         confirmBtn.__onselect = doConfirm;
         cancelBtn.__onselect = function () { App.back(); };
         row.appendChild(confirmBtn);
+        if (cfg.validator) {
+            var valBtn = U.el('div', 'pill focusable', 'Validate');
+            valBtn.__onselect = function () {
+                var v = ('' + input.value).trim();
+                if (!v) { U.toast('Enter a key first'); return; }
+                U.toast('Validating…', 4000);
+                cfg.validator(v).then(function (ok) {
+                    U.toast(ok ? '✓ Key is valid' : '✗ Key rejected (or unreachable)', 3500);
+                });
+            };
+            row.appendChild(valBtn);
+        }
         row.appendChild(cancelBtn);
         wrap.appendChild(row);
@@ -656,6 +723,7 @@ var Views = (function () {
                 item.__onselect = function () {
                     confirm('Remove "' + name + '"?', 'Remove', function () {
                         Stremio.removeAddon(url);
+                        clearCatalogCache();
                         U.toast('Removed');
                         setTimeout(renderSettings, 300);
                     });
@@ -669,6 +737,7 @@ var Views = (function () {
             reset.__onselect = function () {
                 confirm('Reset to default addons? This removes all addons you’ve added.', 'Reset', function () {
                     Stremio.resetAddons();
+                    clearCatalogCache();
                     U.toast('Addons reset to default');
                     setTimeout(renderSettings, 300);
                 });
@@ -684,7 +753,7 @@ var Views = (function () {
                     hint: 'Type a Stremio addon manifest URL, then Confirm. RETURN cancels — nothing is saved unless you confirm.',
                     value: 'https://', placeholder: 'https://addon.example/manifest.json',
                     validate: function (v) { return (!v || v === 'https://' || v.indexOf('://') === -1 || v.length < 12) ? 'Enter a full manifest URL' : null; },
-                    onConfirm: function (v) { Stremio.addAddon(v); U.toast('Addon added'); App.back(); renderSettings(); }
+                    onConfirm: function (v) { Stremio.addAddon(v); clearCatalogCache(); U.toast('Addon added'); App.back(); renderSettings(); }
                 });
             };
             wrap.appendChild(addRow);
@@ -697,7 +766,7 @@ var Views = (function () {
     function maskKey(v) { v = '' + v; return v.length <= 4 ? '••••' : ('••••' + v.slice(-4)); }
-    function keyRow(title, key, placeholder) {
+    function keyRow(title, key, placeholder, validator) {
         var val = Stremio.getIntegrations()[key] || '';
         var r = U.el('div', 'addon-item focusable');
         r.appendChild(U.el('div', 'a-name', title));
@@ -705,8 +774,8 @@ var Views = (function () {
         r.__onselect = function () {
             App.openEntry({
                 title: title,
-                hint: 'Paste your key, then Confirm. Leave blank and Confirm to clear it.',
-                value: val, placeholder: placeholder,
+                hint: 'Paste your key, then Confirm. Use Validate to test it. Leave blank and Confirm to clear.',
+                value: val, placeholder: placeholder, validator: validator,
                 onConfirm: function (v) { Stremio.setIntegration(key, v); U.toast(v ? 'Saved' : 'Cleared'); App.back(); renderSettings(); }
             });
         };
@@ -715,9 +784,9 @@ var Views = (function () {
     function settingsIntegrations(wrap) {
         wrap.appendChild(U.el('h2', null, 'Integrations'));
-        wrap.appendChild(keyRow('TMDB API key (v3)', 'tmdb', 'TMDB v3 API key'));
-        wrap.appendChild(keyRow('MDBList API key', 'mdblist', 'MDBList API key'));
-        wrap.appendChild(U.el('div', 'hint', 'Keys are stored on this TV only. RETURN goes back.'));
+        wrap.appendChild(keyRow('TMDB API key (v3)', 'tmdb', 'TMDB v3 API key', Stremio.tmdbValidate));
+        wrap.appendChild(keyRow('MDBList API key', 'mdblist', 'MDBList API key', Stremio.mdblistValidate));
+        wrap.appendChild(U.el('div', 'hint', 'Keys are stored on this TV only. TMDB enables episode images & ratings. RETURN goes back.'));
         Focus.setScope(scr('settings'));
     }
@@ -741,6 +810,7 @@ var Views = (function () {
         row.appendChild(U.el('div', 'a-url', 'Press OK to change'));
         row.__onselect = function () {
             Stremio.setPref('posterShape', nextVal(POSTER_SHAPES, Stremio.getPrefs().posterShape));
+            markHomeDirty();   // home reflects the new shape on return
             render();
         };
         wrap.appendChild(row);
@@ -752,6 +822,7 @@ var Views = (function () {
         renderHome: renderHome, renderDetail: renderDetail, renderSettings: renderSettings,
         settingsRoot: settingsRoot, backInSettings: backInSettings,
         renderSearch: renderSearch, renderEntry: renderEntry, backInDetail: backInDetail,
+        homeDirty: homeDirty,
         isModalOpen: function () { return _modalOpen; }, closeModal: closeModal
     };
 })();

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nuvio-tizen",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "Nuvio-style Stremio-addon streaming client for Tizen 3.0+ Samsung TVs (TizenBrew app module).",
   "packageType": "app",
   "appName": "Nuvio",