The branch, dharma has been updated
       via  f3d69e9b54e484fc4dd3371b252e11ca483fbd90 (commit)
      from  a87335b69496c8e773a75d5db0e33ee56fddd772 (commit)

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

commit f3d69e9b54e484fc4dd3371b252e11ca483fbd90
Author: olympia <[email protected]>
Date:   Fri Oct 28 16:21:21 2011 +0200

    [metadata.imdb.com] updated to version 2.3.0

diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index b1d6657..933dff1 100644
--- a/metadata.imdb.com/addon.xml
+++ b/metadata.imdb.com/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.imdb.com"
        name="IMDb"
-        version="2.2.6"
+        version="2.3.0"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
@@ -10,6 +10,7 @@
     <import addon="metadata.common.imdb.com" version="2.1.2"/>
     <import addon="metadata.common.impa.com" version="1.0.3"/>
     <import addon="metadata.common.hdtrailers.net" version="1.0.6"/>
+    <import addon="metadata.common.youtubetrailers" version="1.0.2"/>
   </requires>
   <extension point="xbmc.metadata.scraper.movies"
              language="en"
@@ -17,21 +18,21 @@
   <extension point="xbmc.addon.metadata">
     <summary lang="en">IMDB Movie Scraper</summary>
     <summary lang="hu">IMDB filmadat leolvasó</summary>
-    <summary lang="kr">IMDB 영화 스크래퍼</summary>
+    <summary lang="kr">IMDB ?? ????</summary>
     <summary lang="nl">IMDB film Scraper</summary>
     <summary lang="pl">Scraper filmów IMDb</summary>
     <summary lang="pt">Scraper de filmes IMDb</summary>
     <summary lang="se">IMDB Filmskrapa</summary>
     <description lang="en">Download Movie information from www.imdb.com
 The Internet Movie Database (IMDb) is a HUGE collection of movie information. 
They try to catalog every pertinent detail about a movie, from who was in it, 
to who made it, to trivia about it, to filming locations, and even where you 
can find reviews and fan sites on the web. They then do their best to present 
this information in a manner that is easy to search and access.</description>
-    <description lang="hu">Film információk letöltése a www.imdb.com 
webhelyről.
-Az Internet Film Adatbázis (IMDb) egy hatalmas film információ 
gyüjtemény. Itt megpróbálják katalogizálni a filmek minden egyes apró 
részletét a szereplőktől a készítőkön át, a forgatási helyszínekig, 
még azt is, hogy hol találsz leírásokat fan oldalakat a web-en az adott 
filmről. Mindezt úgy téve, hogy az információ egyszerűen elérhető és 
könnyen kereshető legyen.</description>
-    <description lang="kr">www.imdb.com 에서 영화 정보를 다운로드
-The Internet Movie Database (IMDb) 는 거대한 영화 정보를 가지고 
있습니다. IMDB는 누구 출연 했는지, 누가 만들었는지, 
촬영장소, 리뷰가 있는 곳, 팬사이트 같은 모든 세부적인 
정보를 수집하고 있습니다. 그리고 검색과 사용이 
편리하도록 정보를 보여주고 있습니다.</description>
+    <description lang="hu">Film információk letöltése a www.imdb.com 
webhelyr?l.
+Az Internet Film Adatbázis (IMDb) egy hatalmas film információ 
gyüjtemény. Itt megpróbálják katalogizálni a filmek minden egyes apró 
részletét a szerepl?kt?l a készít?kön át, a forgatási helyszínekig, 
még azt is, hogy hol találsz leírásokat fan oldalakat a web-en az adott 
filmr?l. Mindezt úgy téve, hogy az információ egyszer?en elérhet? és 
könnyen kereshet? legyen.</description>
+    <description lang="kr">www.imdb.com ?? ?? ??? ????
+The Internet Movie Database (IMDb) ? ??? ?? ??? ??? ????. IMDB? ?? ?? ???, ?? 
?????, ????, ??? ?? ?, ???? ?? ?? ???? ??? ???? ????. ??? ??? ??? ????? ??? 
???? ????.</description>
     <description lang="nl">Download film informatie van www.imdb.com
 De Internet Movie Database (IMDB) bevat een GIGANTISCHE collectie aan 
