stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Revert "test channeltoolsdb"

Browse Source 
This reverts commit 205ed61c
This commit is contained in:
marco
2019-12-15 20:44:54 +01:00
parent f9c7b7bef9
commit ee2c2ea0a8
3 changed files with 102 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
channelselector.py
View File

@@ -3,7 +3,7 @@
import glob
import os
from core import channeltoolsDB as channeltools
from core import channeltools
from core.item import Item
from platformcode.unify import thumb_dict
from platformcode import config, logger, unify
@@ -121,24 +121,111 @@ def filterchannels(category, view="thumb_"):
channelslist = []
# Si category = "allchannelstatus" es que estamos activando/desactivando canales
appenddisabledchannels = False
if category == "allchannelstatus":
category = "all"
appenddisabledchannels = True
# Lee la lista de canales
if category != 'adult':
channel_path = os.path.join(config.get_runtime_path(), 'channels', '*.json')
else:
channel_path = os.path.join(config.get_runtime_path(), 'channels', 'porn', '*.json')
logger.info("channel_path = %s" % channel_path)
channel_files = glob.glob(channel_path)
logger.info("channel_files encontrados %s" % (len(channel_files)))
# channel_language = config.get_setting("channel_language", default="all")
channel_language = auto_filter()
logger.info("channel_language=%s" % channel_language)
for channel_parameters in channeltools.filter(category, channel_language, config.get_setting("adult_mode")):
context = []
# Si prefiere el banner y el canal lo tiene, cambia ahora de idea
if view == "banner_" and "banner" in channel_parameters:
channel_parameters["thumbnail"] = channel_parameters["banner"]
# if channel_parameters["has_settings"]:
# context.append(
# {"title": config.get_localized_string(70525), "channel": "setting", "action": "channel_config",
# "config": channel_parameters["channel"]})
for channel_path in channel_files:
logger.info("channel in for = %s" % channel_path)
channel_info = set_channel_info(channel_parameters)
channelslist.append(Item(title=channel_parameters["name"], channel=channel_parameters["id"],
action="mainlist", thumbnail=get_thumb(channel_parameters["thumbnail"]), plot=channel_info,
category=channel_parameters["name"],
language=channel_parameters["language"], viewmode="list", context=context))
channel = os.path.basename(channel_path).replace(".json", "")
try:
channel_parameters = channeltools.get_channel_parameters(channel)
if channel_parameters["channel"] == 'community':
continue
# si el canal no es compatible, no se muestra
if not channel_parameters["compatible"]:
continue
# Si no es un canal lo saltamos
if not channel_parameters["channel"]:
continue
logger.info("channel_parameters=%s" % repr(channel_parameters))
# Si prefiere el banner y el canal lo tiene, cambia ahora de idea
if view == "banner_" and "banner" in channel_parameters:
channel_parameters["thumbnail"] = channel_parameters["banner"]
# si el canal está desactivado no se muestra el canal en la lista
if not channel_parameters["active"]:
continue
# Se salta el canal si no está activo y no estamos activando/desactivando los canales
channel_status = config.get_setting("enabled", channel_parameters["channel"])
if channel_status is None:
# si channel_status no existe es que NO HAY valor en _data.json.
# como hemos llegado hasta aquí (el canal está activo en channel.json), se devuelve True
channel_status = True
if not channel_status:
# si obtenemos el listado de canales desde "activar/desactivar canales", y el canal está desactivado
# lo mostramos, si estamos listando todos los canales desde el listado general y está desactivado,
# no se muestra
if not appenddisabledchannels:
continue
# Se salta el canal para adultos si el modo adultos está desactivado
if channel_parameters["adult"] and config.get_setting("adult_mode") == 0:
continue
# Se salta el canal si está en un idioma filtrado
# Se muestran todos los canales si se elige "all" en el filtrado de idioma
# Se muestran sólo los idiomas filtrados, cast o lat
# Los canales de adultos se mostrarán siempre que estén activos
# for channel_language_list in channel_language_list:
# if c in channel_parameters["language"]:
# L = True
# else:
# L = False
# logger.info('CCLANG= ' + channel_language + ' ' + str(channel_language_list))
if channel_language != "all" and "*" not in channel_parameters["language"] \
and channel_language not in str(channel_parameters["language"]):
continue
# Se salta el canal si está en una categoria filtrado
if category != "all" and category not in channel_parameters["categories"]:
continue
# Si tiene configuración añadimos un item en el contexto
context = []
if channel_parameters["has_settings"]:
context.append({"title": config.get_localized_string(70525), "channel": "setting", "action": "channel_config",
"config": channel_parameters["channel"]})
channel_info = set_channel_info(channel_parameters)
# Si ha llegado hasta aquí, lo añade
channelslist.append(Item(title=channel_parameters["title"], channel=channel_parameters["channel"],
action="mainlist", thumbnail=channel_parameters["thumbnail"],
fanart=channel_parameters["fanart"], plot=channel_info, category=channel_parameters["title"],
language=channel_parameters["language"], viewmode="list", context=context))
except:
logger.error("Se ha producido un error al leer los datos del canal '%s'" % channel)
import traceback
logger.error(traceback.format_exc())
channelslist.sort(key=lambda item: item.title.lower().strip())
if category == "all":
channel_parameters = channeltools.get_channel_parameters('url')

