From 68cf16416ba4fb88293b2bdac9867c5534fd7357 Mon Sep 17 00:00:00 2001
From: abeloin <alexandre.beloin@gmail.com>
Date: Wed, 25 Dec 2013 14:26:49 -0500
Subject: Linux fixes: -Copy PropertyChanged.Fody.dll to Tools/Fody in
 MediaBrowser.Model.csproj -Check if root for
 WebSocketServer.FlashAccessPolicyEnabled (port < 1024) -Check resolution
 value !=0 before SetResolution -Catch _userManager.RefreshUsersMetadata
 exception when running MB3 for the first time -Fix _appHost.Init() missing
 argument -FFmpeg: set default and execute permission(766) to ffmpeg and
 ffprobe -FFmpeg: Detect the OS type and download the correct version -Rename
 MediaBrowser.WebDashboard/dashboard-ui/scripts/Itemdetailpage.js to
 itemdetailpage.js

---
 .../Drawing/ImageProcessor.cs                           |  9 +++++++++
 .../EntryPoints/RefreshUsersMetadata.cs                 | 11 +++++++++++
 .../MediaBrowser.Server.Implementations.csproj          |  1 +
 .../WebSocket/AlchemyServer.cs                          | 17 +++++++++++++++++
 4 files changed, 38 insertions(+)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
index fbe78e9385..7ce0cad739 100644
--- a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
@@ -228,8 +228,17 @@ namespace MediaBrowser.Server.Implementations.Drawing
                             // Graphics.FromImage will throw an exception if the PixelFormat is Indexed, so we need to handle that here
                             using (var thumbnail = new Bitmap(newWidth, newHeight, PixelFormat.Format32bppPArgb))
                             {
+                                #if __MonoCS__
+                                // Mono throw an exeception if assign 0 to SetResolution
+                                if (originalImage.HorizontalResolution != 0 && originalImage.VerticalResolution != 0)
+                                {
+                                    // Preserve the original resolution
+                                    thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution);
+                                }
+                                #else
                                 // Preserve the original resolution
                                 thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution);
