diff options
| author | theuni <theuni-nospam-@xbmc.org> | 2011-12-10 23:50:21 -0500 |
|---|---|---|
| committer | theuni <theuni-nospam-@xbmc.org> | 2011-12-10 23:50:21 -0500 |
| commit | e8099a5261302a6dbedad485f4a350bf362fa1ac (patch) | |
| tree | 4039217d1385bf0a9ab106bf6ee93527aea44c60 | |
| parent | 555e08116675e2266f925b42207f7ea166678d17 (diff) | |
sync: tvdb with addons repo
7 files changed, 31 insertions, 33 deletions
diff --git a/addons/metadata.tvdb.com/addon.xml b/addons/metadata.tvdb.com/addon.xml index 0f12599b5e..4e5631bc08 100644 --- a/addons/metadata.tvdb.com/addon.xml +++ b/addons/metadata.tvdb.com/addon.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <addon id="metadata.tvdb.com" name="The TVDB" - version="1.0.8" + version="1.2.3" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> @@ -13,15 +13,13 @@ <extension point="xbmc.addon.metadata"> <summary lang="en">Fetch TV show metadata from TheTVDB.com</summary> <summary lang="de">Scraper für Fernsehserien von TheTVDB.com</summary> - <summary lang="es">Descarga información de Series de TV de TVDB.com</summary> + <summary lang="es">Descarga información de Series de TV desde TVDB.com</summary> <summary lang="fr">Scraper TheTVDB.com pour les séries TV</summary> <summary lang="hu">TV műsor információk a TheTVDB.com-ról</summary> <summary lang="nl">Seriemetadata ophalen van TheTVDB.com</summary> <summary lang="pl">Pobieraj dane o serialach TV z TheTVDB.com</summary> <summary lang="pt">Scraper de séries de TV TVDB.com</summary> - <summary lang="ro">Catalog de seriale TheTVDB.com</summary> <summary lang="ru">Загрузка информации о ТВ-шоу с TheTVDB.com</summary> - <summary lang="se">Hämta TV-serieinformation från TheTVDB.com</summary> <summary lang="zh">从TheTVDB.com获取电视剧集信息</summary> <description lang="en">TheTVDB.com is a TV Scraper. The site is a massive open database that can be modified by anybody and contains full meta data for many shows in different languages. All content and images on the site have been contributed by their users for users and have a high standard or quality. The database schema and website are open source under the GPL.</description> <description lang="de">TheTVDB.com ist ein Scraper für TV-Serien. Die Seite hat eine riesige offene Datenbank, welche von jedem geändert werden kann. Sie enthält weitreichende Meta-Daten für viele TV-Serien in verschiedenen Sprachen. Alle Inhalte und Bilder dieser Seite stammen von User für User und haben eine hohe Qualität. Das Datenbankschema und die Webseite sind OpenSource unter dem GPL-Recht</description> @@ -31,9 +29,7 @@ <description lang="nl">TheTVDB.com is een seriescraper. De site is een gigantische open databank die iedereen kan aanpassen en uitbreiden, en biedt metadata aan voor TV-series in verschillende talen. Alle inhoud en afbeeldingen zijn afkomstig van gebruikers en moeten een grondige kwaliteitscontrole doorstaan. Het databankschema en de websitecode zijn vrijgegeven onder de open source GPL-licentie.</description> <description lang="pl">TheTVDB.com jest scraperem TV. Ten serwis jest ogromną, wielojęzykową i otwartą bazą danych o serialach, którą może edytować każdy. Zawartość tego serwisu została dostarczona przez użytkowników, dla użytkowników. Dostępne materiały mają wysoki standard lub jakość.</description> <description lang="pt"> O TheTVDB.com é um motor de busca para séries de TV. O site é uma gigantesca base de dados aberta que pode ser alterada por qualquer pessoa e contém informação em várias línguas. Todos os conteúdos do site foram enviados por utilizadores com um elevado padrão de qualidade. A base de dados e site funcionam sob uma licença GPL de software livre.</description> - <description lang="ro">TheTVDB.com este un catalog de filme seriale. Site-ul este o bază de date publică, masivă care poate fi modificată de oricine și conține informații complete în limbi diferite pentru multe seriale. Tot conținutul și imaginile de pe site au fost adăugate de utilizatori și au un standard înalt de calitate. Schema bazei de date și site-ul web au sursă deschisă și licență GPL.</description> <description lang="ru">TheTVDB.com это обработчик для ТВ-шоу. Сайт представляет собой массивную открытую базу данных, которая может быть изменене кем угодно и содержит полные мета-данные для многих шоу и сериалов на различных языках. Все содержанимое и изображения на сайте были выложены его пользователями для пользователей, и имеют высокий уровень или качество. Схемы базы данных и веб-сайт выполнены под открытым исходным кодом и доступны по лицензии GPL.</description> - <description lang="se">TheTVDB.com är en TV-skrapa. Sajten är en massiv öppen databas som kan modifieras av vem som helst och innehåller all metadata för många serier på olika språk. Allt innehåll och bildmaterial har bidragits från användarna till användare och har en hög standard och kvalitet. Databasschemat och webbsidan är öppet under GPL-licens.</description> <description lang="zh">TheTVDB.com是一个电视刮削器。该网站是一个巨大的开放式数据库，任何人都可以修改，包含多语言的许多电视剧集资料。网站设定了高品质标准，所有图片和内容都由用户提供。数据库结构和网站均在GPL许可下开源。</description> <platform>all</platform> </extension> diff --git a/addons/metadata.tvdb.com/changelog.txt b/addons/metadata.tvdb.com/changelog.txt index 07b60a8bc9..607650470d 100644 --- a/addons/metadata.tvdb.com/changelog.txt +++ b/addons/metadata.tvdb.com/changelog.txt @@ -1,3 +1,21 @@ +[B]1.2.3[/B] +- Fixed: fixed broken scraping under certain circumtaces + +[B]1.2.2[/B] +- Fixed: episodeguide url won't picked up sometimes + +[B]1.2.1[/B] +- Fixed: won't parse longer search results + +[B]1.2.0[/B] +- Added: episode runtime scraping + +[B]1.1.1[/B] +- Fixed: episodeguide url won't picked up sometimes + +[B]1.1.0[/B] +- Added: support decimals in episode numbers for DVD ordering + [B]1.0.8[/B] - Fixed: fallback to other image languages if preferred doesn't exist diff --git a/addons/metadata.tvdb.com/resources/language/Portuguese/strings.xml b/addons/metadata.tvdb.com/resources/language/Portuguese/strings.xml index 27c11892ef..00657d8020 100644 --- a/addons/metadata.tvdb.com/resources/language/Portuguese/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Portuguese/strings.xml @@ -3,6 +3,6 @@ <string id="30000">Usar ordem do DVD</string> <string id="30001">Usar ordem absoluta (Temporada única)</string> <string id="30002">Ligar Fanart</string> - <string id="30003">Preferir posters</string> - <string id="30004">Linguagem</string> + <string id="30003">Preferir pósters</string> + <string id="30004">Lingua</string> </strings> diff --git a/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml b/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml deleted file mode 100644 index 84c2cbf0eb..0000000000 --- a/addons/metadata.tvdb.com/resources/language/Romanian/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<strings> - <string id="30000">Folosește ordonare DVD</string> - <string id="30001">Folosește ordonare absolută (un singur sezon)</string> - <string id="30002">Activează Fanart</string> - <string id="30003">Preferă afișe</string> - <string id="30004">Limbă</string> -</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml b/addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml deleted file mode 100644 index 2011be8f27..0000000000 --- a/addons/metadata.tvdb.com/resources/language/Slovenian/strings.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<strings> - <string id="30000">Uporabi zaporedje DVDja</string> - <string id="30001">Uporabi absolutno zaporedje (ena sezona)</string> - <string id="30002">Vključi ozadja</string> - <string id="30003">Prenesi plakate</string> - <string id="30004">Jezik</string> -</strings> diff --git a/addons/metadata.tvdb.com/resources/language/Spanish/strings.xml b/addons/metadata.tvdb.com/resources/language/Spanish/strings.xml index 29853e3938..5010e79f60 100644 --- a/addons/metadata.tvdb.com/resources/language/Spanish/strings.xml +++ b/addons/metadata.tvdb.com/resources/language/Spanish/strings.xml @@ -1,7 +1,7 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> <strings> <string id="30000">Usar orden de DVD</string> - <string id="30001">Usar Orden Absoluto (Temporada única)</string> + <string id="30001">Usar Orden Absoluto (Temporada nica)</string> <string id="30002">Descargar Fanart</string> <string id="30003">Preferir Posters</string> <string id="30004">Idioma</string> diff --git a/addons/metadata.tvdb.com/tvdb.xml b/addons/metadata.tvdb.com/tvdb.xml index 26f0a11761..cbd733d717 100644 --- a/addons/metadata.tvdb.com/tvdb.xml +++ b/addons/metadata.tvdb.com/tvdb.xml @@ -30,11 +30,8 @@ <!-- input: $1=html $2=search query --> <!-- returns: results in xml format <results><movie><title>*</title><url>*</url>*#urls<extra>*</extra></movie>*</results> --> <GetSearchResults dest="1"> - <RegExp output="\1" dest="3"> - <expression noclean="1"><Data>(.*)</Data></expression> - </RegExp> <RegExp input="$$4" output="<?xml version="1.0" encoding="utf-8" standalone="yes"?><results>\1</results>" dest="1"> - <RegExp input="$$3" output="<entity><title>\3</title><language>\2</language><url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/\2.zip</url><id>\1</id></entity>" dest="4"> + <RegExp input="$$1" output="<entity><title>\3</title><language>\2</language><url cache="\1.xml">http://www.thetvdb.com/api/1D62F2F90030C444/series/\1/all/\2.zip</url><id>\1</id></entity>" dest="4"> <expression repeat="yes"><seriesid>([0-9]*)</seriesid>[^<]*<language>([^<]*)</language>[^<]*<SeriesName>([^<]*)</SeriesName></expression> </RegExp> <expression noclean="1"/> @@ -147,8 +144,8 @@ <!-- returns: results in xml format <episodeguide><episode><title>*</title><url>*</url><season>*</season><epnum>*</epnum><thumb>*</thumb><id>*</id><aired>*</aired></episode>*</episodeguide> !--> <GetEpisodeList dest="3"> <RegExp input="$$4" output="<episodeguide>\1</episodeguide>" dest="3"> - <RegExp input="$$2" output="\1" dest="10"> - <expression>http://www.thetvdb.com/api/1D62F2F90030C444/series/([0-9]*)/all/$INFO[language].zip</expression> + <RegExp input="$$2" output="\2" dest="10"> + <expression>http://(?:www\.)thetvdb.com/api/(.+)/series/([0-9]*)/all/(.+).zip</expression> </RegExp> <RegExp conditional="!dvdorder"> <!-- Regular episodes (Absolute order) --> @@ -166,7 +163,7 @@ </RegExp> <!-- DVD order --> <RegExp conditional="dvdorder" input="$$1" output="<episode><title>\4</title><url cache="$$10.xml">$$2</url><epnum>\2</epnum><season>\3</season><id>\1</id><aired>\5</aired></episode>" dest="4"> - <expression repeat="yes"><Episode>.*?<id>([0-9]+).*?<Combined_episodenumber>([0-9]+).*?<Combined_season>([0-9]+).*?<EpisodeName>([^<]*).*?<FirstAired>([^<]*)</FirstAired>.*?</Episode></expression> + <expression repeat="yes"><Episode>.*?<id>([0-9]+).*?<Combined_episodenumber>([^<]*).*?<Combined_season>([^<]*).*?<EpisodeName>([^<]*).*?<FirstAired>([^<]*)</FirstAired>.*?</Episode></expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -254,6 +251,9 @@ <RegExp input="$$8" output="<rating>\1</rating>" dest="4+"> <expression><Rating>([^<]+)</Rating></expression> </RegExp> + <RegExp input="$$1" output="<runtime>\1</runtime>" dest="4+"> + <expression><Runtime>([^<]+)</Runtime></expression> + </RegExp> <expression noclean="1"/> </RegExp> </GetEpisodeDetails> |