73
core/channeltoolsDB.py
View File

@@ -1,73 +0,0 @@
import _sqlite3 as sql
import os
# from platformcode import config
from platformcode import config, logger
db = os.path.join(config.get_runtime_path(), 'kod_db.sqlite')
# db = '/home/casa/.kodi/userdata/addon_data/plugin.video.kod/kod_db.sqlite'
conn = sql.connect(db)
conn.row_factory = lambda c, r: dict(zip([col[0] for col in c.description], r))
cur = conn.cursor()
baseQuery = "select channels.*,(select group_concat(category) from categories WHERE categories.channel=id) as 'categories', (select group_concat(language) from languages WHERE languages.channel=id) as 'language' from channels "
thumb_path = 'https://raw.githubusercontent.com/kodiondemand/media/master/'
def filter(category, language='all', adult=False):
cur.execute(baseQuery + "join categories on channels.id=categories.channel where category=? and adult=? and active=1", (category,adult))
ris = []
for channel in cur.fetchall():
el = {}
for col in channel.keys():
if channel[col] and col in ['categories', 'language']:
el[col] = channel[col].split(',')
elif col == 'thumbnail': # remote thumbnail
el[col] = channel[col] if channel[col].startswith('http') else os.path.join(thumb_path, 'resources', "thumb", channel[col])
elif channel[col]:
el[col] = channel[col]
else:
el[col] = ''
ris.append(el)
# ris = [{channel[col].split(',') if col in ['category', 'language'] else channel[col]} for col in channel.keys() for channel in cur.fetchall()]
logger.info(ris)
return ris
def get_channel_parameters(channel_id):
cur.execute('select * from channels where id=?', (channel_id,))
ris = cur.fetchall()[0]
ris["channel"] = ris["id"]
ris["title"] = ris["name"]
ris["fanart"] = ''
ris["compatible"] = True
cur.execute('select category from categories where channel=?', (channel_id,))
ris["categories"] = [cat["category"] for cat in cur.fetchall()]
cur.execute('select language from languages where channel=?', (channel_id,))
ris["language"] = [lang["language"] for lang in cur.fetchall()]
ris["has_settings"] = False
return ris
def create_db():
import json
cur.execute('delete from channels')
for f in os.walk('../channels/'):
for file in f[2]:
if file.split('.')[-1] == 'json':
j = json.load(open(os.path.join(f[0], file)))
id = j.get('id', '')
name = j.get('name', '')
active = j.get('active', False)
adult = j.get('adult', False)
thumbnail = j.get('thumbnail', '')
banner = j.get('banner', '')
cur.execute('insert into channels values (?,?,?,?,?,?,?,?)', (id, name, active, adult, thumbnail, banner, '', ''))
for cat in j.get('categories', ''):
cur.execute('insert into categories values(?,?)', (id, cat))
for cat in j.get('language', 'all'):
cur.execute('insert into languages values(?,?)', (id, cat))
conn.commit()
# print get_channel_parameters('altadefinizione01')
# print create_db()

BIN
kod_db.sqlite
View File

Binary file not shown.