v17.4.3

- The automatic selection of the channel list in the "Live" section is now more dynamic. - List all channels at once by just typing * or "." in search.
EdenwareApps · Feb 16, 2024 · 8bb718b · 8bb718b
1 parent c1d1da1
commit 8bb718b
Show file tree

Hide file tree

Showing 13 changed files with 208 additions and 142 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="456" id="tv.megacubo.app" version="17.4.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="456" id="tv.megacubo.app" version="17.4.3" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Megacubo</name>
     <description>
         An intuitive, free and open source IPTV player.
@@ -65,7 +65,7 @@
         <preference name="AndroidXEnabled" value="true" />
         <preference name="AndroidWindowSplashScreenAnimatedIcon" value="resources/android/icon/drawable-xxxhdpi-icon.png" />
         <preference name="AndroidWindowSplashScreenBackground" value="#362064" />
-        <preference name="OverrideUserAgent" value="Megacubo 17.4.2" />
+        <preference name="OverrideUserAgent" value="Megacubo 17.4.3" />
         <icon src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon background="@color/background" density="ldpi" foreground="resources/android/icon/ldpi-foreground.png" qualifier="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
         <icon background="@color/background" density="mdpi" foreground="resources/android/icon/mdpi-foreground.png" qualifier="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "megacubo",
   "displayName": "Megacubo",
-  "version": "17.4.2",
+  "version": "17.4.3",
   "description": "A intuitive and multi-language IPTV player.",
   "repository": {
     "type": "git",

diff --git a/www/nodejs-project/modules/channels/channels.js b/www/nodejs-project/modules/channels/channels.js
diff --git a/www/nodejs-project/modules/discovery/providers/community-lists.js b/www/nodejs-project/modules/discovery/providers/community-lists.js
@@ -69,14 +69,14 @@ class CommunityLists {
                 fa: 'fas fa-satellite-dish',
                 type: 'group',
                 class: 'skip-testing',
-                renderer: global.lists.directListRenderer.bind(global.lists)
+                renderer: global.lists.manager.directListRenderer.bind(global.lists.manager)
             }
         }).filter(l => l)
         if(!entries.length){
             if(!global.lists.loaded()){
-                entries = [global.lists.updatingListsEntry()]
+                entries = [global.lists.manager.updatingListsEntry()]
             } else {
-                entries = [global.lists.noListsRetryEntry()]
+                entries = [global.lists.manager.noListsRetryEntry()]
             }
         }
         return entries

diff --git a/www/nodejs-project/modules/discovery/providers/public-lists.js b/www/nodejs-project/modules/discovery/providers/public-lists.js
@@ -46,9 +46,14 @@ class PublicLists extends Events {
             }))
         }
     }
