stremiok 2.2.1 → 2.2.2

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 What changed in each version of StremioK, newest first. How everything works is in the
 [user guide](docs/USER-GUIDE.md).
 
+## 2.2.2 — 2026-10-28
+- **Torrents through a streaming server** (Settings › Content › Streaming server): with Stremio's
+  streaming server or a TorrServer running on your network (a computer or a NAS), torrent-only
+  sources play like any other. *Test* says whether it answers; torrents get longer to start (2
+  minutes by default).
+- **Seeders** in Source ranking: torrent sources with more people sharing them first.
+- **Zoom** (Settings › Appearance): 100% to 140%, everything bigger to read from further away;
+  subtitles keep their own size.
+- **Leaving StremioK:** BACK on Home's top menu asks *Exit StremioK?* (OK exits), instead of
+  pressing BACK twice (#3).
+- **The top menu scrolls** when its items don't all fit, the StremioK name staying at the right.
+- **IPTV Auto-refresh** (Settings › Content › IPTV, *Off* by default): every 1, 3, 6 or 12 hours,
+  your playlists and their TV guides are read again; never while something plays.
+- **Quicker switching:** subtitles (a track still coming isn't started over, the last 8 files
+  come back at once) and channels (what StremioK checks on each one stops when you move on).
+- **Diagnostics says what went wrong** (*Timed out after 20 s*, *No answer…*) instead of
+  "HTTP 0"; slow subtitle servers get longer: 20 seconds for a file, 15 for an addon's list.
+- **USB downloads:** a drive prepared with links can no longer make StremioK read or overwrite a
+  file outside it.
+- **Fixed:** your IPTV rows (and the Radio tab) missing from Home at start-up until a Reload; a
+  next episode or a hold menu whose details came late opening after you'd left.
+
 ## 2.2.1 — 2026-10-24
 - **Every language OpenSubtitles uses** (94, Indonesian among them, #1) for subtitles and audio:
   to pick as your default, second choice or second subtitle, listed by name, and each track

package/README.md

@@ -35,8 +35,9 @@ video through Samsung's AVPlay API.
 - **YouTube:** live channels, trailers, and your own YouTube channels, playlists and searches,
   with SponsorBlock, DeArrow, chapters and captions.
 - **Local:** the videos on a USB drive, matched to their titles.
+- **Torrents**, through Stremio's streaming server or a TorrServer you run on your network.
 - **Made for the remote:** D-pad navigation throughout; hold OK where an item has more to
-  offer (*Hold OK for more* says so).
+  offer (*Hold OK for more* says so); zoom up to 140% for reading from further away.
 
 ## Install
 
@@ -52,7 +53,8 @@ Three ways, all covered step by step in the **[installation guide](docs/INSTALL.
 
 1. **Addons:** add the addons you use, by link, or bring them in from your Stremio account,
    AIOManager or a configuration file. A stream addon that gives HTTP(S) links (for example
-   through a debrid service) is what makes titles playable.
+   through a debrid service), or a torrent addon with a streaming server you run, is what makes
+   titles playable.
 2. **API keys**, optional: your own TMDB, OMDb and MDBList keys add ratings, *Cast & more*,
    *where to watch* and episode trailers.
 3. **Trakt**, optional: connect your account to share watched marks and Continue Watching.
@@ -67,8 +69,8 @@ Three ways, all covered step by step in the **[installation guide](docs/INSTALL.
 This app hosts **no** media. It is a client for the open Stremio addon protocol: catalogs and
 metadata come from the addons you install (**Cinemeta**, the official one, by default), and
 playable sources come from whatever **stream addons you add yourself** in Settings. Streams
-that only expose a torrent `infoHash` (no HTTP URL) are listed but not playable: AVPlay needs
-a direct HTTP(S)/HLS/DASH URL, and this app embeds no torrent or debrid engine.
+that only expose a torrent `infoHash` play only through a streaming server you run (Stremio's
+or TorrServer): this app embeds no torrent or debrid engine.
 > **Note on WatchHub:** StremioK doesn't install it. Its answers say it's only for clients
 > Stremio authorizes in writing, and StremioK isn't one; "where to watch" comes from TMDB
 > instead (with a TMDB key). You can still add it yourself as a third-party addon (Settings
@@ -85,8 +87,7 @@ your progress, settings and copies that let it start faster (see
 ## Known limitations
 
 - AVPlay behavior varies by TV generation, codec and HLS provider.
-- No torrent playback: sources need a direct HTTP(S)/HLS/DASH URL (e.g. through a debrid
-  addon).
+- Torrents play only through a streaming server you run on your network.
 - Home rows show a catalog's first page (up to 30 titles); Discover pages through the rest.
 - No StremioK account and no profiles: settings, addons and progress stay on the TV. The
   only sync is optional: Trakt (watched marks, Continue Watching, ratings).

package/config.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets"
-        id="http://stremiok.tizen/StremioKTizen" version="2.2.1" viewmodes="maximized">
+        id="http://stremiok.tizen/StremioKTizen" version="2.2.2" viewmodes="maximized">
     <tizen:application id="StremioK01.StremioK" package="StremioK01" required_version="3.0"/>
     <content src="index.html"/>
     <feature name="http://tizen.org/feature/screen.size.all"/>

package/css/style.css

@@ -19,20 +19,20 @@ html, body {
 #av-player, #html5-player {
     position: absolute;
     top: 0; left: 0;
-    width: 1920px; height: 1080px;
+    width: 100%; height: 100%;   /* (the page: 1920×1080, or less under a zoom, scaled up) */
     background: #000;
     display: none;
     z-index: 1;
 }
 #av-player.active, #html5-player.active { display: block; }
 
-#app { position: absolute; top: 0; left: 0; width: 1920px; height: 1080px; z-index: 10; }
-.screen { position: absolute; top: 0; left: 0; width: 1920px; height: 1080px; }
+#app { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 10; }
+.screen { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
 .hidden { display: none !important; }
 
 /* --- Header --- */
 .header { height: 96px; padding: 30px 60px 0 60px; display: flex; align-items: center; }
-.brand { font-size: 40px; font-weight: bold; color: #818cf8; letter-spacing: 1px; }
+.brand { font-size: 40px; font-weight: bold; color: #818cf8; letter-spacing: 1px; flex-shrink: 0; }
 .brand .dot { color: #e6e9ef; }
 /* private viewing on: StremioK as an outline (the fill hidden; the outline takes each letter's
    own color, so it follows the accent color and a light background) */
@@ -94,7 +94,7 @@ html, body {
 .detail-hero .shade { position: absolute; top: 0; left: 0; right: 0; bottom: 0; background: linear-gradient(90deg, rgba(14,17,23,0.96) 30%, rgba(14,17,23,0.35) 100%), linear-gradient(0deg, #0e1117 4%, transparent 40%); }
 /* The source and episode lists: the backdrop over the whole screen, shaded lighter, the rows
    see-through (a focused one stays solid) */
-.detail-hero.hero-full { height: 1080px; }
+.detail-hero.hero-full { height: 100%; }
 .detail-hero.hero-full .shade { background: linear-gradient(90deg, rgba(14,17,23,0.9) 22%, rgba(14,17,23,0.4) 100%), linear-gradient(0deg, rgba(14,17,23,0.5) 0%, transparent 45%); }
 .streams-panel .stream, .list-panel .ep { background: rgba(22,27,38,0.7); }
 .streams-panel .stream-group, .streams-panel .stream-for, .streams-panel .streams-hidden { text-shadow: 0 1px 3px #000, 0 0 8px rgba(0,0,0,0.6); }
@@ -319,7 +319,7 @@ html, body {
 .card.landscape { width: 340px; height: 200px; }
 
 /* --- Confirm modal --- */
-.modal-overlay { position: absolute; top: 0; left: 0; width: 1920px; height: 1080px; z-index: 45; background: rgba(0,0,0,0.72); display: flex; align-items: center; justify-content: center; }
+.modal-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 45; background: rgba(0,0,0,0.72); display: flex; align-items: center; justify-content: center; }
 .modal-box { width: 820px; background: #161b26; border: 2px solid #2a3346; border-radius: 16px; padding: 44px 48px; text-align: center; }
 .modal-msg { font-size: 30px; line-height: 1.4; color: #e6e9ef; margin-bottom: 36px; }
 .modal-row { display: flex; justify-content: center; }
@@ -365,7 +365,7 @@ html, body {
 /* --- Toast + spinner --- */
 #hold-hint { position: absolute; right: 36px; bottom: 20px; z-index: 20; font-size: 17px; color: #c7cbd4; background: rgba(0,0,0,0.6); padding: 6px 14px; border-radius: 16px; pointer-events: none; }
 #toast { position: absolute; bottom: 60px; left: 50%; margin-left: -300px; width: 600px; text-align: center; z-index: 40; background: rgba(0,0,0,0.85); padding: 18px 24px; border-radius: 10px; font-size: 22px; }
-#spinner { position: absolute; top: 0; left: 0; width: 1920px; height: 1080px; z-index: 50; display: flex; flex-direction: column; align-items: center; justify-content: center; background: rgba(0,0,0,0.3); }
+#spinner { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 50; display: flex; flex-direction: column; align-items: center; justify-content: center; background: rgba(0,0,0,0.3); }
 /* status line under the spinner ("Opening stream at 1080p…"); empty when unused */
 #spinner-msg { margin-top: 26px; font-size: 28px; color: #fff; text-shadow: 0 2px 6px #000; text-align: center; }
 .spin { width: 70px; height: 70px; border: 7px solid rgba(255,255,255,0.2); border-top-color: #818cf8; border-radius: 50%; -webkit-animation: sp 0.9s linear infinite; animation: sp 0.9s linear infinite; }
@@ -373,7 +373,10 @@ html, body {
 @keyframes sp { to { transform: rotate(360deg); } }
 
 /* Home top row: tab pills + Search + Settings on the left, StremioK logo on the right */
-.home-header .tabbar-inline { display: flex; align-items: center; }
+/* the items scroll sideways in their strip when they don't all fit (position: the items' offsets are the strip's) */
+.home-header .menu-scroll { flex: 1 1 auto; min-width: 0; overflow: hidden; position: relative; display: flex; align-items: center; margin-right: 24px; padding: 4px 0; }
+.home-header .tabbar-inline { display: flex; align-items: center; flex-shrink: 0; }
+.home-header .menu-scroll > .hchip { flex-shrink: 0; }
 .tab-pill { display: inline-flex; align-items: center; font-size: 22px; padding: 8px 9px; margin-right: 5px; border-radius: 28px; background: #1a1f2b; color: #aeb6c4; border: 4px solid transparent; white-space: nowrap; }
 .tab-ic { margin-left: 6px; font-size: 22px; }
 .tab-pill.active { background: #2a3346; color: #fff; }

package/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=1920, height=1080, user-scalable=no">
     <title>StremioK</title>
-    <link rel="stylesheet" href="css/style.css?v=2.2.1">
+    <link rel="stylesheet" href="css/style.css?v=2.2.2">
 </head>
 <body>
     <!-- CSS-applied sentinel (kept off-screen); app.js waits for its width before rendering -->
@@ -53,37 +53,37 @@
 
     <!-- Load order matters: polyfills -> util -> iptv -> data -> input -> tvapps -> player parts -> player -> ytplay -> view parts -> views -> app -->
     <!-- ?v= busts the TV webview cache on every release (keep in sync with package.json) -->
-    <script src="js/polyfills.js?v=2.2.1"></script>
-    <script src="js/util.js?v=2.2.1"></script>
-    <script src="js/iptv.js?v=2.2.1"></script>
-    <script src="js/epg.js?v=2.2.1"></script>
-    <script src="js/youtube.js?v=2.2.1"></script>
-    <script src="js/stremio.js?v=2.2.1"></script>
-    <script src="js/trakt.js?v=2.2.1"></script>
-    <script src="js/keys.js?v=2.2.1"></script>
-    <script src="js/focus.js?v=2.2.1"></script>
-    <script src="js/tvapps.js?v=2.2.1"></script>
-    <script src="js/player-core.js?v=2.2.1"></script>
-    <script src="js/player-store.js?v=2.2.1"></script>
-    <script src="js/player-lang.js?v=2.2.1"></script>
-    <script src="js/player-quality.js?v=2.2.1"></script>
-    <script src="js/player-subs.js?v=2.2.1"></script>
-    <script src="js/player-audio.js?v=2.2.1"></script>
-    <script src="js/player-controls.js?v=2.2.1"></script>
-    <script src="js/player.js?v=2.2.1"></script>
-    <script src="js/ytplay.js?v=2.2.1"></script>
-    <script src="js/local.js?v=2.2.1"></script>
-    <script src="js/downloads.js?v=2.2.1"></script>
-    <script src="js/stremio-account.js?v=2.2.1"></script>
-    <script src="js/view-core.js?v=2.2.1"></script>
-    <script src="js/view-home.js?v=2.2.1"></script>
-    <script src="js/view-guide.js?v=2.2.1"></script>
-    <script src="js/view-detail.js?v=2.2.1"></script>
-    <script src="js/view-search.js?v=2.2.1"></script>
-    <script src="js/view-settings.js?v=2.2.1"></script>
-    <script src="js/view-discover.js?v=2.2.1"></script>
-    <script src="js/views.js?v=2.2.1"></script>
-    <script src="js/app.js?v=2.2.1"></script>
-    <script src="js/hubpreview.js?v=2.2.1"></script>
+    <script src="js/polyfills.js?v=2.2.2"></script>
+    <script src="js/util.js?v=2.2.2"></script>
+    <script src="js/iptv.js?v=2.2.2"></script>
+    <script src="js/epg.js?v=2.2.2"></script>
+    <script src="js/youtube.js?v=2.2.2"></script>
+    <script src="js/stremio.js?v=2.2.2"></script>
+    <script src="js/trakt.js?v=2.2.2"></script>
+    <script src="js/keys.js?v=2.2.2"></script>
+    <script src="js/focus.js?v=2.2.2"></script>
+    <script src="js/tvapps.js?v=2.2.2"></script>
+    <script src="js/player-core.js?v=2.2.2"></script>
+    <script src="js/player-store.js?v=2.2.2"></script>
+    <script src="js/player-lang.js?v=2.2.2"></script>
+    <script src="js/player-quality.js?v=2.2.2"></script>
+    <script src="js/player-subs.js?v=2.2.2"></script>
+    <script src="js/player-audio.js?v=2.2.2"></script>
+    <script src="js/player-controls.js?v=2.2.2"></script>
+    <script src="js/player.js?v=2.2.2"></script>
+    <script src="js/ytplay.js?v=2.2.2"></script>
+    <script src="js/local.js?v=2.2.2"></script>
+    <script src="js/downloads.js?v=2.2.2"></script>
+    <script src="js/stremio-account.js?v=2.2.2"></script>
+    <script src="js/view-core.js?v=2.2.2"></script>
+    <script src="js/view-home.js?v=2.2.2"></script>
+    <script src="js/view-guide.js?v=2.2.2"></script>
+    <script src="js/view-detail.js?v=2.2.2"></script>
+    <script src="js/view-search.js?v=2.2.2"></script>
+    <script src="js/view-settings.js?v=2.2.2"></script>
+    <script src="js/view-discover.js?v=2.2.2"></script>
+    <script src="js/views.js?v=2.2.2"></script>
+    <script src="js/app.js?v=2.2.2"></script>
+    <script src="js/hubpreview.js?v=2.2.2"></script>
 </body>
 </html>

package/js/app.js

@@ -5,7 +5,6 @@ var App = (function () {
     var _current = 'home';
     var _stack = [];   // frames: { screen, focus }
     var _lastBackAt = 0;   // debounce BACK across keydown + tizenhwkey
-    var _exitArmedAt = 0;  // double-Back-to-exit guard on the home root
 
     function screenEl(name) { return U.byId('screen-' + name); }
 
@@ -121,8 +120,8 @@ var App = (function () {
     }
 
     // On a main page (Home's tabs, Discover, Search, Settings), BACK goes to the top menu first
-    // (its current item; DOWN comes back), and from there does what it did: the page before,
-    // or "Press Back again to exit" on Home. Also a way out if focus is ever lost on a page.
+    // (its current item; DOWN comes back), and from there to the page before, or (nothing
+    // before: Home) asks "Exit StremioK?". Also a way out if focus is ever lost on a page.
     var MAIN_SCREENS = { home: 1, discover: 1, search: 1, settings: 1 };
     function toTopMenu() {
         if (!MAIN_SCREENS[_current]) { return false; }
@@ -145,7 +144,7 @@ var App = (function () {
         if (_current === 'home' && Views.backInLocal && Views.backInLocal()) { return; }   // (the Local tab: up a folder)
         if (toTopMenu()) { return; }
         var f = _stack.pop();
-        if (!f) { tryExitApp(); return; }
+        if (!f) { askExit(); return; }
         if (f.screen !== _current) { abandon(_current); }
         showScreen(f.screen);
         if (f.detail) { Views.restoreDetail(f.detail); return; }   // the previous title / person page
@@ -158,21 +157,21 @@ var App = (function () {
         }
     }
 
-    // Require a deliberate double-Back from the home root to exit, so a single stray
-    // Back (e.g. left over from closing the player) can never close the app by accident.
-    function tryExitApp() {
-        var now = Date.now();
-        if (now - _exitArmedAt < 3000) {
-            try {
-                if (window.tizen && tizen.application) {
-                    U.sessionState('exit');
-                    tizen.application.getCurrentApplication().exit();
-                    return;
-                }
-            } catch (e) {}
-        }
-        _exitArmedAt = now;
-        U.toast('Press Back again to exit', 3000);
+    // Asked, so a stray BACK (one left over from closing the player) never closes the app; focus
+    // starts on Exit, so BACK, OK leaves.
+    function askExit() { Views.confirm('Exit StremioK?', 'Exit', exitApp, { plain: true, focusYes: true }); }
+    // The TV's own exit where StremioK has it (the sideloaded app). A TizenBrew module's page
+    // doesn't get it: the window closed instead, and if it's still open, the TV's way said.
+    function exitApp() {
+        U.sessionState('exit');
+        try {
+            if (window.tizen && tizen.application) { tizen.application.getCurrentApplication().exit(); return; }
+        } catch (e) { U.log('app', 'Exit: the TV\'s exit failed (' + e.message + ')'); }
+        try { window.close(); } catch (e2) {}
+        setTimeout(function () {
+            U.log('app', 'Exit: still open after closing the window (' + (typeof YTPlay !== 'undefined' && YTPlay.installMode ? YTPlay.installMode() : '?') + ')');
+            U.toast('Hold BACK to close StremioK', 4000);
+        }, 500);
     }
 
     function onKey(action) {

package/js/focus.js

@@ -42,7 +42,7 @@ var Focus = (function () {
     // Scrolls each overflowing box around the node so it's in view, with a margin. A box
     // marked __noScroll only clips (a page's text block): it never moves.
     function ensureVisible(node) {
-        var p = node.parentNode;
+        var p = node.parentNode, z = (typeof U !== 'undefined' && U.zoom) ? U.zoom() : 1;   // (rects are on screen, zoomed; scrolling isn't)
         while (p && p.nodeType === 1 && p !== document.body) {
             var canX = !p.__noScroll && p.scrollWidth > p.clientWidth + 2;
             var canY = !p.__noScroll && p.scrollHeight > p.clientHeight + 2;
@@ -51,13 +51,13 @@ var Focus = (function () {
                 var nr = node.getBoundingClientRect();
                 if (canX) {
                     var mx = 90;
-                    if (nr.left < pr.left + mx) { p.scrollLeft -= (pr.left + mx - nr.left); }
-                    else if (nr.right > pr.right - mx) { p.scrollLeft += (nr.right - (pr.right - mx)); }
+                    if (nr.left < pr.left + mx) { p.scrollLeft -= (pr.left + mx - nr.left) / z; }
+                    else if (nr.right > pr.right - mx) { p.scrollLeft += (nr.right - (pr.right - mx)) / z; }
                 }
                 if (canY) {
                     var my = 70;
-                    if (nr.top < pr.top + my) { p.scrollTop -= (pr.top + my - nr.top); }
-                    else if (nr.bottom > pr.bottom - my) { p.scrollTop += (nr.bottom - (pr.bottom - my)); }
+                    if (nr.top < pr.top + my) { p.scrollTop -= (pr.top + my - nr.top) / z; }
+                    else if (nr.bottom > pr.bottom - my) { p.scrollTop += (nr.bottom - (pr.bottom - my)) / z; }
                 }
             }
             p = p.parentNode;

package/js/iptv.js

@@ -467,7 +467,7 @@ var IPTV = (function () {
                 var msg = (e && e.message) ? e.message : 'Could not fetch the playlist URL';
                 // status 0 / network error on a URL that opens fine in a browser almost
                 // always means the server sent no Access-Control-Allow-Origin header.
-                if (/HTTP 0\b/.test(msg) || /Network error/i.test(msg)) {
+                if (/HTTP 0\b/.test(msg) || /Network error|^No answer/i.test(msg)) {
                     msg += ' — the playlist server likely isn\'t sending an ' +
                         'Access-Control-Allow-Origin header (CORS). Serve the .m3u with CORS enabled.';
                 }
@@ -544,6 +544,19 @@ var IPTV = (function () {
             return d;
         });
     }
+    // Auto-refresh (Settings › Content › IPTV): every this many hours (0: Off), all playlists and
+    // their guides downloaded again, as Reload does (the Home ticker: see view-home's
+    // iptvRefreshTick). EVERY: the choices.
+    var EVERY_KEY = 'stremiok.iptv.every', EVERY = [0, 1, 3, 6, 12];
+    function refreshEvery() { var h = +U.store.get(EVERY_KEY, 0); return EVERY.indexOf(h) !== -1 ? h : 0; }
+    function setRefreshEvery(h) { h = +h; U.store.set(EVERY_KEY, EVERY.indexOf(h) !== -1 ? h : 0); }
+    // When the playlists switched on were last downloaded: the oldest of them (a saved copy's own
+    // date), 0 when one never was.
+    function readAt() {
+        var on = getPlaylists().filter(function (p) { return !p.off; }), t = Infinity;
+        on.forEach(function (p) { var st = _status[p.id]; t = Math.min(t, st && st.fetchedAt ? st.fetchedAt : 0); });
+        return on.length ? t : Infinity;
+    }
     function status(id) {
         if (id) { return _status[id] || { id: id, url: '', count: 0, groups: 0, error: '', title: '', fetchedAt: 0 }; }
         return _status;
@@ -649,7 +662,7 @@ var IPTV = (function () {
         removePlaylist: removePlaylist, renamePlaylist: renamePlaylist, setPlaylistOff: setPlaylistOff,
         movePlaylist: movePlaylist, setPlaylistGuide: setPlaylistGuide, label: labelOf,
         xtreamParts: xtreamParts, xtreamUrl: xtreamUrl, xtreamCheck: xtreamCheck, addXtream: addXtream, xtreamFormat: xtreamFormat, setXtreamFormat: setXtreamFormat,
-        isFavorite: isFavorite, setFavorite: setFavorite,
+        isFavorite: isFavorite, setFavorite: setFavorite, refreshEvery: refreshEvery, setRefreshEvery: setRefreshEvery, readAt: readAt,
         channels: function () { return _cache ? _cache.channels : []; }, channel: function (id) { return _cache ? _cache.byId[id] || null : null; }, isEnabled: isEnabled, reset: reset, status: status,
         load: load, reload: reload, catalog: catalog, meta: meta, streams: streams, synthAddon: synthAddon, isReady: isReady,
         onProgress: onProgress

package/js/player-core.js

@@ -178,12 +178,20 @@ var PlayerParts = {};
         } else {
             all[k] = { id: S.ctx.id, type: S.ctx.type, name: S.ctx.name, poster: S.ctx.poster, background: S.ctx.background, parent: S.ctx.parent,
                        position: Math.floor(S.cur), duration: Math.floor(S.dur), updated: Date.now(),
-                       url: S.ctx.yt || S.ctx.url, headers: S.ctx._headers,   // the exact stream, to resume it directly (YouTube: its page)
+                       url: S.ctx.yt || savedUrl(S.ctx), headers: S.ctx._headers,   // the exact stream, to resume it directly (YouTube: its page)
+                       torrent: torrentOf(S.ctx.stream),   // (through a streaming server: its link made again from the one set then)
                        fileHints: (P.fileHints && P.fileHints(S.ctx.subExtra)) || undefined,   // (its file, for subtitles made for it)
                        added: added || undefined };
         }
         writeProgress(all);
     }
+    // What's saved to resume: a converted playback's own link (not the server's conversion), and a
+    // torrent's infoHash, file and trackers (its link depends on the server set when it resumes).
+    function savedUrl(ctx) { return (ctx._convertedFrom && /\/hlsv2\//.test(ctx.url || '')) ? ctx._convertedFrom : ctx.url; }
+    function torrentOf(st) {
+        if (!st || !st._torrent) { return undefined; }
+        return { infoHash: st.infoHash, fileIdx: st.fileIdx, sources: Array.isArray(st.sources) ? st.sources.slice(0, 20) : undefined };
+    }
 
     // ---------- OSD ----------
     // Subtitles move up above the progress bar while it's on screen (above the UP bar too,
@@ -400,7 +408,7 @@ var PlayerParts = {};
         ctx.localSubs = s.localSubs; ctx.localFile = s.localFile; ctx.subExtra = s.subExtra; ctx.sourceSubs = s.sourceSubs;
         ctx.formatInfo = (s.stream && typeof Stremio !== 'undefined' && Stremio.streamInfo) ? Stremio.streamInfo(s.stream) : undefined;
         ctx.stream = s.stream;   // (the addon's source: ⬇ Download, player-controls)
-        var learn = (old.learnFor && s.stream) ? old.learnFor(s.stream) : {};
+        var learn = (old.learnFor && s.stream) ? old.learnFor(s.stream, { converted: !!s.converted }) : {};   // (converted: not what the TV plays itself)
         ctx.onStarted = learn.onStarted; ctx.onFailed = learn.onFailed;
         ctx.resumeSec = keep ? old.resumeSec : (S.isLive ? 0 : S.cur);
         if (keep) { ctx.fromStart = old.fromStart; }
@@ -414,6 +422,8 @@ var PlayerParts = {};
         // Replacing a YouTube stream that's playing (CH+/CH− to the next channel): the TV's
         // player can freeze on an open straight after closing it, so settle first (startAV).
         var settle = !!(S.active && S.ctx && S.ctx.yt);
+        if (S.ctx !== ctx) { stopLiveLook(); }   // (another channel: the look at the one before stopped)
+        stopFileLook();
         S.ctx = ctx; _onExit = onExit;
         // (private viewing, a link played as it is, or one started from a private playback —
         // a video followed from it, another source: nothing recorded, see player-store)
@@ -445,7 +455,27 @@ var PlayerParts = {};
         renderOSD();   // show the NEW title immediately (not the previous item's)
         U.spinner(true, ctx.switching ? 'Switching source…' : ctx.initialQualityHeight ? 'Opening stream at ' + ctx.initialQualityHeight + 'p…' : 'Opening stream…');
 
-        if (useAV) { startLive(ctx, settle); } else { startHTML5(ctx.url); }
+        // (a TorrServer torrent that doesn't say which of its files: its file list asked for first)
+        var go = function () { if (useAV) { startLive(ctx, settle); } else { startHTML5(ctx.url); } };
+        if (ctx.stream && ctx.stream._pickFile && typeof Stremio !== 'undefined' && Stremio.torrentFile) {
+            // (the source before stopped first: its callbacks are about it, not this one)
+            ++_playToken; _openedAt = 0;
+            if (useAV) { try { avplay.stop(); } catch (e0) {} try { avplay.close(); } catch (e1) {} }
+            else if (S.videoEl) { try { S.videoEl.pause(); S.videoEl.removeAttribute('src'); } catch (e2) {} }
+            U.spinner(true, 'Asking your streaming server for the torrent’s files…');
+            var ep = /:(\d+):(\d+)$/.exec(ctx.id || ''), look = _fileLook = U.cancelToken();
+            Stremio.torrentFile(ctx.stream, ep ? +ep[1] : 0, ep ? +ep[2] : 0, look).then(function (url) {
+                if (look.cancelled || S.ctx !== ctx || !S.active) { return; }
+                _fileLook = null;
+                if (url) { ctx.url = url; go(); return; }
+                var why = 'The torrent has no file for S' + ep[1] + 'E' + ep[2];   // (another episode isn't played in its place)
+                U.log('player', why);
+                U.spinner(false);
+                if (nextSourceOnFail({ text: why })) { return; }
+                U.toast(why + '. Try another source.', 6000);
+                exitLater();
+            });
+        } else { go(); }
 
         // A YouTube video (not a live channel): its audio languages and its links (end screen,
         // cards) from the service, for the menu and the overlays (player-quality / -controls).
@@ -660,7 +690,7 @@ var PlayerParts = {};
             });
             try { avplay.setStreamingProperty('ADAPTIVE_INFO', adaptiveInfo()); } catch (e0) {}
             _openedAt = Date.now();
-            setTimeout(startCheck, AV_START_MS + 500);
+            setTimeout(startCheck, startMs() + 500);
             avplay.prepareAsync(function () {
                 if (!S.active || token !== _playToken) { return; }
                 U.spinner(false);
@@ -1022,6 +1052,21 @@ var PlayerParts = {};
         U.spinner(true, msg); U.toast(msg, notice ? 7000 : 4000);
         return true;
     }
+    // With Stremio's streaming server (Settings › Content › Streaming server, Convert on): a source
+    // the TV refused is tried once more, converted by the server, before the next source. Once a
+    // playback (the next sources aren't). Not a source that needs its own request headers.
+    function convertOnFail() {
+        var c = S.ctx;
+        if (!c || !S.active || S.playing || S.isLive || c.trailer || c.yt || c.localFile || !c.stream || c._converted || c._headers) { return false; }
+        var u = (typeof Stremio !== 'undefined' && Stremio.convertUrl) ? Stremio.convertUrl(c.url) : null;
+        if (!u) { return false; }
+        c._converted = true; c._convertedFrom = c.url;   // (kept by what replaces it: Continue Watching saves its own link)
+        var msg = 'Didn’t start: converting it on your streaming server…';
+        U.log('player', 'Source didn’t start: converting it on the streaming server');
+        replaceSource({ url: u, stream: c.stream, subExtra: c.subExtra, sourceSubs: c.sourceSubs, localSubs: c.localSubs, converted: true }, true);
+        U.spinner(true, msg); U.toast(msg, 5000);
+        return true;
+    }
     // A start that failed: is the link a debrid addon's notice video (Torrentio's failed_access,
     // limits_exceeded…: noticeOf)? Then that's said, and for the account's ones the next source
     // skips the addon's links through that service; then the next source, or what's to say.
@@ -1033,6 +1078,7 @@ var PlayerParts = {};
                 U.log('player', 'The source sent a notice: ' + notice.kind + (notice.service ? ' (' + notice.service + ')' : ''));
                 if (notice.account && notice.tag) { c._avoid = (c._avoid || []).concat([{ addon: st._addon, tag: notice.tag }]); }
             }
+            if (!notice && convertOnFail()) { return; }
             if (nextSourceOnFail(notice)) { return; }
             U.toast(notice ? notice.text : why, notice ? 8000 : undefined);
             exitLater();
@@ -1072,15 +1118,21 @@ var PlayerParts = {};
         return n;
     }
     // Not playing after AV_START_MS (no answer from the server, or opened and nothing shown): the
-    // next source when there's one; else it stops and says so (not while you've paused it).
+    // next source when there's one; else it stops and says so (not while you've paused it). A
+    // torrent through a streaming server has longer (Settings › Content › Streaming server: finding
+    // people sharing it takes a while).
+    function startMs() {
+        var st = S.ctx && S.ctx.stream;
+        return (st && st._torrent && typeof Stremio !== 'undefined' && Stremio.server) ? Stremio.server().wait * 1000 : AV_START_MS;
+    }
     function startCheck() {
-        if (!S.active || S.playing || !useAV || !_openedAt || Date.now() - _openedAt < AV_START_MS) { return; }
+        if (!S.active || S.playing || !useAV || !_openedAt || Date.now() - _openedAt < startMs()) { return; }
         if (_reco.tries) { liveDropped('Couldn’t reconnect'); return; }   // (a reconnect's try: the next one)
         if (nextSourceOnFail()) { return; }
         if (S.playStarted && isPaused()) { return; }
-        U.log('player', 'Didn’t start: nothing played in ' + (AV_START_MS / 1000) + ' s (' + where(S.ctx && S.ctx.url) + ')');
+        U.log('player', 'Didn’t start: nothing played in ' + (startMs() / 1000) + ' s (' + where(S.ctx && S.ctx.url) + ')');
         U.spinner(false);
-        U.toast('Didn’t start: nothing played in ' + (AV_START_MS / 1000) + ' seconds. Try another source.', 6000);
+        U.toast('Didn’t start: nothing played in ' + (startMs() / 1000) + ' seconds. Try another source.', 6000);
         exitLater();
     }
     P.startCheck = startCheck;
@@ -1147,6 +1199,12 @@ var PlayerParts = {};
             startAV(ctx.url, settle);
         }, function () { if (S.ctx === ctx && S.active) { startAV(ctx.url, settle); } });
     }
+    // The look under way (_liveLook, a cancel token): stopped when another channel starts or the
+    // player closes (stopLiveLook), the service's downloads for it with it.
+    var _fileLook = null;   // (TorrServer's file list asked for: see play)
+    function stopFileLook() { if (_fileLook) { _fileLook.cancel(); _fileLook = null; } }
+    var _liveLook = null;
+    function stopLiveLook() { if (_liveLook) { _liveLook.cancel(); _liveLook = null; } }
     function liveCheck() {
         var ctx = S.ctx;
         if (!ctx || ctx._liveChecked || !liveFixable(ctx)) { return; }
@@ -1154,7 +1212,10 @@ var PlayerParts = {};
         var known = liveKnown(ctx.url);
         if (known && ccOf(known)) { return; }
         var url = ctx.url;
-        YTPlay.liveOpen(url, ctx._headers, false).then(function (r) {
+        stopLiveLook();
+        var look = _liveLook = U.cancelToken();
+        YTPlay.liveOpen(url, ctx._headers, false, null, look).then(function (r) {
+            if (_liveLook === look) { _liveLook = null; }
             if (!r || !r.sure) { return; }   // (couldn't tell: asked again next time)
             var cc = (r.ccSure || r.cc === undefined) ? (ccOf(r) || []) : null, fix = known ? !!known.fix : !!r.fix;   // (captions with no text yet: asked again next time; the sound's answer: as first found)
             liveKeep(url, fix, cc);
@@ -1278,6 +1339,7 @@ var PlayerParts = {};
 
     function exit() {
         if (!S.active) { return; }
+        stopLiveLook(); stopFileLook();
         if (U.crumb) { U.crumb('player closed'); }
         if (P.sleepClear) { P.sleepClear(); }   // (the sleep timer: this playback's)
         saveProgress();

package/js/player-store.js

@@ -130,14 +130,14 @@
     var SIZE_PX = { small: 28, medium: 36, large: 46, xlarge: 58 };
     function styleSpan(span) {
         var cfg = getSubCfg();
-        span.style.fontSize = (SIZE_PX[cfg.size] || 36) + 'px';
+        span.style.fontSize = (SIZE_PX[cfg.size] || 36) / U.zoom() + 'px';   // (their own size, whatever the zoom)
         span.style.fontFamily = subFontFamily(cfg.font);
         span.style.color = pick3(SUB_COLORS, cfg.color)[2];
         span.style.background = pick3(SUB_BGS, cfg.bg)[2];
         span.style.textShadow = pick3(SUB_EDGES, cfg.edge)[2];
         if (span.parentNode) { span.parentNode.style.bottom = Math.max(subsPosPx(), (P.S && P.S.subsLift) || 0) + 'px'; }   // (raised over the progress bar: core's liftSubs)
     }
-    function subsPosPx() { return pick3(SUB_POSITIONS, getSubCfg().pos)[2]; }
+    function subsPosPx() { return pick3(SUB_POSITIONS, getSubCfg().pos)[2] / U.zoom(); }
 
     // ---------- progress (Continue Watching) ----------
     function progressAll() { return U.store.get(PROGRESS_KEY, {}); }