The branch, eden-pre has been updated
via ba11243a31920679d9ec25e929a6220e8f253ee2 (commit)
from fae3b94d2a45f3ff579f081f5c40bd7e34fd3da3 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=ba11243a31920679d9ec25e929a6220e8f253ee2
commit ba11243a31920679d9ec25e929a6220e8f253ee2
Author: vdrfan <[email protected]>
Date: Tue Dec 20 15:11:46 2011 +0100
[metadata.cine.passion-xbmc.org] updated to version 1.1.8
diff --git a/metadata.cine.passion-xbmc.org/addon.xml
b/metadata.cine.passion-xbmc.org/addon.xml
index 0fb4973..da338dc 100644
--- a/metadata.cine.passion-xbmc.org/addon.xml
+++ b/metadata.cine.passion-xbmc.org/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.cine.passion-xbmc.org"
name="Ciné-Passion"
- version="1.1.4"
+ version="1.1.8"
provider-name="Team Passion-XBMC (passion-xbmc.org)">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.cine.passion-xbmc.org/changelog.txt
b/metadata.cine.passion-xbmc.org/changelog.txt
index 45b0f7b..7c81150 100644
--- a/metadata.cine.passion-xbmc.org/changelog.txt
+++ b/metadata.cine.passion-xbmc.org/changelog.txt
@@ -1,3 +1,15 @@
+1.1.8
+- fixed 'useraccount.py' Non-ASCII character and invalid syntax on OpenElec
and ATV
+
+1.1.7
+- added secure user infos in url
+
+1.1.6
+- reverted version 1.1.5 (not work on Dharma)
+
+1.1.5
+- added support 'metadata.cine.passion.service'
+
1.1.4
- URLencoding for Username and Password in settings
diff --git a/metadata.cine.passion-xbmc.org/cine-passion.xml
b/metadata.cine.passion-xbmc.org/cine-passion.xml
index 8ca1306..f293863 100644
--- a/metadata.cine.passion-xbmc.org/cine-passion.xml
+++ b/metadata.cine.passion-xbmc.org/cine-passion.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<scraper framework="1.1" date="2010-05-29">
+<scraper framework="1.1" date="2011-04-02">
<NfoUrl dest="3">
- <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper/index.php?id=\2&amp;Username=$INFO[username]&amp;Password=$INFO[password]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3">
- <expression clear="yes"
noclean="1">(passion-xbmc.org)/scraper/index.php\?id=([0-9]*)</expression>
+ <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper$INFO[debug]/index.php?id=\2&amp;Username=$INFO[tokenb64]&amp;Token=$INFO[token]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3">
+ <expression clear="yes"
noclean="1">(passion-xbmc.org)/scraper$INFO[debug]/index.php\?id=([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper/index.php?id=\2&amp;Username=$INFO[username]&amp;Password=$INFO[password]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3">
- <expression
noclean="1">(passion-xbmc.org)/scraper/index2.php\?Page=ViewMovie&ID=([0-9]*)</expression>
+ <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper$INFO[debug]/index.php?id=\2&amp;Username=$INFO[tokenb64]&amp;Token=$INFO[token]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3">
+ <expression
noclean="1">(passion-xbmc.org)/scraper$INFO[debug]/index2.php\?Page=ViewMovie&ID=([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper/index.php?id=\2&amp;Username=$INFO[username]&amp;Password=$INFO[password]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3+">
+ <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper$INFO[debug]/index.php?id=\2&amp;Username=$INFO[tokenb64]&amp;Token=$INFO[token]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3+">
<expression
noclean="1">(allocine.fr)/film/fichefilm_gen_cfilm=([0-9]*).html</expression>
</RegExp>
- <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper/index.php?idimdb=\2&amp;Username=$INFO[username]&amp;Password=$INFO[password]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3+">
+ <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper$INFO[debug]/index.php?idimdb=\2&amp;Username=$INFO[tokenb64]&amp;Token=$INFO[token]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3+">
<expression
noclean="1">(imdb.com/)Title\?([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper/index.php?idimdb=\2&amp;Username=$INFO[username]&amp;Password=$INFO[password]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3+">
+ <RegExp input="$$1"
output="<url>http://passion-xbmc.org/scraper$INFO[debug]/index.php?idimdb=\2&amp;Username=$INFO[tokenb64]&amp;Token=$INFO[token]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3+">
<expression
noclean="1">(imdb.com/title/tt)([0-9]*)</expression>
</RegExp>
</NfoUrl>
<CreateSearchUrl dest="3">
- <RegExp input="$$1%20($$2)"
output="<url>http://passion-xbmc.org/scraper/index.php?search=\1&amp;Username=$INFO[username]&amp;Password=$INFO[password]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3">
+ <RegExp input="$$1%20($$2)"
output="<url>http://passion-xbmc.org/scraper$INFO[debug]/index.php?search=\1&amp;Username=$INFO[tokenb64]&amp;Token=$INFO[token]&amp;Saga=$INFO[saga]&amp;Mpaa=$INFO[mpaa]&amp;Lang=$INFO[language]&amp;Rating=$INFO[rating]</url>";
dest="3">
<expression noclean="1"/>
</RegExp>
</CreateSearchUrl>
diff --git
a/metadata.cine.passion-xbmc.org/resources/language/English/strings.xml
b/metadata.cine.passion-xbmc.org/resources/language/English/strings.xml
index 22f84fd..c0da4f0 100644
--- a/metadata.cine.passion-xbmc.org/resources/language/English/strings.xml
+++ b/metadata.cine.passion-xbmc.org/resources/language/English/strings.xml
@@ -1,18 +1,32 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
+ <!-- strings 30000 thru 30999 reserved for Add-ons and Add-on settings -->
<string id="30000">Language</string>
<string id="30001">French</string>
<string id="30002">English</string>
<string id="30003">Username</string>
<string id="30004">Password</string>
+ <string id="30005">Credits:</string>
+ <string id="30006">Unknown</string>
+
<string id="30010">Rating</string>
<string id="30011">Ciné-Passion</string>
<string id="30012">Allociné</string>
<string id="30013">IMDB</string>
- <string id="30014">Movie Set</string>
+ <string id="30014">Movie Sets</string>
<string id="30015">MPAA</string>
- <string id="30020">Scraper</string>
- <string id="30020">Account Passion-XBMC</string>
+ <string id="30016">Country Certification
[COLOR=66FFFFFF][MPAA][/COLOR]</string>
+ <string id="30017">Automatic fetching of the country</string>
+
+ <string id="30020">Preferences</string>
+ <string id="30030">Account Passion-XBMC</string>
+
+ <string id="30040">Open Settings</string>
+ <string id="30041">Export thumbnails and fanarts</string>
+ <string id="30042">Export actor thumbs</string>
+ <string id="30043">Overwrite old files</string>
+ <string id="30044">Export to a single file</string>
+ <string id="30045">Path for Exporting</string>
<string id="30050">Website</string>
<string id="30051">Forum Support</string>
diff --git
a/metadata.cine.passion-xbmc.org/resources/language/French/strings.xml
b/metadata.cine.passion-xbmc.org/resources/language/French/strings.xml
index e50fb06..31352b1 100644
--- a/metadata.cine.passion-xbmc.org/resources/language/French/strings.xml
+++ b/metadata.cine.passion-xbmc.org/resources/language/French/strings.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
+ <!-- strings 30000 thru 30999 reserved for Add-ons and Add-on settings -->
<string id="30000">Langue</string>
<string id="30001">Français</string>
<string id="30002">Anglais</string>
<string id="30003">Nom d'utilisateur</string>
<string id="30004">Mot de passe</string>
+ <string id="30005">Crédits :</string>
+ <string id="30006">Inconnue</string>
<string id="30010">Notes</string>
<string id="30011">Ciné-Passion</string>
@@ -12,10 +15,19 @@
<string id="30013">IMDB</string>
<string id="30014">Récupérer les Sagas</string>
<string id="30015">MPAA</string>
+ <string id="30016">Pays de la certification
[COLOR=66FFFFFF][MPAA][/COLOR]</string>
+ <string id="30017">Récupération automatique du pays</string>
- <string id="30020">Scraper</string>
+ <string id="30020">Préférences</string>
<string id="30030">Compte Passion-XBMC</string>
-
+
+ <string id="30040">Ouvrir les paramètres</string>
+ <string id="30041">Exporter les vignettes et les fanarts</string>
+ <string id="30042">Exporter les vignettes acteur</string>
+ <string id="30043">Ãcraser les anciens fichiers</string>
+ <string id="30044">Exporter vers un seul fichier</string>
+ <string id="30045">Chemin de l'exportation</string>
+
<string id="30050">Site Web</string>
<string id="30051">Support Forum</string>
<string id="30052">[B]Cliquez ici pour le support[/B]</string>
diff --git a/metadata.cine.passion-xbmc.org/resources/lib/xbmcwebbrowser.py
b/metadata.cine.passion-xbmc.org/resources/lib/xbmcwebbrowser.py
index ba2cd2e..98d7820 100644
--- a/metadata.cine.passion-xbmc.org/resources/lib/xbmcwebbrowser.py
+++ b/metadata.cine.passion-xbmc.org/resources/lib/xbmcwebbrowser.py
@@ -10,10 +10,10 @@ import xbmc
from xbmcaddon import Addon
-__addon__ = Addon( sys.argv[ 1 ] )
+Addon = Addon( sys.argv[ 1 ] )
-def notification( header="", message="", sleep=5000,
icon=__addon__.getAddonInfo( "icon" ) ):
+def notification( header="", message="", sleep=5000, icon=Addon.getAddonInfo(
"icon" ) ):
""" Will display a notification dialog with the specified header and
message,
in addition you can set the length of time it displays in milliseconds
and a icon image.
"""
@@ -29,7 +29,7 @@ def Main():
try:
url = sys.argv[ 2 ]
# notify user
- notification( __addon__.getAddonInfo( "name" ), url )
+ notification( Addon.getAddonInfo( "name" ), url )
# launch url
launchUrl( url )
except:
diff --git a/metadata.cine.passion-xbmc.org/resources/settings.xml
b/metadata.cine.passion-xbmc.org/resources/settings.xml
index 5677474..df96b66 100644
--- a/metadata.cine.passion-xbmc.org/resources/settings.xml
+++ b/metadata.cine.passion-xbmc.org/resources/settings.xml
@@ -1,14 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
- <category label="128">
+ <category label="$LOCALIZE[128]">
<setting type="lsep" label="30030"/>
- <setting id="username" type="text" label="30003" option="urlencoded"
default="" />
- <setting id="password" type="text" option="hidden|urlencoded"
label="30004" default="" />
-
- <setting type="lsep" label="30020"/>
+ <setting id="token" type="text" label="Token" default="" visible="false" />
+ <setting id="tokenb64" type="text" label="Token b64" default=""
visible="false" />
+ <setting id="username" type="action" label="30003"
action="RunScript($CWD/resources/lib/useraccount.py,username)" option="close"
default="" />
+ <setting id="password" type="action" label="30004"
action="RunScript($CWD/resources/lib/useraccount.py,password)" option="hidden"
default="" enable="!eq(-1,)" visible="!eq(0,)" />
+ <setting type="action" label="30004"
action="RunScript($CWD/resources/lib/useraccount.py,password)" option="close"
default="" enable="!eq(-2,)" visible="eq(-1,)" />
+
+ <setting type="lsep" label="30020"/>
<setting id="language" type="enum" label="30000" lvalues="30001|30002"
default="0" />
+ <setting type="sep" />
<setting id="rating" type="enum" label="30010" lvalues="30011|30012|30013"
default="2" />
- <setting id="mpaa" type="labelenum" label="30015"
values="Argentina|Australia|Austria|Belgium|Brazil|Canada|Chile|China|Colombia|Cyprus|Czech
Republic|Denmark|East Germany|Egypt|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Israel|Italy|Japan|Kuwait|Lebanon|Luxembourg|Malaysia|Malta|Mexico|Netherlands|New
Zealand|Norway|Peru|Philippines|Poland|Portugal|Puerto
Rico|Romania|Singapore|Slovakia|South Africa|South Korea|Soviet
Union|Spain|Sweden|Switzerland|Taiwan|Thailand|Turkey|UK|USA|Ukraine|Venezuela|Vietnam|West
Germany" default="France" />
+ <setting id="mpaa" type="select" label="30016"
values="Argentina|Australia|Austria|Belgium|Brazil|Canada|Chile|China|Colombia|Cyprus|Czech
Republic|Denmark|East Germany|Egypt|Finland|France|Germany|Greece|Hong
Kong|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Israel|Italy|Japan|Kuwait|Lebanon|Luxembourg|Malaysia|Malta|Mexico|Netherlands|New
Zealand|Norway|Peru|Philippines|Poland|Portugal|Puerto
Rico|Romania|Singapore|Slovakia|South Africa|South Korea|Soviet
Union|Spain|Sweden|Switzerland|Taiwan|Thailand|Turkey|UK|USA|Ukraine|Venezuela|Vietnam|West
Germany" default="France" />
+ <setting type="sep" />
<setting id="saga" type="bool" label="30014" default="true" />
</category>
@@ -18,4 +23,10 @@
<setting type="lsep" label="30053"/>
<setting type="action" label="30054"
action="RunScript($CWD/resources/lib/xbmcwebbrowser.py,$ID,http://passion-xbmc.org/scraper/index2.php?Page=Home)"
default="" />
</category>
+
+ <category label="Debugging">
+ <setting type="lsep" label="Only available for team members"/>
+ <setting type="action" label="Set Debug" option="close"
action="RunScript($CWD/resources/lib/debug.py)" default="" />
+ <setting id="debug" type="text" label="Folder" default=""
subsetting="true" enable="!eq(0,)" />
+ </category>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.cine.passion-xbmc.org/addon.xml | 2 +-
metadata.cine.passion-xbmc.org/changelog.txt | 12 ++++++++++
metadata.cine.passion-xbmc.org/cine-passion.xml | 18 +++++++-------
.../resources/language/English/strings.xml | 20 ++++++++++++++--
.../resources/language/French/strings.xml | 16 ++++++++++++-
.../resources/lib/xbmcwebbrowser.py | 6 ++--
.../resources/settings.xml | 23 ++++++++++++++-----
7 files changed, 73 insertions(+), 24 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
