diff options
Diffstat (limited to 'addons/metadata.tvdb.com')
| -rw-r--r-- | addons/metadata.tvdb.com/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.tvdb.com/changelog.txt | 19 | ||||
| -rw-r--r-- | addons/metadata.tvdb.com/tvdb.xml | 130 |
3 files changed, 85 insertions, 66 deletions
diff --git a/addons/metadata.tvdb.com/addon.xml b/addons/metadata.tvdb.com/addon.xml index 1e91ce0d08..f8faed97af 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="3.0.1" + version="3.0.7" provider-name="Team Kodi"> <requires> <import addon="xbmc.metadata" version="2.1.0"/> diff --git a/addons/metadata.tvdb.com/changelog.txt b/addons/metadata.tvdb.com/changelog.txt index fdd47553c4..b7eb058965 100644 --- a/addons/metadata.tvdb.com/changelog.txt +++ b/addons/metadata.tvdb.com/changelog.txt @@ -1,3 +1,22 @@ +[B]3.0.7[/B] +- Fixed: Episode list changes + +[B]3.0.6[/B] +- Fixed: artwork won't be scraped (again) +- Fixed: Episode director/guest star mix-ups + +[B]3.0.5[/B] +- fixed: fanart preview + +[B]3.0.4[/B] +- fixed: artwork won't be scraped + +[B]3.0.3[/B] +- fixed: Spaces fix 2 + +[B]3.0.2[/B] +- fixed: Spaces removed from json regexes + [B]3.0.1[/B] - fixed: Uniqueids fixes diff --git a/addons/metadata.tvdb.com/tvdb.xml b/addons/metadata.tvdb.com/tvdb.xml index 801c7f4bdd..acd90c6d71 100644 --- a/addons/metadata.tvdb.com/tvdb.xml +++ b/addons/metadata.tvdb.com/tvdb.xml @@ -24,7 +24,7 @@ <NfoUrlAuth dest="3" clearbuffers="no"> <RegExp input="$$19" output="<details><url cache="$$6-$INFO[language].xml">https://api.thetvdb.com/series/$$6|Authorization=Bearer%20\1&accept-language=$INFO[language]</url><id>$$6</id></details>" dest="3"> <RegExp input="$$1" output="\1" dest="19"> - <expression>"token": "(.*)"</expression> + <expression>"token":\s*?"(.*)"</expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -32,14 +32,14 @@ <GetTVDBId dest="3" clearbuffers="no"> <RegExp input="$$19" output="<details><url function="GetTVDBIdAuth" cache="search-$$7-$INFO[language].json">https://api.thetvdb.com/search/series?imdbId=$$7|Authorization=Bearer%20\1&accept-language=$INFO[language]</url></details>" dest="3"> <RegExp input="$$1" output="\1" dest="19"> - <expression>"token": "(.*)"</expression> + <expression>"token":\s*?"(.*)"</expression> </RegExp> <expression noclean="1"/> </RegExp> </GetTVDBId> <GetTVDBIdAuth dest="3" clearbuffers="no"> <RegExp input="$$1" output="<details><url cache="\1-$INFO[language].xml">https://api.thetvdb.com/series/\1|Authorization=Bearer%20$$19&accept-language=$INFO[language]</url><id>\1</id></details>" dest="3"> - <expression>"id": (\d+),</expression> + <expression>"id":\s*?(\d+),</expression> </RegExp> </GetTVDBIdAuth> @@ -56,7 +56,7 @@ <GetSearchResults dest="3" clearbuffers="no"> <RegExp input="$$4" output="<results>\1</results>" dest="3"> <RegExp input="$$1" output="\1" dest="19"> - <expression>"token": "(.*)"</expression> + <expression>"token":\s*?"(.*)"</expression> </RegExp> <RegExp input="$INFO[language]" output="\1" dest="16"> <expression/> @@ -85,7 +85,7 @@ <!-- output: <results><entity><title>*</title><year>*</year><language>*</language><url>*</url><id>*</id></entity>*</results> --> <GetSearchResultsAuth dest="6" clearbuffers="no"> <RegExp input="$$1" output="<series><id>\3</id><seriesName>\4</seriesName><aliases>\1</aliases><firstAired>\2</firstAired></series>" dest="4"> - <expression repeat="yes" fixchars="1,4">"aliases": \[([^]]*)\],\s+"banner": "[^"]*",\s+"firstAired": "([^"]*)",\s+"id": (\d+),\s+"network": "[^"]*",\s+"overview": (?:"[^}]*"|null),\s+"seriesName": "([^}]*)",</expression> + <expression repeat="yes" fixchars="1,4">"aliases":\s*?\[([^]]*)\],\s*?"banner":\s*?"[^"]*",\s*?"firstAired":\s*?"([^"]*)",\s*?"id":\s*?(\d+),\s*?"network":\s*?"[^"]*",\s*?"overview":\s*?(?:"[^}]*"|null),\s*?"seriesName":\s*?"([^}]*)",\s*?"slug":\s*?"[^"]*"</expression> </RegExp> <RegExp input="" output="" dest="6"> <expression/> @@ -118,8 +118,8 @@ <xsl:template name="split-aliases"> <xsl:param name="title-list"/> - <xsl:variable name="first" select="substring-after(substring-before($title-list, '", '), '"')" /> - <xsl:variable name="remaining" select="substring-after($title-list, '", ')" /> + <xsl:variable name="first" select="substring-after(substring-before($title-list, '",'), '"')" /> + <xsl:variable name="remaining" select="substring-after($title-list, '",')" /> <xsl:if test="$first!=''"> <xsl:call-template name="entity"> <xsl:with-param name="title" select="$first"/> @@ -160,44 +160,44 @@ <expression clear="yes"/> </RegExp> <RegExp input="$$1" output="<uniqueid type="tvdb" default="true">\1</uniqueid>" dest="4"> - <expression clear="yes">"id": (\d+),</expression> + <expression clear="yes">"id":\s*?(\d+),</expression> </RegExp> <RegExp input="$$1" output="<uniqueid type="imdb">\1</uniqueid>" dest="4+"> - <expression>"imdbId": "(tt\d+)",</expression> + <expression>"imdbId":\s*?"(tt\d+)",</expression> </RegExp> <RegExp input="$$1" output="<title>\1</title>" dest="4+"> - <expression fixchars="1">"seriesName": "(.*)",\s+"aliases"</expression> + <expression fixchars="1">"seriesName":\s*?"(.*)",\s*?"aliases"</expression> </RegExp> <RegExp conditional="usefallbacklanguage1" input="$$1" output="missingtitle|" dest="14"> - <expression clear="yes">"seriesName": null,\s+"aliases"</expression> + <expression clear="yes">"seriesName":\s*?null,\s*?"aliases"</expression> </RegExp> <RegExp input="$$1" output="<premiered>\1</premiered>" dest="4+"> - <expression>"firstAired": "([^"]*)",</expression> + <expression>"firstAired":\s*?"([^"]*)",</expression> </RegExp> <RegExp input="$$1" output="<runtime>\1</runtime>" dest="4+"> - <expression>"runtime": "([^"]*)",</expression> + <expression>"runtime":\s*?"([^"]*)",</expression> </RegExp> <RegExp input="$$1" output="<studio>\1</studio>" dest="4+"> - <expression fixchars="1">"network": "([^"]*)",</expression> + <expression fixchars="1">"network":\s*?"([^"]*)",</expression> </RegExp> <RegExp input="$$7" output="<plot>\1</plot>" dest="4+"> <RegExp input="$$6\r" output="\1\n" dest="7"> <RegExp input="$$1" output="\1" dest="6"> - <expression clear="yes" noclean="1">"overview": "(.*)",\s+"lastUpdated"</expression> + <expression clear="yes" noclean="1">"overview":\s*?"(.*)",\s*?"lastUpdated"</expression> </RegExp> <expression clear="yes" repeat="yes" fixchars="1">(.*?)\\r</expression> </RegExp> <expression noclean="1">(?!^$)(.*)</expression> </RegExp> <RegExp conditional="usefallbacklanguage1" input="$$1" output="missingplot|" dest="14+"> - <expression>"overview": null,\s+"lastUpdated"</expression> + <expression>"overview":\s*?null,\s*?"lastUpdated"</expression> </RegExp> <RegExp input="$$1" output="<mpaa>\1</mpaa>" dest="4+"> - <expression>"rating": "([^"]*)",</expression> + <expression>"rating":\s*?"([^"]*)",</expression> </RegExp> <RegExp input="$$5" output="<genre>\1</genre>" dest="4+"> <RegExp input="$$1" output="\1" dest="5"> - <expression clear="yes">"genre": \[([^]]*)\]</expression> + <expression clear="yes">"genre":\s*?\[([^]]*)\]</expression> </RegExp> <expression noclean="1" repeat="yes">"([^"]+)"</expression> </RegExp> @@ -208,20 +208,20 @@ <expression>(?!^\Q$INFO[fallbacklanguage]\E$)</expression> </RegExp> <RegExp input="$$1" output="<chain function="GetActors">\1</chain>" dest="4+"> - <expression noclean="1">"id": (\d+),</expression> + <expression noclean="1">"id":\s*?(\d+),</expression> </RegExp> <RegExp input="$$1" output="<chain function="GetArt">\1</chain>" dest="4+"> - <expression noclean="1">"id": (\d+),</expression> + <expression noclean="1">"id":\s*?(\d+),</expression> </RegExp> <RegExp input="$$6" output="\1" dest="4+"> <RegExp input="$$1" output="<value>\1</value>" dest="5"> - <expression clear="yes">"siteRating": (?:(\d+(?:\.\d)?)|null)</expression> + <expression clear="yes">"siteRating":\s*?(?:(\d+(?:\.\d)?)|null)</expression> </RegExp> <RegExp input="$$1" output="<votes>\1</votes>" dest="5+"> - <expression>"siteRatingCount": (?:(\d+)|null)\s+}</expression> + <expression>"siteRatingCount":\s*?(?:(\d+)|null)\s*?}</expression> </RegExp> <RegExp input="$$1" output="\1" dest="8"> - <expression clear="yes">"imdbId": "(tt\d+)",</expression> + <expression clear="yes">"imdbId":\s*?"(tt\d+)",</expression> </RegExp> <RegExp input="$INFO[RatingS]" output="default="true"" dest="9"> <expression>TheTVDB</expression> @@ -235,7 +235,7 @@ <expression noclean="1"/> </RegExp> <RegExp input="$$1" output="<episodeguide><url post="yes" cache="auth.json">https://api.thetvdb.com/login?{"apikey":"439DFEBA9D3059C6","id":\1}|Content-Type=application/json</url></episodeguide>" dest="4+"> - <expression noclean="1">"id": (\d+),</expression> + <expression noclean="1">"id":\s*?(\d+),</expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -244,7 +244,7 @@ <RegExp input="$$4" output="<details>\1</details>" dest="3"> <RegExp input="$$14" output="$$5" dest="4"> <RegExp input="$$1" output="<title>\1</title>" dest="5"> - <expression clear="yes" fixchars="1">"seriesName": "(.*)",\s+"aliases"</expression> + <expression clear="yes" fixchars="1">"seriesName":\s*?"(.*)",\s*?"aliases"</expression> </RegExp> <expression clear="yes">missingtitle</expression> </RegExp> @@ -252,7 +252,7 @@ <RegExp input="$$7" output="<plot>\1</plot>" dest="5"> <RegExp input="$$6\r" output="\1\n" dest="7"> <RegExp input="$$1" output="\1" dest="6"> - <expression clear="yes" noclean="1">"overview": "(.*)",\s+"lastUpdated"</expression> + <expression clear="yes" noclean="1">"overview":\s*?"(.*)",\s*?"lastUpdated"</expression> </RegExp> <expression repeat="yes" fixchars="1">(.*?)\\r</expression> </RegExp> @@ -271,10 +271,10 @@ <ParseActors dest="4"> <RegExp input="$$5" output="<details>\1</details>" dest="4"> <RegExp input="$$1" output="<actor><name>\1</name><role>\2</role><order>\3</order><thumb>http://www.thetvdb.com/banners/\4</thumb></actor>" dest="5"> - <expression repeat="yes" fixchars="1,2">"name": "([^}]+)",\s+"role": "([^}]+)",\s+"sortOrder": (\d+),\s+"image": "([^"]+)",</expression> + <expression repeat="yes" fixchars="1,2">"name":\s*?"([^}]+)",\s*?"role":\s*?"([^}]+)",\s*?"sortOrder":\s*?(\d+),\s*?"image":\s*?"([^"]+)",</expression> </RegExp> <RegExp input="$$1" output="<actor><name>\1</name><role>\2</role><order>\3</order></actor>" dest="5+"> - <expression repeat="yes" fixchars="1,2">"name": "([^}]+)",\s+"role": "([^}]+)",\s+"sortOrder": (\d+),\s+"image": (?:""|null),</expression> + <expression repeat="yes" fixchars="1,2">"name":\s*?"([^}]+)",\s*?"role":\s*?"([^}]+)",\s*?"sortOrder":\s*?(\d+),\s*?"image":\s*?(?:""|null),</expression> </RegExp> <expression noclean="1"/> </RegExp> @@ -293,7 +293,7 @@ <GetArtAuth dest="3" clearbuffers="no"> <RegExp input="$$4" output="<details>\1</details>" dest="3"> <RegExp input="$$1" output="\1" dest="19"> - <expression>"token": "(.*)"</expression> + <expression>"token":\s*?"(.*)"</expression> </RegExp> <RegExp input="" output="" dest="10"> <expression/> @@ -313,14 +313,14 @@ <expression/> </RegExp> <RegExp input="$$1" output="<url function="LoadArt" cache="$$18-art-\1-$$16.json">https://api.thetvdb.com/series/$$18/images/query?keyType=\1|Authorization=Bearer%20$$19&accept-language=$$16</url>" dest="4"> - <expression clear="yes" repeat="yes">"keyType": "([^"]+)"</expression> + <expression clear="yes" repeat="yes">"keyType":\s*?"([^"]+)"</expression> </RegExp> <RegExp conditional="usefallbacklanguage1" input="$INFO[fallbacklanguage]" output="$$5" dest="4+"> <RegExp input="" output="<chain function="SwitchLanguage">$INFO[fallbacklanguage]</chain>" dest="5"> <expression noclean="1"/> </RegExp> <RegExp input="$$1" output="<url function="LoadArt" cache="$$18-art-\1-$INFO[fallbacklanguage].json">https://api.thetvdb.com/series/$$18/images/query?keyType=\1|Authorization=Bearer%20$$19&accept-language=$INFO[fallbacklanguage]</url>" dest="5+"> - <expression repeat="yes">"keyType": "([^"]+)"</expression> + <expression repeat="yes">"keyType":\s*?"([^"]+)"</expression> </RegExp> <expression>^(?!\Q$$16\E$|en$)</expression> </RegExp> @@ -329,7 +329,7 @@ <expression noclean="1"/> </RegExp> <RegExp input="$$1" output="<url function="LoadArt" cache="$$18-art-\1-en.json">https://api.thetvdb.com/series/$$18/images/query?keyType=\1|Authorization=Bearer%20$$19&accept-language=en</url>" dest="5+"> - <expression repeat="yes">"keyType": "([^"]+)"</expression> + <expression repeat="yes">"keyType":\s*?"([^"]+)"</expression> </RegExp> <expression>^(?!en)</expression> </RegExp> @@ -339,9 +339,9 @@ <LoadArt dest="3" clearbuffers="no"> <RegExp input="$$1" output="<details><!-- $$16 \1 loaded --></details>" dest="3"> <RegExp input="$$1" output="<Banner><id>\1</id><keyType>\2</keyType><subKey>\3</subKey><fileName>\4</fileName><resolution>\5</resolution><average>\6</average><thumbnail>\7</thumbnail><language>$$16</language></Banner>" dest="10+"> - <expression repeat="yes">"id": (\d+),\s+"keyType": "([^"]+)",\s+"subKey": "([^"]*)",\s+"fileName": "([^"]+)",\s+"resolution": "([^"]*)",\s+"ratingsInfo": {\s+"average": (?:([\d\.]+)|null),\s+"count": \d+\s+},\s+"thumbnail": "([^"]+)"</expression> + <expression repeat="yes">"id":\s*?(\d+),\s*?"keyType":\s*?"([^"]+)",\s*?"subKey":\s*?"([^"]*)",\s*?"fileName":\s*?"([^"]+)","languageId":\s*?\d+,\s*?"resolution":\s*?"([^"]*)",\s*?"ratingsInfo":\s*?{\s*?"average":\s*?(?:([\d\.]+)|null),\s*?"count":\s*?\d+\s*?},\s*?"thumbnail":\s*?"([^"]*?)"</expression> </RegExp> - <expression noclean="1">"keyType": "([^"]+)",</expression> + <expression noclean="1">"keyType":\s*?"([^"]+)",</expression> </RegExp> </LoadArt> <ParseArt dest="4" clearbuffers="no"> @@ -383,7 +383,7 @@ <xsl:template match="Banner[keyType='fanart']"> <thumb> <xsl:attribute name="dim"><xsl:value-of select="resolution"/></xsl:attribute> - <xsl:attribute name="preview"><xsl:value-of select="thumbnail"/></xsl:attribute> + <xsl:attribute name="preview">_cache/<xsl:value-of select="fileName"/></xsl:attribute> <xsl:value-of select="fileName"/> </thumb> </xsl:template> @@ -427,7 +427,7 @@ <GetEpisodeList dest="3" clearbuffers="no"> <RegExp input="$$5" output="<episodeguide>\1</episodeguide>" dest="3"> <RegExp input="$$1" output="\1" dest="19"> - <expression clear="yes">"token": "(.*)"</expression> + <expression clear="yes">"token":\s*?"(.*)"</expression> </RegExp> <RegExp input="$$2" output="\1" dest="18"> <expression>"id":(\d+)}</expression> @@ -449,7 +449,7 @@ <GetEpisodeListAuth dest="3" clearbuffers="no"> <RegExp input="$$4" output="<episodeguide>\1</episodeguide>" dest="3"> <RegExp input="$$1" output="<Data><last>\1</last></Data>" dest="5"> - <expression>"last": (\d+),</expression> + <expression>"last":\s*?(\d+),</expression> </RegExp> <RegExp input="" output="" dest="4"> <expression/> @@ -488,8 +488,8 @@ </GetEpisodeListAuth> <LoadEpisodeList dest="4" clearbuffers="no"> <RegExp input="" output="<episodeguide></episodeguide>" dest="4"> - <RegExp input="$$1" output="<Episode><absolute_number>\1</absolute_number><EpisodeNumber>\2</EpisodeNumber><SeasonNumber>\3</SeasonNumber><DVD_episodenumber>\4</DVD_episodenumber><DVD_season>\5</DVD_season><EpisodeName>\6</EpisodeName><FirstAired>\7</FirstAired><id>\8</id><Overview>\9</Overview><filename>episodes/$$18/\8.jpg</filename></Episode>" dest="11+"> - <expression fixchars="6,9" repeat="yes">"absoluteNumber": (?:(\d+)|null),\s+"airedEpisodeNumber": (\d+),\s+"airedSeason": (\d+),\s+"airedSeasonID": \d+,\s+"dvdEpisodeNumber": (?:([\d\.]+)|null),\s+"dvdSeason": (?:(\d+)|null),\s+"episodeName": (?:"([^}]*)"|null),\s+"firstAired": (?:"([^"]*)"|null),\s+"id": (\d+),\s+"language": {[^}]+},\s+"lastUpdated": \d+,\s+"overview": (?:"([^}]*)"|null)\s+}</expression> + <RegExp input="$$1" output="<Episode><absolute_number>\9</absolute_number><EpisodeNumber>\3</EpisodeNumber><SeasonNumber>\2</SeasonNumber><DVD_episodenumber>\8</DVD_episodenumber><DVD_season>\7</DVD_season><EpisodeName>\4</EpisodeName><FirstAired>\5</FirstAired><id>\1</id><Overview>\6</Overview><filename>\10</filename></Episode>" dest="11+"> + <expression fixchars="4,6" repeat="yes">{"id":\s*?(\d+),"airedSeason":\s*?(\d+),"airedSeasonID":\s*?\d+,"airedEpisodeNumber":\s*?(\d+),"episodeName":\s*?(?:"([^}]*)"|null),"firstAired":\s*?(?:"([^"]*)"|null),[^{]*?\s*?"overview":\s*?(?:"([^}]*)"|null),"language":\s*?{[^}]+},[^{]*?,"dvdSeason":\s*?(?:(\d+)|null),"dvdEpisodeNumber":\s*?(?:([\d\.]+)|null),"dvdChapter":\s*?(?:\d+|null),"absoluteNumber":\s*?(?:(\d+)|null),"filename":(?:"([^"]*)"|null),</expression> </RegExp> <RegExp input="$$11" output="yes" dest="20"> <expression clear="yes">(?!^$)</expression> @@ -659,7 +659,7 @@ <expression>"id":(\d+)}</expression> </RegExp> <RegExp input="$$1" output="\1" dest="19"> - <expression>"token": "(.*)"</expression> + <expression>"token":\s*?"(.*)"</expression> </RegExp> <RegExp input="$$2|" output="<url function="GetEpisodeDetailsAuth" cache="episode-\1-$INFO[language].json">https://api.thetvdb.com/episodes/\1|Authorization=Bearer%20$$19&amp;accept-language=$INFO[language]</url>" dest="5"> <expression noclean="1" repeat="yes">(\d+)\|</expression> @@ -676,83 +676,83 @@ <expression clear="yes"/> </RegExp> <RegExp input="$$1" output="<id>\1</id>" dest="10"> - <expression clear="yes">"id": (\d+),</expression> + <expression clear="yes">"id":\s*?(\d+),</expression> </RegExp> <RegExp input="$$1" output="\1" dest="17"> - <expression clear="yes">"id": (\d+),</expression> + <expression clear="yes">"id":\s*?(\d+),</expression> </RegExp> <RegExp input="$$1" output="<airedSeason>\1</airedSeason>" dest="10+"> - <expression>"airedSeason": (\d+),</expression> + <expression>"airedSeason":\s*?(\d+),</expression> </RegExp> <RegExp input="$$1" output="<airedEpisodeNumber>\1</airedEpisodeNumber>" dest="10+"> - <expression>"airedEpisodeNumber": (\d+),</expression> + <expression>"airedEpisodeNumber":\s*?(\d+),</expression> </RegExp> <RegExp input="$$1" output="<episodeName>\1</episodeName>" dest="10+"> - <expression fixchars="1">"episodeName": "(.*)",\s+"firstAired"</expression> + <expression fixchars="1">"episodeName":\s*?"(.*)",\s*?"firstAired"</expression> </RegExp> <RegExp conditional="usefallbacklanguage1" input="$$1" output="missingtitle|" dest="14"> - <expression clear="yes">"episodeName": null,\s+"firstAired"</expression> + <expression clear="yes">"episodeName":\s*?null,\s*?"firstAired"</expression> </RegExp> <RegExp input="$$1" output="<firstAired>\1</firstAired>" dest="10+"> - <expression>"firstAired": (?:"([^"]*)"|null),</expression> + <expression>"firstAired":\s*?(?:"([^"]*)"|null),</expression> </RegExp> <RegExp input="$$7" output="<overview>\1</overview>" dest="10+"> <RegExp input="$$6\r" output="\1\n" dest="7"> <RegExp input="$$1" output="\1" dest="6"> - <expression clear="yes" noclean="1">"overview": "(.*)",\s+"language"</expression> + <expression clear="yes" noclean="1">"overview":\s*?"(.*)",\s*?"language"</expression> </RegExp> <expression clear="yes" repeat="yes" fixchars="1">(.*?)\\r</expression> </RegExp> <expression noclean="1">(?!^$)(.*)</expression> </RegExp> <RegExp conditional="usefallbacklanguage1" input="$$1" output="missingplot|" dest="14+"> - <expression fixchars="1">"overview": null,\s+"language"</expression> + <expression fixchars="1">"overview":\s*?null,\s*?"language"</expression> </RegExp> <RegExp input="$$1" output="<dvdSeason>\1</dvdSeason>" dest="10+"> - <expression>"dvdSeason": (?:(\d+)|null),</expression> + <expression>"dvdSeason":\s*?(?:(\d+)|null),</expression> </RegExp> <RegExp input="$$1" output="<dvdEpisodeNumber>\1</dvdEpisodeNumber>" dest="10+"> - <expression>"dvdEpisodeNumber": (?:(\d+)|null),</expression> + <expression>"dvdEpisodeNumber":\s*?(?:(\d+)|null),</expression> </RegExp> <RegExp input="$$1" output="<absoluteNumber>\1</absoluteNumber>" dest="10+"> - <expression>"absoluteNumber": (?:(\d+)|null),</expression> + <expression>"absoluteNumber":\s*?(?:(\d+)|null),</expression> </RegExp> <RegExp input="$$1" output="<airsAfterSeason>\1</airsAfterSeason>" dest="10+"> - <expression>"airsAfterSeason": (?:(\d+)|null),</expression> + <expression>"airsAfterSeason":\s*?(?:(\d+)|null),</expression> </RegExp> <RegExp input="$$1" output="<airsBeforeSeason>\1</airsBeforeSeason>" dest="10+"> - <expression>"airsBeforeSeason": (?:(\d+)|null),</expression> + <expression>"airsBeforeSeason":\s*?(?:(\d+)|null),</expression> </RegExp> <RegExp input="$$1" output="<airsBeforeEpisode>\1</airsBeforeEpisode>" dest="10+"> - <expression>"airsBeforeEpisode": (?:(\d+)|null),</expression> + <expression>"airsBeforeEpisode":\s*?(?:(\d+)|null),</expression> </RegExp> <RegExp input="$$1" output="<siteRating>\1</siteRating>" dest="10+"> - <expression>"siteRating": (?:([\d\.]+)|null),</expression> + <expression>"siteRating":\s*?(?:([\d\.]+)|null),</expression> </RegExp> <RegExp input="$$1" output="<siteRatingCount>\1</siteRatingCount>" dest="10+"> - <expression>"siteRatingCount": (?:(\d+)|null)\s+}</expression> + <expression>"siteRatingCount":\s*?(?:(\d+)|null)\s*?}</expression> </RegExp> <RegExp input="$$1" output="<imdbId>\1</imdbId>" dest="10+"> - <expression fixchars="1">"imdbId": "(tt\d+)",</expression> + <expression fixchars="1">"imdbId":\s*?"(tt\d+)",</expression> </RegExp> <RegExp input="$$1" output="<filename>\1</filename>" dest="10+"> - <expression>"filename": (?:"([^"]*)"|null),</expression> + <expression>"filename":\s*?(?:"([^"]*)"|null),</expression> </RegExp> <RegExp input="$$9," output="<credits>\1</credits>" dest="10+"> <RegExp input="$$1" output="\1" dest="9"> - <expression>"writers": \[([^]]*)\],</expression> + <expression clear="yes">"writers":\s*?\[([^]]*)\],</expression> </RegExp> <expression fixchars="1" repeat="yes">"([^"]*)",</expression> </RegExp> <RegExp input="$$9," output="<director>\1</director>" dest="10+"> <RegExp input="$$1" output="\1" dest="9"> - <expression>"directors": \[([^]]*)\],</expression> + <expression clear="yes">"directors":\s*?\[([^]]*)\],</expression> </RegExp> <expression fixchars="1" repeat="yes">"([^"]*)",</expression> </RegExp> <RegExp input="$$9," output="<actor><name>\1</name></actor>" dest="10+"> <RegExp input="$$1" output="\1" dest="9"> - <expression>"guestStars": \[\s+"([^]]*)"\s+\],</expression> + <expression clear="yes">"guestStars":\s*?\[\s*?"([^]]*)"\s*?\],</expression> </RegExp> <expression fixchars="1" repeat="yes">([^,"]+)[,"\s]+</expression> </RegExp> @@ -778,7 +778,7 @@ <RegExp input="$$4" output="<details></details>" dest="3"> <RegExp input="$$14" output="$$5" dest="10+"> <RegExp input="$$1" output="<episodeName>\1</episodeName>" dest="5"> - <expression clear="yes" fixchars="1">"episodeName": "(.*)",\s+"firstAired"</expression> + <expression clear="yes" fixchars="1">"episodeName":\s*?"(.*)",\s*?"firstAired"</expression> </RegExp> <expression>missingtitle</expression> </RegExp> @@ -786,7 +786,7 @@ <RegExp input="$$7" output="<overview>\1</overview>" dest="5"> <RegExp input="$$6\r" output="\1\n" dest="7"> <RegExp input="$$1" output="\1" dest="6"> - <expression clear="yes" noclean="1">"overview": "(.*)",\s+"language"</expression> + <expression clear="yes" noclean="1">"overview":\s*?"(.*)",\s*?"language"</expression> </RegExp> <expression repeat="yes" fixchars="1">(.*?)\\r</expression> </RegExp> @@ -1102,4 +1102,4 @@ <expression noclean="1"/> </RegExp> </ParseEpisodeDetails> -</scraper>
\ No newline at end of file +</scraper> |