jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4609 from heitbaum/patch-3

Browse Source 
Tvheadend 42: python: update xbmc.translatePath() to xbmcvfs
This commit is contained in:
CvH 2021-01-16 14:03:04 +01:00 committed by GitHub
commit 0b2c4923ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/addons/service/tvheadend42/source/download.py
View File

@ -1,16 +1,16 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
import urllib, os, zipfile import urllib.request, urllib.parse, urllib.error, os, zipfile
from urllib2 import URLError from urllib.error import URLError
import xbmc, xbmcgui, xbmcaddon import xbmc, xbmcvfs, xbmcgui, xbmcaddon
import shutil import shutil
import sys import sys
url = 'https://github.com/tvheadend/dtv-scan-tables/archive/tvheadend.zip' url = 'https://github.com/tvheadend/dtv-scan-tables/archive/tvheadend.zip'
temp = xbmc.translatePath('special://temp') temp = xbmcvfs.translatePath('special://temp')
temp_folder = os.path.join(temp, 'dtv-scan-tables-tvheadend') temp_folder = os.path.join(temp, 'dtv-scan-tables-tvheadend')
dest_folder = os.path.join(xbmc.translatePath(xbmcaddon.Addon().getAddonInfo('path')), 'dvb-scan') dest_folder = os.path.join(xbmcvfs.translatePath(xbmcaddon.Addon().getAddonInfo('path')), 'dvb-scan')
archive = os.path.join(temp, 'dtv_scantables.zip') archive = os.path.join(temp, 'dtv_scantables.zip')
ADDON_NAME = xbmcaddon.Addon().getAddonInfo('name') ADDON_NAME = xbmcaddon.Addon().getAddonInfo('name')
@ -25,7 +25,7 @@ class DownLoader():
def download(self, url, dest): def download(self, url, dest):
try: try:
self.dp.create(ADDON_NAME, LS(30042)) self.dp.create(ADDON_NAME, LS(30042))
urllib.urlretrieve(url, dest, reporthook=self._pbhook) urllib.request.urlretrieve(url, dest, reporthook=self._pbhook)
self.dp.close() self.dp.close()
zip = zipfile.ZipFile(archive) zip = zipfile.ZipFile(archive)
if zip.testzip() is not None: raise zipfile.BadZipfile if zip.testzip() is not None: raise zipfile.BadZipfile
@ -44,7 +44,7 @@ class DownLoader():
shutil.copytree(os.path.join(temp_folder, folder), os.path.join(dest_folder, folder)) shutil.copytree(os.path.join(temp_folder, folder), os.path.join(dest_folder, folder))
xbmcgui.Dialog().notification(ADDON_NAME, LS(30039), xbmcgui.NOTIFICATION_INFO) xbmcgui.Dialog().notification(ADDON_NAME, LS(30039), xbmcgui.NOTIFICATION_INFO)
except URLError, e: except URLError as e:
xbmc.log('Could not download file: %s' % e.reason, xbmc.LOGERROR) xbmc.log('Could not download file: %s' % e.reason, xbmc.LOGERROR)
self.dp.close() self.dp.close()
xbmcgui.Dialog().notification(ADDON_NAME, LS(30040), xbmcgui.NOTIFICATION_ERROR) xbmcgui.Dialog().notification(ADDON_NAME, LS(30040), xbmcgui.NOTIFICATION_ERROR)