The branch, frodo has been updated
via 8e4b1794998f53b2f31166e7c1daf14573def2d6 (commit)
from c24f425ddcd6c39aa987f9afc09d106e25d03327 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=8e4b1794998f53b2f31166e7c1daf14573def2d6
commit 8e4b1794998f53b2f31166e7c1daf14573def2d6
Author: beenje <[email protected]>
Date: Tue Jun 11 22:56:34 2013 +0200
[plugin.video.arretsurimages] updated to version 2.3.4
diff --git a/plugin.video.arretsurimages/addon.py
b/plugin.video.arretsurimages/addon.py
index 5c8b1d0..d719639 100644
--- a/plugin.video.arretsurimages/addon.py
+++ b/plugin.video.arretsurimages/addon.py
@@ -37,9 +37,30 @@ BESTOF_SORTMETHOD = ['recent', 'visited', 'commented',
'rated']
STREAMS = ['stream_h264_hq_url', 'stream_h264_url']
+def login():
+ """Login or exit if it fails"""
+ # Only available with a subscription
+ # Check if username and password have been set
+ username = plugin.get_setting('username')
+ password = plugin.get_setting('password')
+ if not username or not password:
+ xbmcgui.Dialog().ok(plugin.get_string(30050),
plugin.get_string(30051), plugin.get_string(30052))
+ sys.exit(0)
+ # Try to login only if username isn't already logged in
+ # (we don't have to login everytime as we use a cookie)
+ if not scraper.is_logged_in(username) and not scraper.login(username,
password):
+ xbmcgui.Dialog().ok(plugin.get_string(30050), plugin.get_string(30053))
+ sys.exit(0)
+
+
@plugin.route('/')
def index():
"""Default view"""
+ quick_access = plugin.get_setting('quickAccess')
+ if quick_access == 'true':
+ # Jump directly to 'toutesLesEmissions'
+ login()
+ return show_programs('toutesLesEmissions', '1')
items = [
{'label': plugin.get_string(30010), 'url':
plugin.url_for('emissions')},
{'label': plugin.get_string(30011), 'url': plugin.url_for('bestof',
page='1')},
@@ -51,18 +72,7 @@ def index():
@plugin.route('/emissions/')
def emissions():
"""Display the available programs categories"""
- # Only available with a subscription
- # Check if username and password have been set
- username = plugin.get_setting('username')
- password = plugin.get_setting('password')
- if not username or not password:
- xbmcgui.Dialog().ok(plugin.get_string(30050),
plugin.get_string(30051), plugin.get_string(30052))
- sys.exit(0)
- # Try to login only if username isn't already logged in
- # (we don't have to login everytime as we use a cookie)
- if not scraper.is_logged_in(username) and not scraper.login(username,
password):
- xbmcgui.Dialog().ok(plugin.get_string(30050), plugin.get_string(30053))
- sys.exit(0)
+ login()
items = [
{'label': 'Toutes les émissions',
'url': plugin.url_for('show_programs', label='toutesLesEmissions',
page='1'),
diff --git a/plugin.video.arretsurimages/addon.xml
b/plugin.video.arretsurimages/addon.xml
index 70f3c77..c344ff5 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="2.3.3"
+ version="2.3.4"
provider-name="beenje">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -23,5 +23,9 @@
<disclaimer lang="en">This add-on requires a subscription to the french
site arretsurimages.net for most contents</disclaimer>
<platform>all</platform>
<language>fr</language>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
+ <website>http://www.arretsurimages.net</website>
+ <source>https://github.com/beenje/plugin.video.arretsurimages</source>
+ <email>[email protected]</email>
</extension>
</addon>
diff --git a/plugin.video.arretsurimages/changelog.txt
b/plugin.video.arretsurimages/changelog.txt
index 5ca5166..fd7e6d5 100644
--- a/plugin.video.arretsurimages/changelog.txt
+++ b/plugin.video.arretsurimages/changelog.txt
@@ -1,3 +1,9 @@
+[B]Version 2.3.4[/B]
+
+- Fix navigation items
+- Add optional tags
+- Add quick access to all programs setting
+
[B]Version 2.3.3[/B]
- Update for requests 1.0.4
diff --git a/plugin.video.arretsurimages/resources/language/English/strings.xml
b/plugin.video.arretsurimages/resources/language/English/strings.xml
index 00f8a6a..42689da 100644
--- a/plugin.video.arretsurimages/resources/language/English/strings.xml
+++ b/plugin.video.arretsurimages/resources/language/English/strings.xml
@@ -50,6 +50,7 @@
<string id="30102">high</string>
<string id="30103">normal</string>
<string id="30105">Display all parts</string>
+ <string id="30106">Jump to all programs</string>
<!--Context Menu-->
<string id="30180">Download Video</string>
diff --git a/plugin.video.arretsurimages/resources/language/French/strings.xml
b/plugin.video.arretsurimages/resources/language/French/strings.xml
index 08f9c76..94393a7 100644
--- a/plugin.video.arretsurimages/resources/language/French/strings.xml
+++ b/plugin.video.arretsurimages/resources/language/French/strings.xml
@@ -50,6 +50,7 @@
<string id="30102">haute</string>
<string id="30103">normale</string>
<string id="30105">Afficher les actes</string>
+ <string id="30106">Accès direct à toutes les émissions</string>
<!--Context Menu-->
<string id="30180">Télécharger la vidéo</string>
diff --git a/plugin.video.arretsurimages/resources/lib/scraper.py
b/plugin.video.arretsurimages/resources/lib/scraper.py
index a298eae..82d716c 100644
--- a/plugin.video.arretsurimages/resources/lib/scraper.py
+++ b/plugin.video.arretsurimages/resources/lib/scraper.py
@@ -140,13 +140,10 @@ class Programs:
filterContainer = SoupStrainer(attrs={'class':
re.compile('rech-filtres-droite')})
# There are two 'rech-filtres-droite' per page. Look only in the first
one (contents[0])
for tag in BeautifulSoup(self.html,
parseOnlyThese=filterContainer).contents[0].findAll('a'):
- if 'href' in tag:
- if tag.string == '>':
- nav_items['next'] = True
- elif tag.string == '<':
- nav_items['previous'] = True
- else:
- debug('No navigation items found')
+ if tag.string == '>':
+ nav_items['next'] = True
+ elif tag.string == '<':
+ nav_items['previous'] = True
return nav_items
diff --git a/plugin.video.arretsurimages/resources/settings.xml
b/plugin.video.arretsurimages/resources/settings.xml
index 4c10f8b..6c119c5 100644
--- a/plugin.video.arretsurimages/resources/settings.xml
+++ b/plugin.video.arretsurimages/resources/settings.xml
@@ -19,5 +19,6 @@
<category label="30100">
<setting id="quality" type="enum" label="30101" default="0"
lvalues="30102|30103" />
<setting id="displayParts" type="bool" default="false" label="30105" />
+ <setting id="quickAccess" type="bool" default="false" label="30106" />
</category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.arretsurimages/addon.py | 34 +++++++++++++-------
plugin.video.arretsurimages/addon.xml | 6 +++-
plugin.video.arretsurimages/changelog.txt | 6 +++
.../resources/language/English/strings.xml | 1 +
.../resources/language/French/strings.xml | 1 +
.../resources/lib/scraper.py | 11 ++----
plugin.video.arretsurimages/resources/settings.xml | 1 +
7 files changed, 40 insertions(+), 20 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
