Permalink
Browse files

Merge remote branch 'upstream-ro/Eden' into Eden-pvr

Conflicts:
	addons/skin.confluence/720p/DialogButtonMenu.xml
	language/German/strings.xml
	project/VS2010Express/XBMC.vcxproj
	project/VS2010Express/XBMC.vcxproj.filters
  • Loading branch information...
2 parents cbe2cf3 + 1fef727 commit 38f045d44523173ce2367b69fa653998efc30dca @opdenkamp committed Feb 7, 2012
Showing with 4,261 additions and 1,051 deletions.
  1. +1 −1 README.linux
  2. +7 −5 README.osx
  3. +1 −1 README.ubuntu
  4. +1 −1 addons/metadata.artists.allmusic.com/addon.xml
  5. +1 −1 addons/metadata.artists.allmusic.com/allmusic.xml
  6. +1 −1 addons/metadata.common.imdb.com/addon.xml
  7. +12 −0 addons/metadata.common.imdb.com/changelog.txt
  8. +1 −1 addons/metadata.common.imdb.com/imdb.xml
  9. +1 −1 addons/metadata.common.themoviedb.org/addon.xml
  10. +0 −6 addons/metadata.common.themoviedb.org/tmdb.xml
  11. +4 −4 addons/metadata.themoviedb.org/addon.xml
  12. +27 −0 addons/metadata.themoviedb.org/changelog.txt
  13. +9 −25 addons/metadata.themoviedb.org/tmdb.xml
  14. +1 −1 addons/skin.confluence/720p/IncludesHomeMenuItems.xml
  15. +183 −0 addons/skin.confluence/language/Arabic/strings.xml
  16. +29 −15 addons/skin.confluence/language/Icelandic/strings.xml
  17. +49 −21 addons/skin.confluence/language/Italian/strings.xml
  18. +1 −1 addons/skin.touched
  19. +5 −2 addons/weather.wunderground/addon.xml
  20. +8 −0 addons/weather.wunderground/changelog.txt
  21. +24 −2 addons/weather.wunderground/default.py
  22. +7 −0 addons/weather.wunderground/resources/language/Chinese (Simple)/strings.xml
  23. +22 −0 language/Arabic/langinfo.xml
  24. +2,071 −0 language/Arabic/strings.xml
  25. +2 −1 language/Bulgarian/langinfo.xml
  26. +16 −3 language/English/strings.xml
  27. +1 −1 language/French/strings.xml
  28. +10 −1 language/German/strings.xml
  29. +30 −5 language/Hebrew/strings.xml
  30. +13 −4 language/Hungarian/strings.xml
  31. +152 −47 language/Icelandic/strings.xml
  32. +360 −166 language/Italian/strings.xml
  33. +275 −265 language/Lithuanian/strings.xml
  34. +12 −3 language/Spanish (Mexico)/strings.xml
  35. +21 −9 language/Turkish/strings.xml
  36. +1 −0 lib/addons/script.module.pil/Makefile.in
  37. +1 −1 lib/ffmpeg/build_xbmc_win32.sh
  38. BIN media/Splash.png
  39. +3 −1 project/VS2010Express/XBMC.vcxproj
  40. +6 −0 project/VS2010Express/XBMC.vcxproj.filters
  41. +44 −1 system/Lircmap.xml
  42. +4 −4 system/keymaps/joystick.AppleRemote.xml
  43. +1 −1 tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
  44. +1 −1 tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
  45. +26 −2 xbmc/Application.cpp
  46. +3 −40 xbmc/ApplicationMessenger.cpp
  47. +0 −6 xbmc/ApplicationMessenger.h
  48. +44 −69 xbmc/FileItem.cpp
  49. +6 −3 xbmc/FileItem.h
  50. +5 −2 xbmc/GUIInfoManager.cpp
  51. +2 −1 xbmc/GUIInfoManager.h
  52. +2 −2 xbmc/NfoFile.h
  53. +3 −3 xbmc/ThumbnailCache.cpp
  54. +10 −5 xbmc/addons/AddonInstaller.cpp
  55. +1 −3 xbmc/addons/Repository.cpp
  56. +2 −3 xbmc/cores/AudioRenderers/CoreAudioRenderer.cpp
  57. +2 −1 xbmc/cores/AudioRenderers/NullDirectSound.cpp
  58. +2 −3 xbmc/cores/DllLoader/LibraryLoader.h
  59. +9 −1 xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
  60. +8 −2 xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
  61. +1 −1 xbmc/cores/VideoRenderers/WinRenderer.cpp
  62. +1 −1 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
  63. +1 −1 xbmc/cores/dvdplayer/DVDPlayer.cpp
  64. +1 −1 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
  65. +8 −4 xbmc/cores/paplayer/MP3codec.cpp
  66. +11 −4 xbmc/dialogs/GUIDialogContextMenu.cpp
  67. +2 −2 xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
  68. +12 −13 xbmc/filesystem/DllLibCurl.cpp
  69. +12 −0 xbmc/filesystem/FTPParse.cpp
  70. +4 −2 xbmc/filesystem/FileCDDA.cpp
  71. +30 −4 xbmc/filesystem/FileNFS.cpp
  72. +8 −1 xbmc/filesystem/FileNFS.h
  73. +1 −1 xbmc/filesystem/FileShoutcast.cpp
  74. +10 −0 xbmc/filesystem/IDirectory.cpp
  75. +6 −1 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
  76. +9 −2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
  77. +10 −6 xbmc/guilib/GUISettingsSliderControl.cpp
  78. +9 −8 xbmc/guilib/GUISpinControlEx.cpp
  79. +1 −1 xbmc/guilib/GUIToggleButtonControl.cpp
  80. +1 −1 xbmc/guilib/JpegIO.cpp
  81. +6 −3 xbmc/input/ButtonTranslator.cpp
  82. +1 −1 xbmc/input/ButtonTranslator.h
  83. +16 −0 xbmc/interfaces/json-rpc/AudioLibrary.cpp
  84. +5 −9 xbmc/interfaces/json-rpc/FileItemHandler.cpp
  85. +20 −0 xbmc/interfaces/json-rpc/FileOperations.cpp
  86. +2 −2 xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
  87. +2 −2 xbmc/interfaces/json-rpc/ServiceDescription.h
  88. +2 −2 xbmc/interfaces/json-rpc/types.json
  89. +6 −0 xbmc/interfaces/python/xbmcmodule/action.cpp
  90. +13 −1 xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
  91. +12 −0 xbmc/linux/XLCDproc.cpp
  92. +2 −4 xbmc/linux/XLCDproc.h
  93. +1 −1 xbmc/linux/XThreadUtils.h
  94. +10 −10 xbmc/music/Album.cpp
  95. +8 −1 xbmc/music/Album.h
  96. +10 −10 xbmc/music/Artist.cpp
  97. +8 −1 xbmc/music/Artist.h
  98. +1 −0 xbmc/music/MusicDatabase.cpp
  99. +1 −1 xbmc/music/tags/MusicInfoTagLoaderWMA.cpp
  100. +10 −2 xbmc/network/AirPlayServer.cpp
  101. +3 −2 xbmc/network/EventClient.cpp
  102. +22 −4 xbmc/network/Zeroconf.cpp
  103. +13 −0 xbmc/network/Zeroconf.h
  104. +6 −4 xbmc/network/windows/ZeroconfWIN.cpp
  105. +2 −2 xbmc/osx/Info.plist
  106. +5 −2 xbmc/osx/atv2/XBMCController.mm
  107. +12 −6 xbmc/playlists/SmartPlayList.cpp
  108. +0 −12 xbmc/settings/AdvancedSettings.cpp
  109. +0 −6 xbmc/settings/AdvancedSettings.h
  110. +1 −1 xbmc/settings/GUIDialogContentSettings.cpp
  111. +4 −4 xbmc/settings/GUISettings.cpp
  112. +22 −18 xbmc/settings/GUIWindowSettingsCategory.cpp
  113. +1 −1 xbmc/settings/Settings.cpp
  114. +23 −0 xbmc/storage/DetectDVDType.cpp
  115. +12 −0 xbmc/storage/DetectDVDType.h
  116. +4 −4 xbmc/utils/LCD.cpp
  117. +2 −0 xbmc/utils/LCD.h
  118. +4 −1 xbmc/utils/XMLUtils.cpp
  119. +15 −1 xbmc/utils/XMLUtils.h
  120. +37 −28 xbmc/video/VideoDatabase.cpp
  121. +5 −4 xbmc/video/VideoDatabase.h
  122. +25 −22 xbmc/video/VideoInfoTag.cpp
  123. +24 −2 xbmc/video/VideoInfoTag.h
  124. +116 −35 xbmc/video/VideoReferenceClock.cpp
  125. +3 −0 xbmc/video/VideoReferenceClock.h
  126. +11 −4 xbmc/video/windows/GUIWindowVideoBase.cpp
  127. +2 −0 xbmc/video/windows/GUIWindowVideoBase.h
  128. +24 −23 xbmc/video/windows/GUIWindowVideoNav.cpp
  129. +3 −3 xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt
  130. +4 −1 xbmc/win32/WIN32Util.cpp
  131. +2 −2 xbmc/win32/XBMC_PC.rc
  132. +12 −0 xbmc/windowing/X11/WinSystemX11.cpp
  133. +1 −0 xbmc/windowing/X11/WinSystemX11.h
  134. +2 −0 xbmc/windowing/osx/WinEventsIOS.mm
  135. +9 −2 xbmc/windowing/windows/WinEventsWin32.cpp
  136. +8 −4 xbmc/windows/GUIMediaWindow.cpp
  137. +4 −0 xbmc/windows/GUIWindowLoginScreen.cpp
