Merge pull request #1164 from MediaBrowser/dev

3.0.5724.1

1 files changed, 53 insertions, 77 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 33b2493f5..f0312cef6 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -109,7 +109,6 @@
     <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="Branding\BrandingConfigurationFactory.cs" />
     <Compile Include="Channels\ChannelConfigurations.cs" />
-    <Compile Include="Channels\ChannelDownloadScheduledTask.cs" />
     <Compile Include="Channels\ChannelDynamicMediaSourceProvider.cs" />
     <Compile Include="Channels\ChannelImageProvider.cs" />
     <Compile Include="Channels\ChannelItemImageProvider.cs" />
@@ -216,10 +215,25 @@
     <Compile Include="Library\Validators\StudiosValidator.cs" />
     <Compile Include="Library\Validators\YearsPostScanTask.cs" />
     <Compile Include="LiveTv\ChannelImageProvider.cs" />
+    <Compile Include="LiveTv\EmbyTV\EmbyTV.cs" />
+    <Compile Include="LiveTv\EmbyTV\EntryPoint.cs" />
+    <Compile Include="LiveTv\EmbyTV\ItemDataProvider.cs" />
+    <Compile Include="LiveTv\EmbyTV\RecordingHelper.cs" />
+    <Compile Include="LiveTv\EmbyTV\SeriesTimerManager.cs" />
+    <Compile Include="LiveTv\EmbyTV\TimerManager.cs" />
+    <Compile Include="LiveTv\Listings\Emby\EmbyListings.cs" />
+    <Compile Include="LiveTv\Listings\Emby\EmbyListingsNorthAmerica.cs" />
+    <Compile Include="LiveTv\Listings\Emby\IEmbyListingProvider.cs" />
+    <Compile Include="LiveTv\Listings\SchedulesDirect.cs" />
+    <Compile Include="LiveTv\Listings\XmlTv.cs" />
     <Compile Include="LiveTv\LiveTvConfigurationFactory.cs" />
     <Compile Include="LiveTv\LiveTvDtoService.cs" />
     <Compile Include="LiveTv\LiveTvManager.cs" />
     <Compile Include="LiveTv\LiveTvMediaSourceProvider.cs" />
+    <Compile Include="LiveTv\TunerHosts\BaseTunerHost.cs" />
+    <Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunHost.cs" />
+    <Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunDiscovery.cs" />
+    <Compile Include="LiveTv\TunerHosts\M3UTunerHost.cs" />
     <Compile Include="LiveTv\ProgramImageProvider.cs" />
     <Compile Include="LiveTv\RecordingImageProvider.cs" />
     <Compile Include="LiveTv\RefreshChannelsScheduledTask.cs" />
@@ -227,11 +241,13 @@
     <Compile Include="Logging\PatternsLogger.cs" />
     <Compile Include="MediaEncoder\EncodingManager.cs" />
     <Compile Include="Persistence\BaseSqliteRepository.cs" />
+    <Compile Include="Persistence\CleanDatabaseScheduledTask.cs" />
     <Compile Include="Social\SharingManager.cs" />
     <Compile Include="Social\SharingRepository.cs" />
     <Compile Include="Sorting\StartDateComparer.cs" />
     <Compile Include="Sync\SyncHelper.cs" />
     <Compile Include="Sync\SyncJobOptions.cs" />
+    <Compile Include="UserViews\CollectionFolderImageProvider.cs" />
     <Compile Include="UserViews\DynamicImageProvider.cs" />
     <Compile Include="News\NewsEntryPoint.cs" />
     <Compile Include="News\NewsService.cs" />
@@ -359,76 +375,44 @@
     <EmbeddedResource Include="Localization\Ratings\ru.txt" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Localization\JavaScript\javascript.json" />
