nuvio-tizen 1.3.0 → 1.4.0

package/README.md

@@ -15,8 +15,13 @@ core behaviour, targeting 2017 Samsung TVs (Tizen 3.0, ~Chromium 47).
   **Cinemeta** (catalogs + metadata), **WatchHub** (streams), **OpenSubtitles v3** (subtitles).
 - Home screen with catalog rows + **Continue Watching**.
 - **Search** (🔍 in the header) across every addon catalog that supports the `search` extra.
-- Detail pages: movies (Play) and series (season/episode browser).
-- **Stream aggregation** across all installed stream addons.
+- Detail pages: movies (Play) and series (season/episode browser). **Continue Watching**
+  resumes a series on the exact season + episode you left off.
+- **Stream aggregation** across all installed stream addons, each source showing
+  **size + languages/description** (from `behaviorHints.videoSize` and the addon's own text,
+  e.g. MediaFusion / Torrentio).
+- **In-player menu** (press **UP**): *Select source* (switch stream mid-playback, keeping
+  your position) and *Configure subtitles* → Language / Size / Style.
 - **Subtitles from addons**: fetched per title/episode, SRT + VTT parsed and rendered as a
   timed overlay; press **UP** during playback to pick a track (or turn them Off).
   Configurable in Settings: **default language** (auto-loads a matching track),

package/js/app.js

