From 4c725e69a8bb96da1f69fc3d958c680b77712f81 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Mon, 4 Mar 2013 22:34:02 -0500
Subject: [PATCH] added swagger api docs

---
 .../HttpServer/SwaggerService.cs              |  38 +++++++++++++
 ...MediaBrowser.Common.Implementations.csproj |  53 +++++++++++++-----
 .../swagger-ui/index.html                     |   2 +-
 .../MediaBrowser.Controller.csproj            |   1 -
 .../Library/LibraryManager.cs                 |   1 +
 ...MediaBrowser.Server.Implementations.csproj |   7 ++-
 .../{Tasks => }/ChapterImagesTask.cs          |   2 +-
 .../{Tasks => }/ImageCleanupTask.cs           |   2 +-
 .../ScheduledTasks/PeopleValidationTask.cs    |   2 +-
 .../{Tasks => }/PluginUpdateTask.cs           |   3 +-
 .../MainWindow.xaml                           |   7 ++-
 .../MainWindow.xaml.cs                        |   6 ++
 .../MediaBrowser.ServerApplication.csproj     |   3 +
 .../Html/css/images/clients/dlna.png          | Bin 2914 -> 2071 bytes
 .../MediaBrowser.WebDashboard.csproj          |   1 +
 15 files changed, 105 insertions(+), 23 deletions(-)
 create mode 100644 MediaBrowser.Common.Implementations/HttpServer/SwaggerService.cs
 rename MediaBrowser.Server.Implementations/ScheduledTasks/{Tasks => }/ChapterImagesTask.cs (98%)
 rename MediaBrowser.Server.Implementations/ScheduledTasks/{Tasks => }/ImageCleanupTask.cs (99%)
 rename {MediaBrowser.Controller => MediaBrowser.Server.Implementations}/ScheduledTasks/PeopleValidationTask.cs (97%)
 rename MediaBrowser.Server.Implementations/ScheduledTasks/{Tasks => }/PluginUpdateTask.cs (97%)

diff --git a/MediaBrowser.Common.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Common.Implementations/HttpServer/SwaggerService.cs
new file mode 100644
index 000000000..a4808834d
--- /dev/null
+++ b/MediaBrowser.Common.Implementations/HttpServer/SwaggerService.cs
@@ -0,0 +1,38 @@
+using ServiceStack.ServiceHost;
+using System.Diagnostics;
+using System.IO;
+
+namespace MediaBrowser.Common.Implementations.HttpServer
+{
+    /// <summary>
+    /// Class GetDashboardResource
+    /// </summary>
+    [Route("/swagger-ui/{ResourceName*}", "GET")]
+    public class GetSwaggerResource
+    {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value>The name.</value>
+        public string ResourceName { get; set; }
+    }
+    
+    public class SwaggerService : BaseRestService
+    {
+        /// <summary>
+        /// Gets the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>System.Object.</returns>
+        public object Get(GetSwaggerResource request)
+        {
+            var runningDirectory = Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName);
+
+            var swaggerDirectory = Path.Combine(runningDirectory, "swagger-ui");
+
+            var requestedFile = Path.Combine(swaggerDirectory, request.ResourceName.Replace('/', '\\'));
+
+            return ToStaticFileResult(requestedFile);
+        }
+    }
+}
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index bbbf9490e..2f3ebdf19 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -122,6 +122,7 @@
     <Compile Include="HttpServer\NativeWebSocket.cs" />
     <Compile Include="HttpServer\ServerFactory.cs" />
     <Compile Include="HttpServer\StreamWriter.cs" />
+    <Compile Include="HttpServer\SwaggerService.cs" />
     <Compile Include="Logging\LogHelper.cs" />
     <Compile Include="Logging\NLogger.cs" />
     <Compile Include="Logging\NlogManager.cs" />