+                                #endif
 
                                 using (var thumbnailGraph = Graphics.FromImage(thumbnail))
                                 {
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs b/MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs
index a0b7ff515c..0f35a766a7 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs
@@ -28,7 +28,18 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// </summary>
         public async void Run()
         {
+            #if __MonoCS__
+            try
+            {
+                await _userManager.RefreshUsersMetadata(CancellationToken.None).ConfigureAwait(false);
+            }
+            catch
+            {
+                System.Console.WriteLine("RefreshUsersMetadata task error: No users? First time running?");
+            }
+            #else
             await _userManager.RefreshUsersMetadata(CancellationToken.None).ConfigureAwait(false);
+            #endif
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 09a39c3eb2..efc1549bc0 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -85,6 +85,7 @@
     <Reference Include="ServiceStack.Text">
       <HintPath>..\ThirdParty\ServiceStack.Text\ServiceStack.Text.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Posix" Condition=" '$(ConfigurationName)' == 'Release Mono' " />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
diff --git a/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs b/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs
index 8be35071ad..e46dab23e8 100644
--- a/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs
+++ b/MediaBrowser.Server.Implementations/WebSocket/AlchemyServer.cs
@@ -4,6 +4,9 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Net;
+#if __MonoCS__
+using Mono.Unix.Native;
+#endif
 
 namespace MediaBrowser.Server.Implementations.WebSocket
 {
@@ -66,6 +69,20 @@ namespace MediaBrowser.Server.Implementations.WebSocket
                     TimeOut = TimeSpan.FromHours(24)
                 };
 
+                #if __MonoCS__
+                //Linux: port below 1024 require root or cap_net_bind_service
+                if (Environment.OSVersion.Platform == PlatformID.Unix || Environment.OSVersion.Platform == PlatformID.MacOSX)
+                {
+                    if (Syscall.getuid() == 0)
+                    {
+                        WebSocketServer.FlashAccessPolicyEnabled = true;
+                    }
+                    else
+                    {
+                        WebSocketServer.FlashAccessPolicyEnabled = false;
+                    }
+                }
+                #endif
                 WebSocketServer.Start();
             }
             catch (Exception ex)
-- 
cgit v1.2.3


From 316500dca40f7d861af394d6db27f14302255622 Mon Sep 17 00:00:00 2001
From: abeloin <alexandre.beloin@gmail.com>
Date: Wed, 25 Dec 2013 19:40:53 -0500
Subject: -Replaced Mono.Data.SQLite by System.Data.SQLite(ManagedOnly) -Added
 System.Data.SQLite and Sqlite3 into ThirdParty -Depending of the OS,
 System.Data.SQLite will look for:   sqlite3.dll in Windows(Provided with the
 project)   libsqlite3.so.0 in Linux(Need to be installed. ie yum install
 sqlite.i686)   libsqlite3.dylib in MacOS X(!?)   (See
 http://www.mono-project.com/Interop_with_Native_Libraries for more info)

---
 .../MediaBrowser.Server.Implementations.csproj       | 20 ++++++++++++++++----
 .../Persistence/SqliteExtensions.cs                  | 18 +-----------------
 .../MediaBrowser.Server.Mono.csproj                  |  7 +++++--
 3 files changed, 22 insertions(+), 23 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index efc1549bc0..3b20784fc7 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -48,9 +48,6 @@
     <Reference Include="Alchemy">
       <HintPath>..\packages\Alchemy.2.2.1\lib\net40\Alchemy.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Data.Sqlite">
-      <HintPath>..\ThirdParty\Mono.Data.Sqlite\Mono.Data.Sqlite.dll</HintPath>
-    </Reference>
     <Reference Include="ServiceStack.Api.Swagger">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Api.Swagger.dll</HintPath>
     </Reference>
@@ -67,9 +64,14 @@
     <Reference Include="BDInfo">
       <HintPath>..\packages\MediaBrowser.BdInfo.1.0.0.5\lib\net20\BDInfo.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite">
+    <Reference Include="System.Data.SQLite" Condition=" '$(ConfigurationName)' != 'Release Mono' ">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\System.Data.SQLite.x86.1.0.89.0\lib\net45\System.Data.SQLite.dll</HintPath>
     </Reference>
+    <Reference Include="System.Data.SQLite" Condition=" '$(ConfigurationName)' == 'Release Mono' ">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll</HintPath>
+    </Reference>
     <Reference Include="ServiceStack">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
     </Reference>
@@ -346,6 +348,16 @@
     </Content>
     <EmbeddedResource Include="Localization\Ratings\be.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll">
+      <Link>System.Data.SQLite.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.Linq.dll">
+      <Link>System.Data.SQLite.Linq.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" Condition=" '$(ConfigurationName)' != 'Release Mono' " />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
index 9836de7350..0b3d5f7847 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
@@ -1,11 +1,7 @@
 using MediaBrowser.Model.Logging;
 using System;
 using System.Data;
-#if __MonoCS__
-using Mono.Data.Sqlite;
-#else 
 using System.Data.SQLite;
-#endif
 using System.IO;
 using System.Threading.Tasks;
 
@@ -140,18 +136,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             logger.Info("Opening {0}", dbPath);
 
-			#if __MonoCS__
-			var connectionstr = new SqliteConnectionStringBuilder
-			{
-				PageSize = 4096,
-				CacheSize = 4096,
-				SyncMode = SynchronizationModes.Normal,
-				DataSource = dbPath,
-				JournalMode = SQLiteJournalModeEnum.Off
-			};
-
-			var connection = new SqliteConnection(connectionstr.ConnectionString);
-#else
             var connectionstr = new SQLiteConnectionStringBuilder
             {
                 PageSize = 4096,
@@ -162,7 +146,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             };
 
             var connection = new SQLiteConnection(connectionstr.ConnectionString);
-#endif
+
             await connection.OpenAsync().ConfigureAwait(false);
 
             return connection;
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index d3363ef0a8..d373308216 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -128,8 +128,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="sqlite3.dll">
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\ThirdParty\SQLite3\x86\3.8.2\sqlite3.dll">
+      <Link>sqlite3.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3


From 320495a5653ba931f5f1545954364e0e06d35b00 Mon Sep 17 00:00:00 2001
From: abeloin <alexandre.beloin@gmail.com>
Date: Wed, 25 Dec 2013 20:46:34 -0500
Subject: Add Mono conditon in Server.Implementations for Mono
 System.Data.SQLite version

---
 .../MediaBrowser.Server.Implementations.csproj                        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 3b20784fc7..2023596b39 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -349,11 +349,11 @@
     <EmbeddedResource Include="Localization\Ratings\be.txt" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll">
+    <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.dll" Condition=" '$(ConfigurationName)' == 'Release Mono'">
       <Link>System.Data.SQLite.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.Linq.dll">
+    <Content Include="..\ThirdParty\System.Data.SQLite.ManagedOnly\x86\1.0.90.0\net40\System.Data.SQLite.Linq.dll" Condition=" '$(ConfigurationName)' == 'Release Mono'">
       <Link>System.Data.SQLite.Linq.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-- 
cgit v1.2.3