-    <EmbeddedResource Include="Localization\Server\server.json" />
-    <EmbeddedResource Include="Localization\Server\de.json" />
-    <EmbeddedResource Include="Localization\Server\ru.json" />
-    <EmbeddedResource Include="Localization\JavaScript\de.json" />
-    <EmbeddedResource Include="Localization\JavaScript\fr.json" />
-    <EmbeddedResource Include="Localization\JavaScript\nl.json" />
-    <EmbeddedResource Include="Localization\JavaScript\ru.json" />
-    <EmbeddedResource Include="Localization\Server\fr.json" />
-    <EmbeddedResource Include="Localization\Server\nl.json" />
-    <EmbeddedResource Include="Localization\JavaScript\es.json" />
-    <EmbeddedResource Include="Localization\Server\es.json" />
-    <EmbeddedResource Include="Localization\JavaScript\it.json" />
-    <EmbeddedResource Include="Localization\Server\he.json" />
-    <EmbeddedResource Include="Localization\Server\it.json" />
-    <EmbeddedResource Include="Localization\JavaScript\ar.json" />
-    <EmbeddedResource Include="Localization\JavaScript\he.json" />
-    <EmbeddedResource Include="Localization\JavaScript\nb.json" />
-    <EmbeddedResource Include="Localization\Server\ar.json" />
-    <EmbeddedResource Include="Localization\Server\el.json" />
-    <EmbeddedResource Include="Localization\Server\nb.json" />
-    <EmbeddedResource Include="Localization\JavaScript\el.json" />
-    <EmbeddedResource Include="Localization\JavaScript\sv.json" />
-    <EmbeddedResource Include="Localization\Server\sv.json" />
-    <EmbeddedResource Include="Localization\JavaScript\cs.json" />
-    <EmbeddedResource Include="Localization\Server\cs.json" />
-    <EmbeddedResource Include="Localization\JavaScript\ca.json" />
-    <EmbeddedResource Include="Localization\JavaScript\ms.json" />
-    <EmbeddedResource Include="Localization\Server\ca.json" />
-    <EmbeddedResource Include="Localization\Server\ms.json" />
-    <EmbeddedResource Include="Localization\JavaScript\kk.json" />
-    <EmbeddedResource Include="Localization\Server\kk.json" />
     <EmbeddedResource Include="Localization\countries.json" />
-    <EmbeddedResource Include="Localization\JavaScript\da.json" />
-    <EmbeddedResource Include="Localization\JavaScript\vi.json" />
-    <EmbeddedResource Include="Localization\Server\da.json" />
-    <EmbeddedResource Include="Localization\Server\vi.json" />
-    <EmbeddedResource Include="Localization\JavaScript\pl.json" />
-    <EmbeddedResource Include="Localization\Server\pl.json" />
-    <EmbeddedResource Include="Localization\Server\ko.json" />
-    <EmbeddedResource Include="Localization\JavaScript\tr.json" />
-    <EmbeddedResource Include="Localization\Server\tr.json" />
-    <EmbeddedResource Include="Localization\JavaScript\hr.json" />
-    <EmbeddedResource Include="Localization\Server\hr.json" />
-    <EmbeddedResource Include="Localization\JavaScript\fi.json" />
-    <EmbeddedResource Include="Localization\Server\fi.json" />
     <None Include="app.config" />