filminformatie. Ze proberen elk pertinent detail van elke film te catalogeren: 
wie er meespeelde, de makers, weetjes rond de film, film locatie en zelf waar 
je extra reviews en fansites kunt vinden. Ze doen hun best om al deze gegevens 
weer te geven in een zeer toegankelijke manier.</description>
     <description lang="pl">Pobieraj informacje o filmach z www.imdb.com
-IMDb jest POTĘŻNĄ kolekcją informacji o filmach. Serwis zajmuje się 
gromadzeniem każdych (nawet najdrobniejszych) informacji o 
filmach.</description>
+IMDb jest POT??N? kolekcj? informacji o filmach. Serwis zajmuje si? 
gromadzeniem ka?dych (nawet najdrobniejszych) informacji o 
filmach.</description>
     <description lang="pt">Descarregar informação de filmes de www.imdb.com
 A Internet Movie Database (IMDb) é uma coleccção enorme de informação de 
filmes. Tentam catalogar cada detalhe pertinente sobre um filme, quem actuou 
nele, quem o produziu, curiosidades sobre o filme, locais de filmagem e até 
mesmo onde pode encontrar críticas e clubes de fans na Internet. A 
organização de todos os dados é de procura fácil, permitindo um rápido 
acesso a todos os detalhes.</description>
     <description lang="se">Ladda ner filminformation från www.imdb.com
diff --git a/metadata.imdb.com/changelog.txt b/metadata.imdb.com/changelog.txt
index 7d5e966..a9c19c9 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.3.0[/B]
+- added: option to scrape trailer links directly from YouTube, credits to 
ZackDepp
+
 [B]2.2.6[/B]
 - fixed: Originaltitle some time contains 'IMDb - ' string
 
diff --git a/metadata.imdb.com/imdb.xml b/metadata.imdb.com/imdb.xml
index def5c5b..1c23de6 100644
--- a/metadata.imdb.com/imdb.xml
+++ b/metadata.imdb.com/imdb.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2011-03-15">
+<?xml version="1.0" encoding="UTF-8"?>
+<scraper framework="1.1" date="2011-10-28">
        <NfoUrl dest="3">
                <RegExp input="$$1" 
output="&lt;url&gt;http://akas.imdb.com/title/tt\1/&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;";
 dest="3">
                        <expression clear="yes" 
noclean="1">imdb....?/Title\?([0-9]*)</expression>
@@ -107,6 +107,15 @@
                        <RegExp conditional="fanart" input="$$2" 
output="&lt;chain 
function=&quot;GetTMDBFanartByIdChain&quot;&gt;$$2&lt;/chain&gt;" dest="5+">
                                <expression/>
                        </RegExp>