@@ -162,22 +163,48 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="README.txt" />
-    <Content Include="swagger-ui\css\screen.css" />
-    <Content Include="swagger-ui\images\pet_store_api.png" />
-    <Content Include="swagger-ui\images\wordnik_api.png" />
+    <Content Include="swagger-ui\css\screen.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\images\pet_store_api.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\images\wordnik_api.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="swagger-ui\index.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="swagger-ui\lib\backbone-min.js" />
-    <Content Include="swagger-ui\lib\handlebars.runtime-1.0.0.beta.6.js" />
-    <Content Include="swagger-ui\lib\jquery.ba-bbq.min.js" />
-    <Content Include="swagger-ui\lib\jquery.min.js" />
-    <Content Include="swagger-ui\lib\jquery.slideto.min.js" />
-    <Content Include="swagger-ui\lib\jquery.wiggle.min.js" />
-    <Content Include="swagger-ui\lib\swagger.js" />
-    <Content Include="swagger-ui\lib\underscore-min.js" />
-    <Content Include="swagger-ui\swagger-ui.js" />
-    <Content Include="swagger-ui\swagger-ui.min.js" />
+    <Content Include="swagger-ui\lib\backbone-min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\lib\handlebars.runtime-1.0.0.beta.6.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\lib\jquery.ba-bbq.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\lib\jquery.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\lib\jquery.slideto.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\lib\jquery.wiggle.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\lib\swagger.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\lib\underscore-min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\swagger-ui.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="swagger-ui\swagger-ui.min.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/MediaBrowser.Common.Implementations/swagger-ui/index.html b/MediaBrowser.Common.Implementations/swagger-ui/index.html
index 5d2a8d88d..0b2b02b10 100644
--- a/MediaBrowser.Common.Implementations/swagger-ui/index.html
+++ b/MediaBrowser.Common.Implementations/swagger-ui/index.html
@@ -42,7 +42,7 @@
     <script type="text/javascript">
         $(function () {
             window.swaggerUi = new SwaggerUi({
-                discoveryUrl:'../api/resources',
+                discoveryUrl:'../resources',
                 apiKey:"",
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: false,
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index d44f003fe..0fc97b049 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -172,7 +172,6 @@
     <Compile Include="Resolvers\EntityResolutionHelper.cs" />
     <Compile Include="Resolvers\ResolverPriority.cs" />
     <Compile Include="Library\TVUtils.cs" />
-    <Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
     <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
     <Compile Include="Library\ItemResolveArgs.cs" />
     <Compile Include="IO\DirectoryWatchers.cs" />
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index c3c48f099..78ada1431 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -12,6 +12,7 @@ using MediaBrowser.Controller.ScheduledTasks;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Server.Implementations.Library.Resolvers;
+using MediaBrowser.Server.Implementations.ScheduledTasks;
 using MoreLinq;
 using System;
 using System.Collections.Concurrent;
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index bf6046393..fbd6a96b2 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -77,9 +77,10 @@
     <Compile Include="Library\UserManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Reflection\TypeMapper.cs" />
-    <Compile Include="ScheduledTasks\Tasks\ChapterImagesTask.cs" />
-    <Compile Include="ScheduledTasks\Tasks\ImageCleanupTask.cs" />
-    <Compile Include="ScheduledTasks\Tasks\PluginUpdateTask.cs" />
+    <Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
+    <Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
+    <Compile Include="ScheduledTasks\ImageCleanupTask.cs" />
+    <Compile Include="ScheduledTasks\PluginUpdateTask.cs" />
     <Compile Include="ServerApplicationPaths.cs" />
     <Compile Include="Sqlite\SQLiteDisplayPreferencesRepository.cs" />
     <Compile Include="Sqlite\SQLiteExtensions.cs" />
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
similarity index 98%
rename from MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
rename to MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
index 3ad1f1700..6cae2f75b 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
@@ -9,7 +9,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Server.Implementations.ScheduledTasks.Tasks
+namespace MediaBrowser.Server.Implementations.ScheduledTasks
 {
     /// <summary>
     /// Class ChapterImagesTask
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/ImageCleanupTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
similarity index 99%
rename from MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/ImageCleanupTask.cs
rename to MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
index 939ba9317..8306e094b 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/ImageCleanupTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/ImageCleanupTask.cs
@@ -11,7 +11,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Server.Implementations.ScheduledTasks.Tasks
+namespace MediaBrowser.Server.Implementations.ScheduledTasks
 {
     /// <summary>
     /// Class ImageCleanupTask
diff --git a/MediaBrowser.Controller/ScheduledTasks/PeopleValidationTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
similarity index 97%
rename from MediaBrowser.Controller/ScheduledTasks/PeopleValidationTask.cs
rename to MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
index 24e0c8542..6b8113480 100644
--- a/MediaBrowser.Controller/ScheduledTasks/PeopleValidationTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/PeopleValidationTask.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Controller.ScheduledTasks
+namespace MediaBrowser.Server.Implementations.ScheduledTasks
 {
     /// <summary>
     /// Class PeopleValidationTask
diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
similarity index 97%
rename from MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
rename to MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
index 01a045853..3ae3a727b 100644
--- a/MediaBrowser.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
+++ b/MediaBrowser.Server.Implementations/ScheduledTasks/PluginUpdateTask.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Controller;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using System;
@@ -8,7 +9,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Controller.ScheduledTasks
+namespace MediaBrowser.Server.Implementations.ScheduledTasks
 {
     /// <summary>
     /// Plugin Update Task
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml b/MediaBrowser.ServerApplication/MainWindow.xaml
index 89b05820e..8ad2c2372 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml
@@ -13,7 +13,12 @@
                     <Separator x:Name="separatorDeveloperTools"/>
                     <MenuItem x:Name="cmOpenExplorer" Header="Open Library Explorer" Click="cmOpenExplorer_click" />
                     <MenuItem x:Name="cmdReloadServer" Header="Restart Server" Click="cmdReloadServer_click" />
-                    <MenuItem x:Name="cmdApiDocs" Header="View Api Documentation" Click="cmdApiDocs_Click" />
+                    <MenuItem x:Name="cmdApiDocs" Header="View Api Documentation">
+                        <MenuItem x:Name="cmdStandardApiDocs" Header="Standard" Click="cmdApiDocs_Click">
+                        </MenuItem>
+                        <MenuItem x:Name="cmdSwaggerApiDocs" Header="Swagger" Click="cmdSwaggerApiDocs_Click">
+                        </MenuItem>
+                    </MenuItem>
                     <Separator/>
                     <MenuItem x:Name="cmShowLogWindow" Header="Show Log Window" IsCheckable="True" Click="CmShowLogWindow_click"/>
                     <MenuItem x:Name="cmVisitCT" Header="Visit Community" Click="cmVisitCT_click"/>
diff --git a/MediaBrowser.ServerApplication/MainWindow.xaml.cs b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
index 22695602c..8306ec541 100644
--- a/MediaBrowser.ServerApplication/MainWindow.xaml.cs
+++ b/MediaBrowser.ServerApplication/MainWindow.xaml.cs
@@ -162,6 +162,12 @@ namespace MediaBrowser.ServerApplication
                       Kernel.Instance.WebApplicationName + "/metadata");
         }
 
+        void cmdSwaggerApiDocs_Click(object sender, EventArgs e)
+        {
+            App.OpenUrl("http://localhost:" + _configurationManager.Configuration.HttpServerPortNumber + "/" +
+                      Kernel.Instance.WebApplicationName + "/swagger-ui/index.html");
+        }
+        
         /// <summary>
         /// Occurs when [property changed].
         /// </summary>
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 4ca2c6f96..8cd92d148 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -375,6 +375,9 @@ xcopy "$(SolutionDir)Mediabrowser.Uninstaller\bin\Release\MediaBrowser.Uninstall
 xcopy "$(SolutionDir)Mediabrowser.Uninstaller.Execute\bin\Release\MediaBrowser.Uninstaller.Execute.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
 xcopy "$(SolutionDir)Mediabrowser.Installer\bin\Release\MediaBrowser.Installer.exe" "$(SolutionDir)..\Deploy\Server\System\" /y
 
+mkdir "$(SolutionDir)..\Deploy\Server\System\swagger-ui"
+xcopy "$(TargetDir)swagger-ui" "$(SolutionDir)..\Deploy\Server\System\swagger-ui" /y /s
+
 xcopy "$(TargetDir)$(TargetFileName).config" "$(SolutionDir)..\Deploy\Server\System\" /y
 
 xcopy "$(TargetDir)*.dll" "$(SolutionDir)..\Deploy\Server\System" /y
diff --git a/MediaBrowser.WebDashboard/Html/css/images/clients/dlna.png b/MediaBrowser.WebDashboard/Html/css/images/clients/dlna.png
index 18b6ad421d99a5fa642090a90c8a7760834b3fd6..2c7ba91c20dee860805e7e398935a694099a6ba0 100644
GIT binary patch
delta 2023
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
FV1g;s?7aX0

delta 2897
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

diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 680e23511..4d1685d02 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -398,6 +398,7 @@
     <EmbeddedResource Include="Html\css\images\mblogoicon.png" />
     <EmbeddedResource Include="Html\css\images\mblogotextblack.png" />
     <EmbeddedResource Include="Html\css\images\mblogotextwhite.png" />
+    <EmbeddedResource Include="Html\css\images\clients\dlna.png" />
     <Content Include="Html\css\images\stars.png" />
     <EmbeddedResource Include="Html\scripts\MediaPlayer.js" />
   </ItemGroup>