[Xbmc-addons] Scrapers branch, dharma, updated. 8858ed6ea3a00fdeee7d3237b778db79c986f970

olympia Fri, 28 Jan 2011 10:51:27 -0800

The branch, dharma has been updated
       via  8858ed6ea3a00fdeee7d3237b778db79c986f970 (commit)
      from  632a67f8d09738f71a6cfa6cd1d8ca8ed192ed3b (commit)


- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=8858ed6ea3a00fdeee7d3237b778db79c986f970

commit 8858ed6ea3a00fdeee7d3237b778db79c986f970
Author: olympia <[email protected]>
Date:   Fri Jan 28 19:50:34 2011 +0100

    [metadata.kinopoisk.ru] updated to version 1.0.26

diff --git a/metadata.kinopoisk.ru/addon.xml b/metadata.kinopoisk.ru/addon.xml
index 7496fc4..c8c72a6 100644
--- a/metadata.kinopoisk.ru/addon.xml
+++ b/metadata.kinopoisk.ru/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.kinopoisk.ru"
        name="KinoPoisk"
-       version="1.0.24"
+       version="1.0.26"
        provider-name="hamp + akara">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.kinopoisk.ru/changelog.Russian.txt 
b/metadata.kinopoisk.ru/changelog.Russian.txt
index 8d6ea8a..e29787b 100644
--- a/metadata.kinopoisk.ru/changelog.Russian.txt
+++ b/metadata.kinopoisk.ru/changelog.Russian.txt
@@ -1,3 +1,7 @@
+1.0.26:
+- ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ðµ ÑÐ¿Ð¸ÑÐºÐ° ÑÐ¾Ð»ÐµÐ¹
+1.0.25:
+- ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¾ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ðµ Ð¾Ð±Ð»Ð¾Ð¶ÐµÐº Ð´Ð»Ñ ÑÐ°Ð¹ÑÐ° 
kinopoisk.ru
 1.0.24:
 - ÐÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ° ÑÑÑÐ°Ð½Ð¸ÑÑ imdb.com
 1.0.23:
diff --git a/metadata.kinopoisk.ru/changelog.txt 
b/metadata.kinopoisk.ru/changelog.txt
index be04d8c..9f143ec 100644
--- a/metadata.kinopoisk.ru/changelog.txt
+++ b/metadata.kinopoisk.ru/changelog.txt
@@ -1,3 +1,7 @@
+1.0.26:
+- Fixed actor scraping
+1.0.25:
+- Fixed posters from kinopoisk.ru
 1.0.24:
 - Fixed scraping imdbid from imdb.com site
 1.0.23:
diff --git a/metadata.kinopoisk.ru/kinopoisk.xml 
b/metadata.kinopoisk.ru/kinopoisk.xml
index f051f5a..13f054b 100644
--- a/metadata.kinopoisk.ru/kinopoisk.xml
+++ b/metadata.kinopoisk.ru/kinopoisk.xml
@@ -225,7 +225,7 @@
                                
<expression>href="/level/19/film/(\d+)/"</expression>
                        </RegExp>
                        <!--POSTERS-->
-                       <RegExp input="$$1" output="&lt;url 
function=&quot;GMP&quot;&gt;http://www.kinopoisk.ru\1&lt;/url&gt;"; dest="5+">
+                       <RegExp input="$$1" 
conditional="posters_from_kinopoisk" output="&lt;url 
function=&quot;GMP&quot;&gt;http://www.kinopoisk.ru\1&lt;/url&gt;"; dest="5+">
                                
<expression>href="(/level/17/film/([0-9]+)/)"</expression>
                        </RegExp>
                        <!--TRAILER-->
@@ -257,13 +257,18 @@
                        <expression noclean="1"/>
                </RegExp>
        </GetDetails>
+       <GetPoster dest="4">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;thumb 
preview=&quot;http://st.kinopoisk.ru/images/poster/sm_\1.jpg&quot;&gt;\2&lt;/thumb&gt;&lt;/details&gt;";
 dest="4">
+                               <expression repeat="no" noclean="1">&lt;a 
href="/picture/([0-9]+)/"&gt;[^&lt;]+&lt;img.*?src="([^"]+)"</expression>
+               </RegExp>
+       </GetPoster>
        <GMP dest="4">
                <RegExp input="$$8" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4+">
-                       <RegExp input="$$1" output="&lt;thumb 
preview=&quot;http://www.kinopoisk.ru/images/poster/sm_\1&quot;&gt;http://www.kinopoisk.ru/images/poster/\1&lt;/thumb&gt;";
 dest="8+">
-                               <expression repeat="yes" noclean="1">&lt;a 
href="/picture/[0-9]+/"&gt;&lt;img class="new" src="/images/poster/sm_([^"]+)" 
width</expression>
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;GetPoster&quot;&gt;http://www.kinopoisk.ru\1&lt;/url&gt;"; 
dest="8+">
+                               <expression repeat="yes" noclean="1">&lt;a 
href="(/picture/[0-9]+/)"&gt;&lt;img class="new" src="http://st.[^"]+"; 
width</expression>
                        </RegExp>
-                       <RegExp input="$$1" output="&lt;thumb 
preview=&quot;http://www.kinopoisk.ru/images/poster/sm_\1&quot;&gt;http://www.kinopoisk.ru/images/poster/\1&lt;/thumb&gt;";
 dest="8+">
-                               <expression repeat="yes" noclean="1">&lt;a 
href="/picture/[0-9]+/"&gt;&lt;img  src="/images/poster/sm_([^"]+)" 
width</expression>
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;GetPoster&quot;&gt;http://www.kinopoisk.ru\1&lt;/url&gt;"; 
dest="8+">
+                               <expression repeat="yes" noclean="1">&lt;a 
href="(/picture/[0-9]+/)"&gt;&lt;img  src="http://st.[^"]+"; width</expression>
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="7">
                                <expression noclean="1">&lt;div 
class="navigator"&gt;(.*?)&lt;/div&gt;</expression>
@@ -276,8 +281,8 @@
        </GMP>
        <GMP_SINGLE dest="4">
                <RegExp input="$$8" output="&lt;details&gt;\1&lt;/details&gt;" 
dest="4+">
-                       <RegExp input="$$1" output="&lt;thumb 
preview=&quot;http://www.kinopoisk.ru/images/poster/sm_\1&quot;&gt;http://www.kinopoisk.ru/images/poster/\1&lt;/thumb&gt;";
 dest="8+">
-                               <expression repeat="yes" noclean="1">&lt;a 
href="/picture/[0-9]+/"&gt;&lt;img  src="/images/poster/sm_([^"]+)" 
width</expression>
+                       <RegExp input="$$1" output="&lt;url 
function=&quot;GetPoster&quot;&gt;http://www.kinopoisk.ru\1&lt;/url&gt;"; 
dest="8+">
+                               <expression repeat="yes" noclean="1">&lt;a 
href="(/picture/[0-9]+/)"&gt;&lt;img  src="http://st.[^"]+"; width</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
@@ -456,14 +461,14 @@
                        <RegExp input="$$1" output="\1" dest="9">
                                <expression clear="yes" 
noclean="1">&lt;tr&gt;&lt;td colspan=3&gt;&lt;a 
name="actor"&gt;&lt;/td&gt;&lt;/tr&gt;.+?&lt;/table&gt;(.*?)&lt;table</expression>
                        </RegExp>
-                       <RegExp conditional="!rus_actor_names" input="$$9" 
output="&lt;n&gt;\2&lt;r&gt;\3&lt;t&gt;http://www.kinopoisk.ru/images/actor/\1&lt;/e&gt;";
 dest="9">
-                               <expression repeat="yes" trim="3">&lt;img 
src="/images/(?:sm_actor/([0-9]+.jpg)|no-poster.gif)" alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;(.*?)&lt;/a&gt;&lt;b&gt;.*?&lt;/b&gt;... 
([^&lt;,]+)</expression>
+                       <RegExp conditional="!rus_actor_names" input="$$9" 
output="&lt;n&gt;\2&lt;r&gt;\3&lt;t&gt;http://st.kinopoisk.ru/images/actor/\1&lt;/e&gt;";
 dest="9">
+                               <expression repeat="yes" trim="3">&lt;img 
src="http://st.kinopoisk.ru/images/(?:sm_actor/([0-9]+.jpg)|no-poster.gif)" 
alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;(.*?)&lt;/a&gt;&lt;b&gt;.*?&lt;/b&gt;... 
([^&lt;,]+)</expression>
                        </RegExp>
-                       <RegExp conditional="rus_actor_names" input="$$9" 
output="&lt;n&gt;\2&lt;r&gt;\3&lt;t&gt;http://www.kinopoisk.ru/images/actor/\1&lt;/e&gt;";
 dest="9">
-                               <expression repeat="yes" trim="3">&lt;img 
src="/images/(?:sm_actor/([0-9]+.jpg)|no-poster.gif)" alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;([à-ÿÀ-ß][^&lt;]*)&lt;/a&gt;&lt;b&gt;.*?&lt;/b&gt;...
 ([^&lt;,]+)</expression>
+                       <RegExp conditional="rus_actor_names" input="$$9" 
output="&lt;n&gt;\2&lt;r&gt;\3&lt;t&gt;http://st.kinopoisk.ru/images/actor/\1&lt;/e&gt;";
 dest="9">
+                               <expression repeat="yes" trim="3">&lt;img 
src="http://st.kinopoisk.ru/images/(?:sm_actor/([0-9]+.jpg)|no-poster.gif)" 
alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;([à-ÿÀ-ß][^&lt;]*)&lt;/a&gt;&lt;b&gt;.*?&lt;/b&gt;...
 ([^&lt;,]+)</expression>
                        </RegExp>
                        <RegExp input="$$9" 
output="&lt;actor&gt;&lt;name&gt;\1&lt;/name&gt;&lt;role&gt;\2&lt;/role&gt;&lt;thumb&gt;\3&lt;/thumb&gt;&lt;/actor&gt;"
 dest="7">
-                               <expression repeat="yes" 
trim="3">&lt;n&gt;([^&lt;]+)&lt;r&gt;(?:èãðàåò 
|)([^&lt;]+)&lt;t&gt;(?:(http://www.kinopoisk.ru/images/actor/[0-9]+.jpg)&lt;/e&gt;|http://www.kinopoisk.ru/images/actor/&lt;/e&gt;)</expression>
+                               <expression repeat="yes" 
trim="3">&lt;n&gt;([^&lt;]+)&lt;r&gt;(?:èãðàåò 
|)([^&lt;]+)&lt;t&gt;(?:(http://st.kinopoisk.ru/images/actor/[0-9]+.jpg)&lt;/e&gt;|http://st.kinopoisk.ru/images/actor/&lt;/e&gt;)</expression>
                        </RegExp>
                        <!-- remove &nbsp; from actor roles -->
                        <RegExp input="$$7" output="\1&amp;nbsp;" dest="7">
@@ -476,14 +481,14 @@
                        <RegExp input="$$1" output="\1" dest="8">
                                <expression clear="yes" 
noclean="1">&lt;tr&gt;&lt;td colspan=3&gt;&lt;a 
name="director"&gt;&lt;/td&gt;&lt;/tr&gt;.+?&lt;/table&gt;(.*?)&lt;table</expression>
                        </RegExp>
-                       <RegExp input="$$8" 
output="&lt;director&gt;\2&lt;/director&gt;" dest="7+">
-                               <expression repeat="yes" trim="3">&lt;img 
src="([^"]+)" alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;([^&lt;]+)&lt;/a&gt;</expression>
+                       <RegExp input="$$8" 
output="&lt;director&gt;\1&lt;/director&gt;" dest="7+">
+                               <expression repeat="yes" trim="3">&lt;img 
src="[^"]+" alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;([^&lt;]+)&lt;/a&gt;</expression>
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="8">
                                <expression clear="yes" 
noclean="1">&lt;tr&gt;&lt;td colspan=3&gt;&lt;a 
name="writer"&gt;&lt;/td&gt;&lt;/tr&gt;(.*?)&lt;table</expression>
                        </RegExp>
-                       <RegExp input="$$8" 
output="&lt;credits&gt;\2&lt;/credits&gt;" dest="7+">
-                               <expression repeat="yes" trim="3">&lt;img 
src="([^"]+)" alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;([^&lt;]+)&lt;/a&gt;</expression>
+                       <RegExp input="$$8" 
output="&lt;credits&gt;\1&lt;/credits&gt;" dest="7+">
+                               <expression repeat="yes" trim="3">&lt;img 
src="[^"]+" alt=.+?&lt;p&gt;&lt;a 
href="/level/4/people/\d+/"&gt;([^&lt;]+)&lt;/a&gt;</expression>
                        </RegExp>
                        <expression noclean="1"/>
                </RegExp>
diff --git a/metadata.kinopoisk.ru/resources/language/English/strings.xml 
b/metadata.kinopoisk.ru/resources/language/English/strings.xml
index b565286..75c260e 100644
--- a/metadata.kinopoisk.ru/resources/language/English/strings.xml
+++ b/metadata.kinopoisk.ru/resources/language/English/strings.xml
@@ -11,5 +11,6 @@
     <string id="30008">Search IMDB ID with world premier year</string>
     <string id="30009">Force searching IMDB ID with google</string>
     <string id="30010">Get rating from KinoPoisk</string>
-    <string id="30011">Get only actors with names translated to 
russian</string>   
+    <string id="30011">Get only actors with names translated to 
russian</string>
+    <string id="30012">Download posters from KinoPoisk.ru</string>   
 </strings>
diff --git a/metadata.kinopoisk.ru/resources/language/Russian/strings.xml 
b/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
index 93138af..c9448a1 100644
--- a/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
+++ b/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
@@ -12,4 +12,5 @@
     <string id="30009">Ð²ÑÐµÐ³Ð´Ð° Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ google Ð´Ð»Ñ 
Ð¿Ð¾Ð¸ÑÐºÐ° IMDB ID</string>
     <string id="30010">ÑÐµÐ¹ÑÐ¸Ð½Ð³ KinoPoisk</string>
     <string id="30011">Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ ÑÐ¾Ð»ÑÐºÐ¾ 
Ð¿ÐµÑÐµÐ²ÐµÐ´ÑÐ½Ð½ÑÑ Ð°ÐºÑÑÑÐ¾Ð²</string>
+    <string id="30012">Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ Ð¿Ð¾ÑÑÐµÑÑ Ñ ÑÐ°Ð¹ÑÐ° 
KinoPoisk.ru</string>   
 </strings>
diff --git a/metadata.kinopoisk.ru/resources/settings.xml 
b/metadata.kinopoisk.ru/resources/settings.xml
index 102ae17..59d4319 100644
--- a/metadata.kinopoisk.ru/resources/settings.xml
+++ b/metadata.kinopoisk.ru/resources/settings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
+    <setting label="30012" type="bool" id="posters_from_kinopoisk" 
default="true"/>
+    <setting type="sep" />
     <setting label="30007" type="bool" id="search_imdb_ID" default="true"/>
     <setting label="30008" type="bool" id="use_world_premier" default="true" 
enable="eq(-1,true)"/>
     <setting label="30009" type="bool" id="google_search" default="false" 
enable="eq(-2,true)"/>

-----------------------------------------------------------------------

Summary of changes:
 metadata.kinopoisk.ru/addon.xml                    |    2 +-
 metadata.kinopoisk.ru/changelog.Russian.txt        |    4 ++
 metadata.kinopoisk.ru/changelog.txt                |    4 ++
 metadata.kinopoisk.ru/kinopoisk.xml                |   37 +++++++++++--------
 .../resources/language/English/strings.xml         |    3 +-
 .../resources/language/Russian/strings.xml         |    1 +
 metadata.kinopoisk.ru/resources/settings.xml       |    2 +
 7 files changed, 35 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d

_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

[Xbmc-addons] Scrapers branch, dharma, updated. 8858ed6ea3a00fdeee7d3237b778db79c986f970

Reply via email to