-    async entries(){
+    async entries(local){
         await this.ready()
-        let entries = Object.keys(this.data).map(countryCode => {
+        let entries = Object.keys(this.data)
+        if(local === true) {
+            let locs = await global.lang.getActiveCountries(0).catch(console.error)
+            entries = entries.filter(e => locs.includes(e))
+        }
+        entries = entries.map(countryCode => {
             return {
                 name: this.countries.getCountryName(countryCode, global.lang.locale),
                 type: 'group',

diff --git a/www/nodejs-project/modules/lists/common.js b/www/nodejs-project/modules/lists/common.js
@@ -93,7 +93,7 @@ class Common extends Events {
 		this.sanitizeName = sanitizeName
 		this.Fetcher = Fetcher
 		this.searchRedirects = []
-		this.stopWords = ['sd', 'hd', 'h264', 'h.264', 'fhd'] // common words to ignore on searching
+		this.stopWords = ['sd', '4k', 'hd', 'h264', 'h.264', 'fhd', 'uhd'] // common words to ignore on searching
 		this.listMetaKeyPrefix = 'meta-cache-'
 		this.opts = {
 			defaultCommunityModeReach: 12,

diff --git a/www/nodejs-project/modules/lists/index.js b/www/nodejs-project/modules/lists/index.js
@@ -63,7 +63,7 @@ class Index extends Common {
 					aterms.push(term)
 				}
 			})
-			let needles = aterms.join(' ').split(' | ').map(s => s.split(' '))
+			const needles = aterms.join(' ').split(' | ').map(s => s.replaceAll('|', '').split(' '))
 			return {
 				excludes,
 				queries: needles.map(nterms => {
@@ -450,9 +450,13 @@ class Index extends Common {
 	cloneMap(a){
 		return global.deepClone(a)
 	}
-	async groups(types){
+	async groups(types, myListsOnly){
 		let groups = [], map = {}
+		if(myListsOnly) {
+			myListsOnly = global.config.get('lists').map(l => l[1])
+		}
 		Object.keys(this.lists).forEach(url => {
+			if(myListsOnly && !myListsOnly.includes(url)) return
 			let entries = this.lists[url].index.groupsTypes
 			types.forEach(type => {
 				if(!entries || !entries[type]) return

diff --git a/www/nodejs-project/modules/lists/lists.js b/www/nodejs-project/modules/lists/lists.js
@@ -110,7 +110,7 @@ class ListsEPGTools extends Index {
 			let currentScore = this.epgChannelsListSanityScore(data['categories'])
 			const limit = pLimit(3)
 			const tasks = Object.keys(this.lists).filter(url => {
-				return this.lists[url].index.meta['epg'].indexOf(this._epg.url) != -1 // use indexOf as it can be a comma delimited list
+				return this.lists[url].index.meta['epg'] && this.lists[url].index.meta['epg'].indexOf(this._epg.url) != -1 // use indexOf as it can be a comma delimited list
 			}).map(url => {
 				return async () => {
 					let categories = {}
@@ -825,7 +825,7 @@ class Lists extends ListsEPGTools {
 		}
 		const cachettl = 3600, now = global.time(), olen = list.length
 		if(typeof(this.directListRendererPrepareCache[url]) != 'undefined' && this.directListRendererPrepareCache[url].size == olen && this.directListRendererPrepareCache[url].time > (now - cachettl)){
-			return this.directListRendererPrepareCache[url].list
+			return this.directListRendererPrepareCache[url].list.slice(0) // clone it
 		}
 		if(list.length){
 			list = this.parentalControl.filter(list, true)
@@ -835,7 +835,7 @@ class Lists extends ListsEPGTools {
 		if(olen >= this.opts.offloadThreshold){
 			this.directListRendererPrepareCache[url] = {list, time: now, size: olen}
 		}
-		return list
+		return list.slice(0) // clone it to not alter cache
     }
 	isLocal(file){
 		if(typeof(file) != 'string'){

diff --git a/www/nodejs-project/modules/lists/update-list-index.js b/www/nodejs-project/modules/lists/update-list-index.js
@@ -107,6 +107,7 @@ class UpdateListIndex extends ListIndexUtils {
                             this.contentLength = this.stream.totalContentLength
                         }
                         if(this.stream.totalContentLength > 0 && (this.stream.totalContentLength == this.updateMeta.contentLength)){
+                            console.log('UpdateListIndex fetch skipped')
                             this.stream.destroy()
                             resolve(false) // no need to update
                         } else {
@@ -123,7 +124,7 @@ class UpdateListIndex extends ListIndexUtils {
                 })
                 this.stream.on('end', () => {
                     if(this.debug){
-                        console.log('end')
+                        console.log('UpdateListIndex fetch end')
                     }
                     this.stream && this.stream.destroy()
                     if(!resolved) {
@@ -132,7 +133,7 @@ class UpdateListIndex extends ListIndexUtils {
                     }
                 })
                 this.stream.on('error', e => {
-                    if(this.debug) console.log('err', e)
+                    console.error('UpdateListIndex fetch err', e)
                 })
                 this.stream.start()
             } else {

diff --git a/www/nodejs-project/modules/omni/client.js b/www/nodejs-project/modules/omni/client.js
@@ -151,7 +151,7 @@ class OMNI extends OMNIUtils {
     eventHandler(evt){
         if(!this.validateEvent(evt)) return
         if(evt.target && evt.target != this.rinput){
-            if(evt.key && evt.key.length == 1 && evt.key != ' '){
+            if(evt.key && evt.key.length == 1 && evt.key != ' ') {
                 this.defaultValue = evt.key
                 if(explorer.inPlayer() && !explorer.isExploring()) {
                     menuPlaying(true, true)
@@ -168,33 +168,35 @@ class OMNI extends OMNIUtils {
         if(this.typing){
             if(this.type != 'numeric' && this.typing.length == 1){
                 let lc = this.typing.toLowerCase(), pos = -1
-                explorer.currentEntries.some((n, i) => {
-					if(n.type == 'back') return
-                    if(n.name.charAt(0).toLowerCase() == lc){
-                        pos = i 
-                        return true
-                    }
-                })
-                if(pos < 0){
+                if(lc != '.' && lc != '*') {
                     explorer.currentEntries.some((n, i) => {
-					if(n.type == 'back') return
-                        if(n.name.charAt(0).toLowerCase() < lc){
+                        if(n.type == 'back') return
+                        if(n.name.charAt(0).toLowerCase() == lc){
                             pos = i 
-                        } else {
-							return true
-						}
+                            return true
+                        }
                     })
+                    if(pos < 0){
+                        explorer.currentEntries.some((n, i) => {
+                        if(n.type == 'back') return
+                            if(n.name.charAt(0).toLowerCase() < lc){
+                                pos = i 
+                            } else {
+                                return true
+                            }
+                        })
+                    }
+                    if(pos < 0){
+                        pos = explorer.currentEntries.length - 1
+                    }
+                    if(pos > 0){
+                        explorer.focus(explorer.currentElements[pos])
+                    }
+                    return
                 }
-                if(pos < 0){
-                    pos = explorer.currentEntries.length - 1
-                }
-                if(pos > 0){
-                    explorer.focus(explorer.currentElements[pos])
-                }
-            } else {
-                app.emit('omni', this.typing, this.type)
-                this.updateIcon('fas fa-circle-notch fa-spin')
             }
+            app.emit('omni', this.typing, this.type)
+            this.updateIcon('fas fa-circle-notch fa-spin')
         }
     }
 }
diff --git a/www/nodejs-project/modules/omni/omni.js b/www/nodejs-project/modules/omni/omni.js
@@ -21,7 +21,7 @@ class OMNI extends Events {
                         return global.streamer.play(entry)
                     }
                 }
-            }     
+            }
             global.channels.search(text, true).then(results => {
                 if(results.length){
                     global.search.go(text, 'live')

diff --git a/www/nodejs-project/modules/search/search.js b/www/nodejs-project/modules/search/search.js
@@ -92,7 +92,7 @@ class Search extends Events {
         const rs = await this[mediaType == 'live' ? 'channelsResults' : 'results'](value).catch(e => err = e)
         global.osd.hide('search')
         if(Array.isArray(rs)){
-            console.log('results', rs)
+            console.log('results', rs.length)
             if(!rs.length && mediaType == 'live'){
                 return this.go(value, 'all')
             }

diff --git a/www/nodejs-project/package.json b/www/nodejs-project/package.json
@@ -59,7 +59,7 @@
     "url": "https://megacubo.tv"
   },
   "icon": "./default_icon.png",
-  "version": "17.4.2",
+  "version": "17.4.3",
   "theme": {
     "fullScreen": true
   },