-    <EmbeddedResource Include="Localization\JavaScript\uk.json" />
-    <EmbeddedResource Include="Localization\Server\uk.json" />
-    <EmbeddedResource Include="Localization\JavaScript\hu.json" />
-    <EmbeddedResource Include="Localization\JavaScript\be-BY.json" />
-    <EmbeddedResource Include="Localization\JavaScript\bg-BG.json" />
-    <EmbeddedResource Include="Localization\JavaScript\en-GB.json" />
-    <EmbeddedResource Include="Localization\JavaScript\en-US.json" />
-    <EmbeddedResource Include="Localization\JavaScript\es-MX.json" />
-    <EmbeddedResource Include="Localization\JavaScript\es-VE.json" />
-    <EmbeddedResource Include="Localization\JavaScript\pt-BR.json" />
-    <EmbeddedResource Include="Localization\JavaScript\pt-PT.json" />
-    <EmbeddedResource Include="Localization\JavaScript\sl-SI.json" />
-    <EmbeddedResource Include="Localization\JavaScript\zh-CN.json" />
-    <EmbeddedResource Include="Localization\JavaScript\zh-TW.json" />
-    <EmbeddedResource Include="Localization\Server\bg-BG.json" />
-    <EmbeddedResource Include="Localization\Server\en-GB.json" />
-    <EmbeddedResource Include="Localization\Server\en-US.json" />
-    <EmbeddedResource Include="Localization\Server\es-MX.json" />
-    <EmbeddedResource Include="Localization\Server\pt-BR.json" />
-    <EmbeddedResource Include="Localization\Server\pt-PT.json" />
-    <EmbeddedResource Include="Localization\Server\sl-SI.json" />
-    <EmbeddedResource Include="Localization\Server\zh-CN.json" />
-    <EmbeddedResource Include="Localization\Server\zh-TW.json" />
+    <EmbeddedResource Include="Localization\Core\core.json" />
+    <EmbeddedResource Include="Localization\Core\ar.json" />
+    <EmbeddedResource Include="Localization\Core\bg-BG.json" />
+    <EmbeddedResource Include="Localization\Core\ca.json" />
+    <EmbeddedResource Include="Localization\Core\cs.json" />
+    <EmbeddedResource Include="Localization\Core\da.json" />
+    <EmbeddedResource Include="Localization\Core\de.json" />
+    <EmbeddedResource Include="Localization\Core\el.json" />
+    <EmbeddedResource Include="Localization\Core\en-GB.json" />
+    <EmbeddedResource Include="Localization\Core\en-US.json" />
+    <EmbeddedResource Include="Localization\Core\es-AR.json" />
+    <EmbeddedResource Include="Localization\Core\es-MX.json" />
+    <EmbeddedResource Include="Localization\Core\es.json" />
+    <EmbeddedResource Include="Localization\Core\fi.json" />
+    <EmbeddedResource Include="Localization\Core\fr.json" />
+    <EmbeddedResource Include="Localization\Core\gsw.json" />
+    <EmbeddedResource Include="Localization\Core\he.json" />
+    <EmbeddedResource Include="Localization\Core\hr.json" />
+    <EmbeddedResource Include="Localization\Core\it.json" />
+    <EmbeddedResource Include="Localization\Core\kk.json" />
+    <EmbeddedResource Include="Localization\Core\ko.json" />
+    <EmbeddedResource Include="Localization\Core\ms.json" />
+    <EmbeddedResource Include="Localization\Core\nb.json" />
+    <EmbeddedResource Include="Localization\Core\nl.json" />
+    <EmbeddedResource Include="Localization\Core\pl.json" />
+    <EmbeddedResource Include="Localization\Core\pt-BR.json" />
+    <EmbeddedResource Include="Localization\Core\pt-PT.json" />
+    <EmbeddedResource Include="Localization\Core\ro.json" />
+    <EmbeddedResource Include="Localization\Core\ru.json" />
+    <EmbeddedResource Include="Localization\Core\sl-SI.json" />
+    <EmbeddedResource Include="Localization\Core\sv.json" />
+    <EmbeddedResource Include="Localization\Core\tr.json" />
+    <EmbeddedResource Include="Localization\Core\uk.json" />
+    <EmbeddedResource Include="Localization\Core\vi.json" />
+    <EmbeddedResource Include="Localization\Core\zh-CN.json" />
+    <EmbeddedResource Include="Localization\Core\zh-TW.json" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -511,14 +495,6 @@
       <Link>swagger-ui\swagger-ui.min.js</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="UserViews\livetv\1.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\2.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\3.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\4.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\5.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\6.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\7.jpg" />
-    <EmbeddedResource Include="UserViews\livetv\8.jpg" />
     <EmbeddedResource Include="Localization\iso6392.txt" />
     <EmbeddedResource Include="Localization\Ratings\be.txt" />
   </ItemGroup>