The branch, frodo has been updated
via 5fd20cbd3c763b87ef84a0b2b04161344c463e04 (commit)
from 8439aa90d5c903dac5cca5e4d7ba4aec6d6c2fa8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=5fd20cbd3c763b87ef84a0b2b04161344c463e04
commit 5fd20cbd3c763b87ef84a0b2b04161344c463e04
Author: Lee Pollock <[email protected]>
Date: Sun Oct 13 18:01:28 2013 +0100
[metadata.mymovies.it] updated to version 2.0.2
diff --git a/metadata.mymovies.it/addon.xml b/metadata.mymovies.it/addon.xml
index f18ed76..715ef1d 100644
--- a/metadata.mymovies.it/addon.xml
+++ b/metadata.mymovies.it/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.mymovies.it"
name="MyMovies.it"
- version="2.0.1"
+ version="2.0.2"
provider-name="muttley">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.mymovies.it/changelog.txt
b/metadata.mymovies.it/changelog.txt
index 7db0858..46aecb1 100644
--- a/metadata.mymovies.it/changelog.txt
+++ b/metadata.mymovies.it/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.0.2[/B]
+- Added mymovies.it internal search, this option is acctivable in setting
(thanks to mario.diraimondo for the patch - see issue 13)
+
[B]2.0.1[/B]
- Fixed trailer: Update regex for change in some films pages
- Added setting category: For more user-friendly scraper settings
diff --git a/metadata.mymovies.it/mymovies.xml
b/metadata.mymovies.it/mymovies.xml
index 656a831..b9ef460 100644
--- a/metadata.mymovies.it/mymovies.xml
+++ b/metadata.mymovies.it/mymovies.xml
@@ -13,17 +13,24 @@
</NfoUrl>
<CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://www.google.it/search?q=\1$$4+site:mymovies.it|User-Agent=Mozilla/5.0
(X11; Linux x86_64; rv:7.0.1) Gecko/20100101 Firefox/7.0.1</url>"
dest="3">
+ <RegExp conditional="google" input="$$1"
output="<url>http://www.google.it/search?q=\1$$4+site:mymovies.it|User-Agent=Mozilla/5.0
(X11; Linux x86_64; rv:7.0.1) Gecko/20100101 Firefox/7.0.1</url>"
dest="3">
<!-- Add film year, stored in $$2 for default by xbmc
-->
<RegExp input="$$2" output="%20(\1)" dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
+ <RegExp conditional="!google" input="$$1"
output="<url>http://www.mymovies.it/database/ricerca/avanzata/?titolo=\1&anno_prod=$$4&submit=Inizia+ricerca+%BB|User-Agent=Mozilla/5.0
(X11; Linux x86_64; rv:7.0.1) Gecko/20100101 Firefox/7.0.1</url>"
dest="3">
+ <!-- Add film year, stored in $$2 for default by xbmc
-->
+ <RegExp input="$$2" output="\1" dest="4">
+ <expression clear="yes">(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
</CreateSearchUrl>
<GetSearchResults dest="8">
- <RegExp input="$$5" output="<?xml version="1.0"
encoding="UTF-8"
standalone="yes"?><results>\1</results>" dest="8">
+ <RegExp conditional="google" input="$$5" output="<?xml
version="1.0" encoding="UTF-8"
standalone="yes"?><results>\1</results>" dest="8">
<!-- Add new link style to Search result
(http://www.mymovies.it/film/<year>/<film_name>/) -->
<RegExp input="$$1"
output="<entity><title>\3 (\2)</title><url
cache="main.html">\1</url><id>\1</id></entity>"
dest="5">
<expression repeat="yes" cs="true"><h3
class="r"><a
href="(http://www\.mymovies\.it/film/([0-9]{4})/[^/]+/)"
[^>]+>(.+?)(?: +- +MYmovies)?(?: +\|
+MYmovies)?</a></h3></expression>
@@ -34,6 +41,17 @@
</RegExp>
<expression noclean="1" />
</RegExp>
+ <RegExp conditional="!google" input="$$5" output="<?xml
version="1.0" encoding="UTF-8"
standalone="yes"?><results>\1</results>" dest="8">
+ <!-- Add new link style to Search result
(http://www.mymovies.it/film/<year>/<film_name>/) -->
+ <RegExp input="$$1"
output="<entity><title>\2</title><url
cache="main.html">\1</url><id>\1</id></entity>"
dest="5">
+ <expression repeat="yes"
cs="true"><h2>[^<]*<a
href="(http://www\.mymovies\.it/film/([0-9]{4})/[^/]+/)"
[^>]+>([^<]+)</a>[^<]*</h2></expression>
+ </RegExp>
+ <!-- Add OLD link style to Search result
(www.mymovies.it/dizionario/recensione.asp?id=[0-9]) -->
+ <RegExp input="$$1"
output="<entity><title>\2</title><url
cache="main.html">\1</url><id>\1</id></entity>"
dest="5+">
+ <expression repeat="yes"
cs="true"><h2>[^<]*<a
href="(http://www\.mymovies\.it/dizionario/recensione\.asp\?id=[^"]+)"
[^>]+>([^<]+)</a>[^<]*</h2></expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
</GetSearchResults>
<GetDetails dest="3">
diff --git a/metadata.mymovies.it/resources/language/English/strings.xml
b/metadata.mymovies.it/resources/language/English/strings.xml
index 4e36ccf..4ff0dd3 100644
--- a/metadata.mymovies.it/resources/language/English/strings.xml
+++ b/metadata.mymovies.it/resources/language/English/strings.xml
@@ -23,4 +23,7 @@
<string id="30302">Audience critique (slow)</string>
<string id="30303">Forum comments (slow)</string>
<string id="30304">Famous film phrases (slow)</string>
+
+ <string id="30400">Generals</string>
+ <string id="30401">Use Google for search</string>
</strings>
\ No newline at end of file
diff --git a/metadata.mymovies.it/resources/language/Italian/strings.xml
b/metadata.mymovies.it/resources/language/Italian/strings.xml
index ef47f85..b72b891 100644
--- a/metadata.mymovies.it/resources/language/Italian/strings.xml
+++ b/metadata.mymovies.it/resources/language/Italian/strings.xml
@@ -23,4 +23,7 @@
<string id="30302">Commenti del Pubblico (lento)</string>
<string id="30303">Commenti sul Forum (lento)</string>
<string id="30304">Frasi Celebri del film (lento)</string>
+
+ <string id="30400">Generali</string>
+ <string id="30401">Usa Google per cercare</string>
</strings>
\ No newline at end of file
diff --git a/metadata.mymovies.it/resources/settings.xml
b/metadata.mymovies.it/resources/settings.xml
index 7ea5f69..7dd442e 100644
--- a/metadata.mymovies.it/resources/settings.xml
+++ b/metadata.mymovies.it/resources/settings.xml
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
+ <category label="30400">
+ <!-- <setting label="30400" type="lsep" /> -->
+ <setting label="30401" type="bool" id="google" default="true"/>
+ </category>
+
<category label="30000">
<!-- <setting label="30000" type="lsep" /> -->
<setting label="30001" type="bool" id="fullcredits" default="true"/>
-----------------------------------------------------------------------
Summary of changes:
metadata.mymovies.it/addon.xml | 2 +-
metadata.mymovies.it/changelog.txt | 3 ++
metadata.mymovies.it/mymovies.xml | 22 ++++++++++++++++++-
.../resources/language/English/strings.xml | 3 ++
.../resources/language/Italian/strings.xml | 3 ++
metadata.mymovies.it/resources/settings.xml | 5 ++++
6 files changed, 35 insertions(+), 3 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons