[Xbmc-addons] Scrapers branch, dharma, updated. a83c07e8748fd5d7394e3f08033a52fed1195e71

Mon, 13 Dec 2010 07:44:44 -0800 

The branch, dharma has been updated
       via  a83c07e8748fd5d7394e3f08033a52fed1195e71 (commit)
      from  b63db0b3b17f2b7fcd1953d9e220e76ea181b324 (commit)

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

commit a83c07e8748fd5d7394e3f08033a52fed1195e71
Author: olympia <[email protected]>
Date:   Mon Dec 13 16:43:27 2010 +0100

    [metadata.kinopoisk.ru] updated to version 1.0.19

diff --git a/metadata.kinopoisk.ru/addon.xml b/metadata.kinopoisk.ru/addon.xml
index 685ec08..c23a428 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.18"
+       version="1.0.19"
        provider-name="hamp + akara">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.kinopoisk.ru/changelog.txt 
b/metadata.kinopoisk.ru/changelog.txt
index d758ca2..0ff19f8 100644
--- a/metadata.kinopoisk.ru/changelog.txt
+++ b/metadata.kinopoisk.ru/changelog.txt
@@ -1,3 +1,5 @@
+1.0.19:
+- Added option for scraping only actors with translated names
 1.0.18:
 - New search web layout
 - Removed "3D" from movie title
diff --git a/metadata.kinopoisk.ru/kinopoisk.xml 
b/metadata.kinopoisk.ru/kinopoisk.xml
index 7746b05..d8a14fe 100644
--- a/metadata.kinopoisk.ru/kinopoisk.xml
+++ b/metadata.kinopoisk.ru/kinopoisk.xml
@@ -36,10 +36,10 @@
                        </RegExp>
                        <!--Êîä åñëè íàéäåíî íåñêîëüêî âàðèàíòîâ-->
                        <RegExp conditional="!search_originaltitle" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url&gt;http://www.kinopoisk.ru/level/1/film/\1|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20i686%3B%20en-US%3B%20rv%3A1.8.1.14)%20Gecko%2F20080418%20Ubuntu%2F7.10%20(gutsy)%20Firefox%2F2.0.0.14&lt;/url&gt;&lt;/entity&gt;"
 dest="5+">
-                               <expression repeat="yes">&lt;p 
class="name"&gt;&lt;a 
href="/level/1/film/(\d+)/sr/1/"&gt;(.+?)&lt;/a&gt;.+?m_act\[year\]/(\d+)/"&gt;</expression>
+                               <expression repeat="yes">&lt;p 
class="name"&gt;&lt;a 
href="/level/1/film/(\d+)/sr/1/"&gt;(.+?)&lt;/a&gt;[^&gt;]*?class="year"&gt;(\d+)&lt;</expression>
                        </RegExp>
                        <RegExp conditional="search_originaltitle" input="$$1" 
output="&lt;entity&gt;&lt;title&gt;\2 
[\4]&lt;/title&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url&gt;http://www.kinopoisk.ru/level/1/film/\1|User-Agent=Mozilla%2F5.0%20(X11%3B%20U%3B%20Linux%20i686%3B%20en-US%3B%20rv%3A1.8.1.14)%20Gecko%2F20080418%20Ubuntu%2F7.10%20(gutsy)%20Firefox%2F2.0.0.14&lt;/url&gt;&lt;/entity&gt;"
 dest="5+">
-                               <expression repeat="yes">&lt;p 
class="name"&gt;&lt;a 
href="/level/1/film/(\d+)/sr/1/"&gt;(.+?)&lt;/a&gt;.+?m_act\[year\]/(\d+)/"&gt;.*?class="gray"&gt;(?:(?:\d+
 ìèí)|)(.*?)(?:(?:, \d+ ìèí)|)&lt;</expression>
+                               <expression repeat="yes">&lt;p 
class="name"&gt;&lt;a 
href="/level/1/film/(\d+)/sr/1/"&gt;(.+?)&lt;/a&gt;[^&gt;]*?class="year"&gt;(\d+)&lt;.*?class="gray"&gt;(?:(?:\d+
 ìèí)|)(.*?)(?:(?:, \d+ ìèí)|)&lt;</expression>
                        </RegExp>
                        <!-- fix html entities from titles-->
                        <RegExp conditional="search_originaltitle" input="$$5" 
output="\1[]&amp;laquo;&amp;raquo;&amp;nbsp;" dest="5">
@@ -451,9 +451,12 @@
                        <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;tr&gt;&lt;td 
colspan=3&gt;&lt;a name="producer"&gt;&lt;/td&gt;&lt;/tr&gt;</expression>
                        </RegExp>
-                       <RegExp 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">
+                       <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>
+                       <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>
                        <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>
                        </RegExp>
diff --git a/metadata.kinopoisk.ru/resources/language/English/strings.xml 
b/metadata.kinopoisk.ru/resources/language/English/strings.xml
index 1f8c620..b565286 100644
--- a/metadata.kinopoisk.ru/resources/language/English/strings.xml
+++ b/metadata.kinopoisk.ru/resources/language/English/strings.xml
@@ -10,5 +10,6 @@
     <string id="30007">Search IMDB ID</string>
     <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="30010">Get rating from KinoPoisk</string>
+    <string id="30011">Get only actors with names translated to 
russian</string>   
 </strings>
diff --git a/metadata.kinopoisk.ru/resources/language/Russian/strings.xml 
b/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
index 3ca41db..93138af 100644
--- a/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
+++ b/metadata.kinopoisk.ru/resources/language/Russian/strings.xml
@@ -11,4 +11,5 @@
     <string id="30008">искать год премьеры для IMDB 
ID</string>
     <string id="30009">всегда использовать google для 
поиска IMDB ID</string>
     <string id="30010">рейтинг KinoPoisk</string>
+    <string id="30011">загружать только 
переведённых актёров</string>
 </strings>
diff --git a/metadata.kinopoisk.ru/resources/settings.xml 
b/metadata.kinopoisk.ru/resources/settings.xml
index fda306d..102ae17 100644
--- a/metadata.kinopoisk.ru/resources/settings.xml
+++ b/metadata.kinopoisk.ru/resources/settings.xml
@@ -14,4 +14,6 @@
     <setting label="30003" type="bool" id="download_hd" default="true" 
enable="eq(-1,true)"/>
     <setting label="30004" type="labelenum" values="Low|Medium|High" 
id="TrailerQ" default="High" enable="eq(-2,true)"/>
     <setting label="30005" type="bool" id="orig_trailer" default="false" 
enable="eq(-3,true)"/>
+    <setting type="sep" />
+    <setting label="30011" type="bool" id="rus_actor_names" default="false"/>
 </settings>

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

Summary of changes:
 metadata.kinopoisk.ru/addon.xml                    |    2 +-
 metadata.kinopoisk.ru/changelog.txt                |    2 ++
 metadata.kinopoisk.ru/kinopoisk.xml                |    9 ++++++---
 .../resources/language/English/strings.xml         |    3 ++-
 .../resources/language/Russian/strings.xml         |    1 +
 metadata.kinopoisk.ru/resources/settings.xml       |    2 ++
 6 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Scrapers


------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages, 
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev 
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to