@@ -16,11 +16,11 @@ var App = (function () {
 
     function pushFrame() { _stack.push({ screen: _current, focus: Focus.current() }); }
 
-    function openDetail(type, id, preview) {
+    function openDetail(type, id, preview, target) {
         if (!id) { return; }
         pushFrame();
         showScreen('detail');
-        Views.renderDetail(type, id, preview);
+        Views.renderDetail(type, id, preview, target);
     }
 
     function openSettings() {
@@ -67,7 +67,12 @@ var App = (function () {
             case 'LEFT': Focus.move('LEFT'); return true;
             case 'RIGHT': Focus.move('RIGHT'); return true;
             case 'UP': Focus.move('UP'); return true;
-            case 'DOWN': Focus.move('DOWN'); return true;
+            case 'DOWN': {
+                var c = Focus.current();
+                if (c && c.__navDOWN && c.__navDOWN() !== false) { return true; }
+                Focus.move('DOWN');
+                return true;
+            }
             case 'OK': Focus.clickCurrent(); return true;
             case 'BACK': back(); return true;
             default: return true;

package/js/player.js

@@ -159,7 +159,7 @@ var Player = (function () {
 
     function updateHint() {
         var base = _isLive ? 'OK: Play/Pause   RETURN: Back' : 'OK: Play/Pause   ←/→: Seek   RETURN: Back';
-        if (_subTracks.length) { base += '   UP: Subtitles'; }
+        base += '   UP: Menu';
         var h = U.byId('osd-hint');
         if (h) { h.textContent = base; }
     }
@@ -320,55 +320,119 @@ var Player = (function () {
         subsEl.className = 'hidden'; U.clear(subsEl);
     }
 
-    // ---------- subtitle menu ----------
-    function openSubMenu() {
-        if (!_subTracks.length) { return; }
+    function applyStyleNow() {
+        var span = subsEl.firstChild;
+        if (span) { styleSpan(span); }
+    }
+
+    // Switch to a different source mid-playback, keeping position (VOD).
+    function switchSource(s) {
+        if (!s || !s.url) { return; }
+        _ctx.url = s.url;
+        _ctx.resumeSec = _isLive ? 0 : _cur;
+        U.toast('Switching source…', 1500);
+        U.spinner(true);
+        if (useAV) { startAV(s.url); } else { startHTML5(s.url); }
+    }
+
+    // ---------- in-player menu (stack of levels) ----------
+    var _menuStack = [];
+
+    function topMenu() { return _menuStack[_menuStack.length - 1]; }
+
+    function openMenu() {
         _menuOpen = true;
-        // index 0 = Off; tracks start at 1
-        _menuIdx = 0;
-        renderSubMenu();
+        _menuStack = [rootMenu()];
+        renderMenu();
         subMenuEl.className = '';
         showOSD(true);
     }
-
-    function closeSubMenu() {
-        _menuOpen = false;
+    function closeMenu() {
+        _menuOpen = false; _menuStack = [];
         subMenuEl.className = 'hidden';
         showOSD(false);
     }
+    function pushMenu(desc) { _menuStack.push(desc); renderMenu(); }
+    function popMenu() { _menuStack.pop(); if (!_menuStack.length) { closeMenu(); } else { renderMenu(); } }
+    function replaceTop(desc) { _menuStack[_menuStack.length - 1] = desc; renderMenu(); }
 
-    function renderSubMenu() {
+    function renderMenu() {
+        var m = topMenu();
         U.clear(subMenuEl);
-        subMenuEl.appendChild(U.el('div', 'sm-title', 'Subtitles'));
+        subMenuEl.appendChild(U.el('div', 'sm-title', m.title));
         var list = U.el('div', 'sm-list');
-        var items = [{ label: 'Off' + (_subOn ? '' : '  ✓'), track: null }];
-        _subTracks.forEach(function (tr) {
-            var mark = (_subOn && _subLabel === (tr.lang || 'on')) ? '  ✓' : '';
-            items.push({ label: (tr.lang || 'unknown') + '  ·  ' + (tr._addon || '') + mark, track: tr });
-        });
-        _menuItems = items;
-        items.forEach(function (it, i) {
-            var node = U.el('div', 'sm-item' + (i === _menuIdx ? ' sel' : ''), it.label);
-            list.appendChild(node);
+        m.items.forEach(function (it, i) {
+            var label = it.label + (it.sel ? '  ✓' : '');
+            list.appendChild(U.el('div', 'sm-item' + (i === m.idx ? ' sel' : ''), label));
         });
         subMenuEl.appendChild(list);
-        // keep selected item visible
-        var sel = list.children[_menuIdx];
+        var sel = list.children[m.idx];
         if (sel && sel.scrollIntoView) { try { sel.scrollIntoView(false); } catch (e) {} }
     }
 
-    var _menuItems = [];
+    function rootMenu() {
+        var items = [];
+        if (_ctx.streams && _ctx.streams.length) {
+            items.push({ label: 'Select source', run: function () { pushMenu(sourceMenu()); } });
+        }
+        items.push({ label: 'Configure subtitles', run: function () { pushMenu(subConfigMenu()); } });
+        return { title: 'Menu', items: items, idx: 0 };
+    }
+
+    function sourceMenu() {
+        var items = _ctx.streams.map(function (s) {
+            return { label: s.label || 'Source', sel: (s.url === _ctx.url),
+                run: function () { switchSource(s); closeMenu(); } };
+        });
+        return { title: 'Select source', items: items, idx: 0 };
+    }
+
+    function subConfigMenu() {
+        return { title: 'Configure subtitles', idx: 0, items: [
+            { label: 'Language', run: function () { pushMenu(langMenu()); } },
+            { label: 'Size', run: function () { pushMenu(sizeMenu()); } },
+            { label: 'Style', run: function () { pushMenu(styleMenu()); } }
+        ] };
+    }
+
+    function langMenu() {
+        var items = [{ label: 'Off', sel: !_subOn, run: function () { subsOff(); closeMenu(); } }];
+        _subTracks.forEach(function (tr) {
+            items.push({ label: (tr.lang || 'unknown') + '  ·  ' + (tr._addon || ''),
+                sel: (_subOn && _subLabel === (tr.lang || 'on')),
+                run: function () { loadTrack(tr); closeMenu(); } });
+        });
+        return { title: 'Subtitle language', items: items, idx: 0 };
+    }
+
+    function optionMenu(title, key, opts) {
+        var cfg = getSubCfg();
+        var idx = 0;
+        var items = opts.map(function (p, i) {
+            if (cfg[key] === p[0]) { idx = i; }
+            return { label: p[1], sel: (cfg[key] === p[0]), run: function () {
+                var c = getSubCfg(); c[key] = p[0]; setSubCfg(c); applyStyleNow();
+                replaceTop(optionMenu(title, key, opts)); // refresh checkmark
+            } };
+        });
+        return { title: title, items: items, idx: idx };
+    }
+    function sizeMenu() {
+        return optionMenu('Subtitle size', 'size',
+            [['small', 'Small'], ['medium', 'Medium'], ['large', 'Large'], ['xlarge', 'Extra Large']]);
+    }
+    function styleMenu() {
+        return optionMenu('Subtitle style', 'style',
+            [['shadow', 'White + shadow'], ['box', 'White on black box'], ['yellow', 'Yellow']]);
+    }
 
     function menuKey(action) {
-        if (action === 'UP') { _menuIdx = Math.max(0, _menuIdx - 1); renderSubMenu(); return; }
-        if (action === 'DOWN') { _menuIdx = Math.min(_menuItems.length - 1, _menuIdx + 1); renderSubMenu(); return; }
-        if (action === 'OK') {
-            var it = _menuItems[_menuIdx];
-            if (!it || it.track === null) { subsOff(); } else { loadTrack(it.track); }
-            closeSubMenu();
-            return;
-        }
-        if (action === 'BACK' || action === 'STOP') { closeSubMenu(); return; }
+        var m = topMenu();
+        if (action === 'UP') { m.idx = Math.max(0, m.idx - 1); renderMenu(); return; }
+        if (action === 'DOWN') { m.idx = Math.min(m.items.length - 1, m.idx + 1); renderMenu(); return; }
+        if (action === 'OK') { var it = m.items[m.idx]; if (it && it.run) { it.run(); } return; }
+        if (action === 'LEFT' || action === 'BACK') { popMenu(); return; }
+        if (action === 'STOP') { closeMenu(); return; }
     }
 
     function handleKey(action) {
@@ -380,7 +444,7 @@ var Player = (function () {
             case 'PAUSE': if (useAV) { try { avplay.pause(); } catch (e) {} } else { videoEl.pause(); } return true;
             case 'RIGHT': case 'FF': seekBy(action === 'FF' ? 30 : 10); return true;
             case 'LEFT': case 'REW': seekBy(action === 'REW' ? -30 : -10); return true;
-            case 'UP': if (_subTracks.length) { openSubMenu(); } return true;
+            case 'UP': openMenu(); return true;
             case 'DOWN': showOSD(false); return true;
             case 'STOP': case 'BACK': exit(); return true;
         }
@@ -395,7 +459,7 @@ var Player = (function () {
         if (_osdTimer) { clearTimeout(_osdTimer); _osdTimer = null; }
         hideOSD();
         subsEl.className = 'hidden'; U.clear(subsEl);
-        subMenuEl.className = 'hidden'; _menuOpen = false;
+        subMenuEl.className = 'hidden'; _menuOpen = false; _menuStack = [];
         _subOn = false; _cues = null; _subTracks = [];
         if (useAV) {
             try { avplay.stop(); } catch (e) {}

package/js/stremio.js

@@ -112,6 +112,12 @@ var Stremio = (function () {
 
     // ---- Catalogs ----
     // Returns list of {addon, type, id, name} across all addons.
+    var TYPE_LABELS = { movie: 'Movies', series: 'Series', tv: 'Live TV', channel: 'Channels' };
+    function prettyType(t) {
+        if (TYPE_LABELS[t]) { return TYPE_LABELS[t]; }
+        return t ? (t.charAt(0).toUpperCase() + t.slice(1)) : '';
+    }
+
     function listCatalogs() {
         return loadAddons().then(function (addons) {
             var cats = [];
@@ -120,8 +126,10 @@ var Stremio = (function () {
                 cs.forEach(function (c) {
                     if (!c.type || !c.id) { return; }
                     var label = c.name || c.id;
+                    // Include the type so per-type catalogs sharing a name (e.g. Cinemeta's
+                    // "Popular" for both movie & series) don't look like duplicates.
                     cats.push({ addon: addon, type: c.type, id: c.id,
-                        name: label + ' · ' + (addon.manifest.name || 'Addon') });
+                        name: prettyType(c.type) + ' · ' + label + '  ·  ' + (addon.manifest.name || 'Addon') });
                 });
             });
             return cats;
@@ -272,12 +280,46 @@ var Stremio = (function () {
         return ('' + t).replace(/\n/g, ' ');
     }
 
+    // Short first-line label (quality / addon tag), e.g. "MediaFusion 2160p".
+    function streamName(stream) {
+        var t = stream.name || stream.title || stream.description || 'Source';
+        return ('' + t).split('\n')[0].trim();
+    }
+
+    function humanSize(bytes) {
+        if (!bytes || bytes <= 0) { return ''; }
+        var u = ['B', 'KB', 'MB', 'GB', 'TB'], i = 0, n = bytes;
+        while (n >= 1024 && i < u.length - 1) { n /= 1024; i++; }
+        return (n >= 10 ? Math.round(n) : n.toFixed(1)) + ' ' + u[i];
+    }
+
+    // File size from behaviorHints, or parsed from the title/description text.
+    function streamSize(stream) {
+        var b = stream.behaviorHints && stream.behaviorHints.videoSize;
+        if (b) { return humanSize(b); }
+        var txt = ('' + (stream.title || '') + ' ' + (stream.description || ''));
+        var m = txt.match(/(\d+(?:[.,]\d+)?)\s?(TB|GB|MB)\b/i);
+        return m ? (m[1].replace(',', '.') + ' ' + m[2].toUpperCase()) : '';
+    }
+
+    // The descriptive block (size, languages, seeds, etc. as the addon formats it).
+    // Kept multi-line so details like MediaFusion's language list survive.
+    function streamDescription(stream) {
+        var d = '' + (stream.description || stream.title || '');
+        if (!stream.name) {
+            var parts = d.split('\n');
+            if (parts.length > 1) { d = parts.slice(1).join('\n'); }
+        }
+        return d.trim();
+    }
+
     return {
         DEFAULT_ADDONS: DEFAULT_ADDONS,
         getAddonUrls: getAddonUrls, addAddon: addAddon, removeAddon: removeAddon, resetAddons: resetAddons,
         loadAddons: loadAddons, listCatalogs: listCatalogs, getCatalog: getCatalog,
         getMeta: getMeta, getStreams: getStreams, getSubtitles: getSubtitles,
         getSearchCatalogs: getSearchCatalogs, search: search,
-        isPlayable: isPlayable, streamLabel: streamLabel
+        isPlayable: isPlayable, streamLabel: streamLabel, streamName: streamName,
+        streamSize: streamSize, streamDescription: streamDescription
     };
 })();

package/js/views.js

@@ -62,16 +62,28 @@ var Views = (function () {
             var srch = U.el('div', 'gear focusable', '🔍');
             srch.style.marginRight = '24px';
             srch.__onselect = function () { App.openSearch(); };
+            srch.__navDOWN = focusFirstRowItem;
             h.appendChild(srch);
         }
         if (withGear) {
             var g = U.el('div', 'gear focusable', '⚙');
             g.__onselect = function () { App.openSettings(); };
+            g.__navDOWN = focusFirstRowItem;
             h.appendChild(g);
         }
         return h;
     }
 
+    // DOWN from the header lands on the first item of the first row
+    // (Continue Watching when present), not the geometrically-nearest card.
+    function focusFirstRowItem() {
+        var rows = scr('home').querySelector('.rows');
+        if (!rows) { return false; }
+        var first = rows.querySelector('.focusable');
+        if (first) { Focus.setFocus(first); return true; }
+        return false;
+    }
+
     function posterCard(meta, fallbackType) {
         var c = U.el('div', 'card focusable');
         var poster = meta.poster || '';
@@ -101,6 +113,13 @@ var Views = (function () {
         if (cont.length) {
             rows.appendChild(buildRow('Continue Watching', 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);
+                };
                 if (e.duration) {
                     var p = U.el('div', 'prog');
                     p.style.width = Math.min(100, (e.position / e.duration * 100)) + '%';
@@ -162,8 +181,8 @@ var Views = (function () {
     // ================= DETAIL =================
     var _d = null; // { type, id, meta, mode, season }
 
-    function renderDetail(type, id, preview) {
-        _d = { type: type, id: id, meta: null, mode: 'info', season: null, preview: preview || null };
+    function renderDetail(type, id, preview, target) {
+        _d = { type: type, id: id, meta: null, mode: 'info', season: null, preview: preview || null, target: target || null };
         var s = scr('detail');
         U.clear(s);
         s.appendChild(U.el('div', 'detail-hero'));
@@ -209,6 +228,13 @@ var Views = (function () {
         body.appendChild(U.el('div', 'detail-desc', meta.description || ''));
         s.appendChild(body);
 
+        // If resuming a series episode, pre-select its season.
+        if (_d.type === 'series' && _d.target && _d.season === null && meta.videos) {
+            var tv = meta.videos.find(function (v) { return v.id === _d.target; });
+            if (tv) { _d.season = (tv.season === undefined ? 1 : tv.season); }
+        }
+
+        _d._epFocus = null;
         if (_d.mode === 'streams') {
             body.appendChild(streamActionsBar());
             s.appendChild(streamsPanel());
@@ -217,7 +243,8 @@ var Views = (function () {
         } else {
             body.appendChild(movieActions());
         }
-        Focus.setScope(s);
+        Focus.setScope(s, _d._epFocus);
+        _d.target = null; // consume: don't re-jump after the user navigates
     }
 
     function movieActions() {
@@ -265,6 +292,7 @@ var Views = (function () {
             e.__onselect = function () {
                 openStreams(v.id, _d.meta.name + '  S' + _d.season + 'E' + (v.episode || ''));
             };
+            if (_d.target && v.id === _d.target) { _d._epFocus = e; }
             listScroll.appendChild(e);
         });
         panel.appendChild(listScroll);
@@ -310,21 +338,34 @@ var Views = (function () {
         _d.streams.forEach(function (stream) {
             var playable = Stremio.isPlayable(stream);
             var node = U.el('div', 'stream focusable');
-            node.appendChild(document.createTextNode(Stremio.streamLabel(stream)));
-            var why = '';
+            node.appendChild(document.createTextNode(Stremio.streamName(stream)));
+
+            // Detail block: size + the addon's own description (languages, seeds, etc.)
+            var lines = [];
+            var size = Stremio.streamSize(stream);
+            var desc = Stremio.streamDescription(stream);
+            if (size && !/(TB|GB|MB)\b/i.test(desc)) { lines.push('💾 ' + size); }
+            if (desc) { lines.push(desc); }
+            if (stream._addon) { lines.push('⚙️ ' + stream._addon); }
             if (!playable) {
-                if (stream.infoHash) { why = '  —  torrent, needs a debrid/torrent client'; }
-                else if (stream.externalUrl) { why = '  —  opens in an external app (not playable here)'; }
-                else { why = '  —  not directly playable on the TV'; }
+                if (stream.infoHash) { lines.push('— torrent, needs a debrid/torrent client'); }
+                else if (stream.externalUrl) { lines.push('— opens in an external app (not playable here)'); }
+                else { lines.push('— not directly playable on the TV'); }
             }
-            var sub = (stream._addon || '') + why;
-            node.appendChild(U.el('span', 's-sub', sub));
+            var sub = U.el('span', 's-sub', lines.join('\n'));
+            sub.style.whiteSpace = 'pre-line';
+            node.appendChild(sub);
             if (!playable) { node.style.opacity = '0.55'; }
             node.__onselect = function () {
                 if (!playable) { U.toast('This source can’t play directly on the TV.'); return; }
+                var sources = _d.streams.filter(Stremio.isPlayable).map(function (st) {
+                    var sz = Stremio.streamSize(st);
+                    return { url: st.url, label: (st._addon ? st._addon + '  ·  ' : '') + Stremio.streamName(st) + (sz ? '  ·  ' + sz : '') };
+                });
                 Player.play({
                     url: stream.url, type: _d.type, id: _d.streamId,
-                    name: _d.streamLabel || _d.meta.name, poster: _d.meta.poster
+                    name: _d.streamLabel || _d.meta.name, poster: _d.meta.poster,
+                    streams: sources
                 }, function () { drawDetail(); });
             };
             listScroll.appendChild(node);

package/package.json

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