+                       <RegExp conditional="ytrailer" input="$$1" 
output="&lt;chain 
function=&quot;GetYoutubeTrailer&quot;&gt;$$6=$$9&lt;/chain&gt;" dest="5+">
+                               <RegExp input="$$1" output="\2" dest="6">
+                                       <expression>&lt;meta 
name=&quot;title&quot; content=&quot;(IMDb - 
)?(?:&amp;#x22;)?([^&quot;]*?)(?:&amp;#x22;)? \([^\(]*?([0-9]{4})\)</expression>
+                               </RegExp>
+                               <RegExp input="$$1" output="\2" dest="9">
+                                       <expression>&lt;meta 
name=&quot;title&quot; content=&quot;([^&quot;]*?) 
\([^\(]*?([0-9]{4})\)</expression>
+                               </RegExp>
+                               <expression/>
+                       </RegExp>
                        <RegExp input="$INFO[TrailerQ]" output="&lt;chain 
function=&quot;GetHDTrailersnet480p&quot;&gt;$$6&lt;/chain&gt;" dest="5+">
                                <RegExp input="$$1" output="\1" dest="6">
                                        <expression>&lt;meta 
name=&quot;title&quot; 
content=&quot;(?:&amp;#x22;)?([^&quot;]*?)(?:&amp;#x22;)? 
\([^\(]*?([0-9]{4})\)</expression>
diff --git a/metadata.imdb.com/resources/language/English/strings.xml 
b/metadata.imdb.com/resources/language/English/strings.xml
index 29aeacd..f13d10d 100644
--- a/metadata.imdb.com/resources/language/English/strings.xml
+++ b/metadata.imdb.com/resources/language/English/strings.xml
@@ -6,6 +6,7 @@
     <string id="30002">Enable posters from themoviedb.org</string>
     <string id="30003">Enable posters from IMPAwards</string>
     <string id="30004">Enable posters from MoviePosterDB</string>
+    <string id="30005">Get Trailers directly from YouTube</string>
     <string id="30006">Enable trailers from HD-Trailers.net</string>
     <string id="30007">IMDb Poster &amp; Actor Thumb(s) Size</string>
     <string id="30008">Preferred Title Language from</string>
diff --git a/metadata.imdb.com/resources/language/Hungarian/strings.xml 
b/metadata.imdb.com/resources/language/Hungarian/strings.xml
index 258d439..2f02143 100644
--- a/metadata.imdb.com/resources/language/Hungarian/strings.xml
+++ b/metadata.imdb.com/resources/language/Hungarian/strings.xml
@@ -6,6 +6,7 @@
     <string id="30002">Poszter letöltés a themoviedb.org-ról</string>
     <string id="30003">Poszter letöltés az IMPAwards-ról</string>
     <string id="30004">Poszter letöltés a MoviePosterDB-ról</string>
+    <string id="30004">Filmelőzetes közvetlenül a YouTube-ról</string>
     <string id="30006">Filmelőzetes a HD-Trailers.net-ről</string>
     <string id="30007">IMDb poszter &amp; színész bélyegképek 
mérete</string>
     <string id="30008">Filmcím a következő országból:</string>
diff --git a/metadata.imdb.com/resources/settings.xml 
b/metadata.imdb.com/resources/settings.xml
index 297b010..bb6e58d 100644
--- a/metadata.imdb.com/resources/settings.xml
+++ b/metadata.imdb.com/resources/settings.xml
@@ -6,6 +6,7 @@
     <setting type="sep"/>
     <setting label="30001" type="bool" id="fanart" default="true"/>
     <setting type="sep"/>
+    <setting label="30005" type="bool" id="ytrailer" default="no"/>
     <setting label="30006" type="labelenum" values="No|480p|720p|1080p" 
id="TrailerQ" default="480p"/>
     <setting type="sep"/>
     <setting label="30008" type="labelenum" values="Keep Original|USA / 
International|Argentina|Austria|Belgium|Brazil|Bulgaria|Canada|China|Colombia|Chile|Croatia|Czech
 Republic|Denmark|Finland|France|Germany|Greece|Hong 
Kong|Hungary|Iceland|India|Israel|Italy|Japan|Mexico|Netherlands|Norway|Pakistan|Poland|Portugal|Romania|Russia|Serbia|Singapore|Slovenia|Spain|Sweden|Switzerland|Thailand|Turkey|Uruguay|Venezuela"
 id="akatitles" default="Keep Original"/>

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

Summary of changes:
 metadata.common.youtubetrailers/addon.xml          |   34 ++++++++
 metadata.common.youtubetrailers/youtube.xml        |   82 ++++++++++++++++++++
 metadata.imdb.com/addon.xml                        |   15 ++--
 metadata.imdb.com/changelog.txt                    |    3 +
 metadata.imdb.com/imdb.xml                         |   13 +++-
 .../resources/language/English/strings.xml         |    1 +
 .../resources/language/Hungarian/strings.xml       |    1 +
 metadata.imdb.com/resources/settings.xml           |    1 +
 8 files changed, 141 insertions(+), 9 deletions(-)
 create mode 100644 metadata.common.youtubetrailers/addon.xml
 create mode 100644 metadata.common.youtubetrailers/youtube.xml


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn 
about Cisco certifications, training, and career opportunities. 
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to