View
@@ -55,7 +55,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev,
- libplist-dev, libusb-dev, libudev-dev
+ libplist-dev, libusb-dev, libudev-dev, libltdl-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
View
@@ -14,9 +14,9 @@ TOC
-----------------------------------------------------------------------------
This is a platform port of XBMC for the Apple OSX operating system. Both 10.5
-and 10.6 Intel development platforms are supported. The current build system
-is Xcode 3.1.2 There are two ways to build XBMC for Mac, from command-line or
-from Xcode.
+and 10.6 Intel development platforms are supported. Xcode 4.x is not supported.
+The current build system is Xcode 3.2.5 There are two ways to build XBMC for Mac,
+from command-line or from Xcode.
Generally, Xcode is the easiest as it presents the build system in a GUI environment.
The command-line build is still under development.
@@ -41,8 +41,10 @@ character itself should NOT be typed as part of the command.
-----------------------------------------------------------------------------
Install latest Xcode. You can download it from Apple's site after registration at
(http://developer.apple.com/tools/download). You also need to install the 10.4
-sdk. If using Xcode 3.x, you MUST use Xcode 3.1.2 so update your existing version
-if you are running a previous Xcode 3.x version. Xcode 3.x only runs on 10.5.
+sdk. If using Xcode 3.x, you MUST use Xcode 3.1.2 or a newer version, so update
+your existing version. if you are running a previous Xcode 3.x version.
+Xcode 3.x only runs on 10.5 and above. If you are running 10.7, DO NOT USE Xcode 4.x,
+it will fail. Use Xcode 3.x under 10.7.
-----------------------------------------------------------------------------
3.1 Install XBMC build depends
View
@@ -47,7 +47,7 @@ For Ubuntu (all versions >= 7.04):
# sudo apt-get install git-core make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound2-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev libplist-dev libusb-dev libudev-dev
For >= 10.10:
- # sudo apt-get install autopoint
+ # sudo apt-get install autopoint libltdl-dev
On 8.10 and older versions, libcurl is outdated and thus XBMC will not compile properly.
In this case you will have to manually compile the latest version.
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.artists.allmusic.com"
name="AllMusic"
- version="2.0.6"
+ version="2.0.7"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -42,7 +42,7 @@
<expression noclean="1">&lt;meta name=&quot;title&quot; content=&quot;([^&quot;]*)</expression>
</RegExp>
<RegExp input="$$1" output="\1" dest="8">
- <expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)</expression>
+ <expression>http://www.allmusic.com/artist/([^&amp;&quot;/]*)/</expression>
</RegExp>
<RegExp input="$$7" conditional="htbthumbs" output="&lt;chain function=&quot;GetHTBThumbs&quot;&gt;\1&lt;/chain&gt;" dest="5">
<expression/>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.imdb.com"
name="IMDB common scraper functions"
- version="2.1.5"
+ version="2.1.9"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -1,3 +1,15 @@
+[B]2.1.9[/B]
+- fixed: plot when contains html links (once again)
+
+[B]2.1.8[/B]
+- revert: two latest changes - cause crash some times
+
+[B]2.1.7[/B]
+- fixed: typo in fixing previous plot issue
+
+[B]2.1.6[/B]
+- fixed: plot when contains html links
+
[B]2.1.5[/B]
- fixed: Cleanup and factored out Genres to common
@@ -35,7 +35,7 @@
<ParseIMDBPlot dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
- <expression trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;([^&lt;]+)</expression>
+ <expression trim="1">&lt;h2&gt;Storyline&lt;/h2&gt;\n+&lt;p&gt;(.*?)&lt;[^a/]</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.themoviedb.org"
name="The MovieDB common scraper functions"
- version="2.1.0"
+ version="2.1.2"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -39,9 +39,6 @@
<RegExp input="$$9" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
<expression>(.+)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;outline&gt;\1&lt;/outline&gt;" dest="2+">
- <expression fixchars="1">&quot;overview&quot;:&quot;(.{180,}?)[.?!]</expression>
- </RegExp>
<expression noclean="1" />
</RegExp>
</ParseTMDBPlot>
@@ -50,9 +47,6 @@
<RegExp input="$$1" output="&lt;plot&gt;\1&lt;/plot&gt;" dest="2">
<expression clear="yes" fixchars="1">&quot;overview&quot;:&quot;(.*?)&quot;,</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;outline&gt;\1&lt;/outline&gt;" dest="2+">
- <expression fixchars="1">&quot;overview&quot;:&quot;(.{180,}?)[.?!]</expression>
- </RegExp>
<expression noclean="1" />
</RegExp>
</ParseFallbackTMDBPlot>
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="3.0.0"
+ version="3.0.9"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.1.0"/>
+ <import addon="metadata.common.themoviedb.org" version="2.1.2"/>
<import addon="metadata.common.hdtrailers.net" version="1.0.7"/>
- <import addon="metadata.common.imdb.com" version="2.1.5"/>
- <import addon="plugin.video.youtube" version="2.1.0" optional="true"/>
+ <import addon="metadata.common.imdb.com" version="2.1.9"/>
+ <import addon="plugin.video.youtube" version="2.1.4" optional="true"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
@@ -1,3 +1,30 @@
+[B]3.0.9[/B]
+- fixed: missing language parameter name in NfoUrl
+
+[B]3.0.8[/B]
+- fixed: movies without release date won't find
+
+[B]3.0.7[/B]
+- fixed: keep originaltitle; IMDb ID; remove TMDb title fallback, because it became obsolate
+
+[B]3.0.6[/B]
+- updated chinese translation
+
+[B]3.0.5[/B]
+- reverted latest change
+
+[B]3.0.4[/B]
+- added: option to not scrape sets
+
+[B]3.0.3[/B]
+- fixed: plot outline includes trash on some movies
+
+[B]3.0.2[/B]
+- fixed: imdb IDs not properly handled
+
+[B]3.0.1[/B]
+- changed: also fallback to original_title to make sure a valid title gets scraped
+
[B]3.0.0[/B]
- major rewrite: utilize TMDb API v3, scraping set information, prioritize posters on the selected language
@@ -9,21 +9,16 @@
</RegExp>
</CreateSearchUrl>
<NfoUrl dest="3">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\2&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression clear="yes" noclean="1">(themoviedb.org/movie/)([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/title/tt([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3">
+ <RegExp input="$$1" output="&lt;details&gt;&lt;url&gt;http://api.themoviedb.org/3/movie/tt\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;tt\1&lt;/id&gt;&lt;/details&gt;" dest="3">
<expression>imdb....?/Title\?([0-9]*)</expression>
</RegExp>
</NfoUrl>
- <GetTMDBId dest="3">
- <RegExp input="$$1" output="&lt;details&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;id&gt;\1&lt;/id&gt;&lt;/details&gt;" dest="3+">
- <expression>&quot;movie&quot;,&quot;id&quot;:([0-9]*),</expression>
- </RegExp>
- </GetTMDBId>
<GetSearchResults dest="8">
<RegExp input="$$3" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\4&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3">
@@ -32,6 +27,9 @@
<RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;year&gt;\3&lt;/year&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
<expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:&quot;([0-9]+)-</expression>
</RegExp>
+ <RegExp input="$$1" output="&lt;entity&gt;&lt;title&gt;\2&lt;/title&gt;&lt;id&gt;\1&lt;/id&gt;&lt;url cache=&quot;tmdb-$INFO[language]-\1.json&quot;&gt;http://api.themoviedb.org/3/movie/\1?api_key=57983e31fb435df4df77afb854740ea9&amp;language=$INFO[language]&lt;/url&gt;&lt;/entity&gt;" dest="3+">
+ <expression repeat="yes">&quot;id&quot;:([0-9]*),&quot;original_title&quot;:&quot;([^&quot;]*)&quot;,&quot;release_date&quot;:null</expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</GetSearchResults>
@@ -46,18 +44,12 @@
<RegExp input="$$1" output="\1" dest="9">
<expression fixchars="1">&quot;original_title&quot;:&quot;([^&quot;]*)</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="10">
- <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
- </RegExp>
- <RegExp input="$$10" output="&lt;url function=&quot;ParseFallbackTMDBTitle&quot; cache=&quot;tmdb-en-$$2.json&quot;&gt;http://api.themoviedb.org/3/movie/$$2?api_key=57983e31fb435df4df77afb854740ea9&amp;language=en&lt;/url&gt;" dest="5+">
- <expression>^$</expression>
- </RegExp>
- <RegExp input="$$10" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
- <expression>(.+)</expression>
- </RegExp>
<RegExp conditional="keeporiginaltitle" input="$$9" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
<expression/>
</RegExp>
+ <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="5+">
+ <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
+ </RegExp>
<RegExp input="$$9" output="&lt;originaltitle&gt;\1&lt;/originaltitle&gt;" dest="5+">
<expression/>
</RegExp>
@@ -154,14 +146,6 @@
<expression noclean="1" />
</RegExp>
</GetDetails>
- <ParseFallbackTMDBTitle dest="5">
- <RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
- <RegExp input="$$1" output="&lt;title&gt;\1&lt;/title&gt;" dest="2">
- <expression fixchars="1">&quot;title&quot;:&quot;([^&quot;]*)</expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </ParseFallbackTMDBTitle>
<ParseFallbackTMDBRuntime dest="5">
<RegExp input="$$2" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
<RegExp input="$$1" output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="2">
@@ -32,7 +32,7 @@
<include>ButtonHomeSubCommonValues</include>
<label>14022</label>
<onclick>ActivateWindow(Videos,Root)</onclick>
- <visible>Library.HasContent(Videos)</visible>
+ <visible>Library.HasContent(Video)</visible>
</control>
<control type="button" id="90107">
<include>ButtonHomeSubCommonValues</include>
Oops, something went wrong.

0 comments on commit 38f045d

Please sign in to comment.