The branch, dharma has been updated
via 1481d85202154cedfa045fc2f133309e05fbbdab (commit)
from aa26784c0afb6c855f65911fb11d442940fd2510 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=1481d85202154cedfa045fc2f133309e05fbbdab
commit 1481d85202154cedfa045fc2f133309e05fbbdab
Author: beenje <[email protected]>
Date: Sun Sep 11 17:41:04 2011 +0200
[plugin.video.arretsurimages] updated to version 1.1.4
diff --git a/plugin.video.arretsurimages/addon.xml
b/plugin.video.arretsurimages/addon.xml
index de0cd59..d6a1065 100644
--- a/plugin.video.arretsurimages/addon.xml
+++ b/plugin.video.arretsurimages/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.arretsurimages"
name="Arrêt Sur Images"
- version="1.1.3"
+ version="1.1.4"
provider-name="beenje">
<requires>
<import addon="xbmc.python" version="1.0"/>
diff --git a/plugin.video.arretsurimages/changelog.txt
b/plugin.video.arretsurimages/changelog.txt
index fc4a7c7..d8cb18f 100644
--- a/plugin.video.arretsurimages/changelog.txt
+++ b/plugin.video.arretsurimages/changelog.txt
@@ -1,3 +1,8 @@
+[B]Version 1.1.4[/B]
+
+- Fixed empty prgram list after website change
+- Fixed unicode problem with download path (thanks to mossroy)
+
[B]Version 1.1.3[/B]
- Fixed broken video download link after website change
diff --git a/plugin.video.arretsurimages/resources/lib/asi_scraper.py
b/plugin.video.arretsurimages/resources/lib/asi_scraper.py
index 07acf48..d3c6ebe 100644
--- a/plugin.video.arretsurimages/resources/lib/asi_scraper.py
+++ b/plugin.video.arretsurimages/resources/lib/asi_scraper.py
@@ -66,45 +66,6 @@ class ArretSurImages:
print "bouton-telecharger not found"
return {'Title':title, 'url':link}
- def getIphoneVideoDetails(self, url):
- """Return the video title and link"""
- html = getHTML(url)
- soup = BeautifulSoup(html)
- # Get title and url
- videoTitle = soup.find('a', attrs = {'class':'title'})
- if videoTitle:
- title = videoTitle.string
- else:
- title = 'ASI'
- videoLink = soup.find(type="video/x-m4v")
- if videoLink:
- link = videoLink['href']
- else:
- link = 'None'
- return {'Title':title, 'url':link}
-
- def getIphoneProgramParts(self, url, name):
- """Return all parts of a program"""
- html = getHTML(url)
- soup = BeautifulSoup(html)
- parts = []
- # Get the different parts
- part = 0
- for media in soup.findAll(text=re.compile(u'.*title="voir la
vidéo".*')):
- match = re.search(u'href="(.*?)"', media)
- if match:
- part += 1
- partLink = match.group(1)
- partTitle = name + ' - Acte %d' % (part)
- match = re.search(u'img src="(.*?)"', media)
- if match:
- partThumb = URLASI + match.group(1)
- parts.append({'url':partLink, 'Title':partTitle,
'Thumb':partThumb})
- # If there is only one part, we keep only one link
- if part == 1 and len(parts) == 2:
- parts.pop()
- return parts
-
def getVideoDetails(self, url, streams):
"""Return the video title and link"""
# Run the json request using the video id
@@ -129,10 +90,7 @@ class ArretSurImages:
video id allows to get video url with a json request"""
html = getHTML(url)
- # Filter to avoid wrap-porte (La chronique porte) defined at the
beginning
- # of the html page
- blocContainers = SoupStrainer(attrs = {'class':'contenu-html
bg-page-contenu'})
- soup = BeautifulSoup(html, parseOnlyThese = blocContainers)
+ soup = BeautifulSoup(html)
parts = []
part = 1
# Get all movie id
diff --git a/plugin.video.arretsurimages/resources/lib/videoDownloader.py
b/plugin.video.arretsurimages/resources/lib/videoDownloader.py
index 846c543..a551627 100644
--- a/plugin.video.arretsurimages/resources/lib/videoDownloader.py
+++ b/plugin.video.arretsurimages/resources/lib/videoDownloader.py
@@ -23,7 +23,7 @@ class Download:
#unicode causes problems here, convert to standard str
self.filename = self.getLegalFilename(self.title.title().replace('
', ''))
self.fullDownloadPath = os.path.join(downloadPath, self.filename)
- print '[%s] %s : Attempting to download\n%s --> %s' % (pluginName,
__name__, self.url, self.fullDownloadPath)
+ print '[%s] %s : Attempting to download\n%s --> %s' % (pluginName,
__name__, self.url.encode('ascii', 'replace'), self.fullDownloadPath)
if self.checkPath(downloadPath, self.filename):
self.showNotification(getLS(30200), self.filename)
try:
-----------------------------------------------------------------------
Summary of changes:
plugin.video.arretsurimages/addon.xml | 2 +-
plugin.video.arretsurimages/changelog.txt | 5 ++
.../resources/lib/asi_scraper.py | 44 +-------------------
.../resources/lib/videoDownloader.py | 2 +-
4 files changed, 8 insertions(+), 45 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
