Fix Linux MediaInfo

ShokoAnime · Oct 11, 2019 · 43a4f3e484a0a3ccbae9519a2c44abe33e8d3a62 · 43a4f3e
1 parent 5033f91
commit 43a4f3e484a0a3ccbae9519a2c44abe33e8d3a62
Unified Split

Showing with 17 additions and 2 deletions.

+1 −0 MediaInfoWrapper/MediaInfoWrapper.csproj

+14 −0 MediaInfoWrapper/app.config

+2 −2 Shoko.Server/Utilities/MediaInfoLib/MediaInfo.cs
diff --git a/MediaInfoWrapper/MediaInfoWrapper.csproj b/MediaInfoWrapper/MediaInfoWrapper.csproj
@@ -62,6 +62,7 @@
       </ProjectReference>
     </ItemGroup>
     <ItemGroup>
+      <None Include="app.config" />
       <None Include="packages.config" />
     </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/MediaInfoWrapper/app.config b/MediaInfoWrapper/app.config
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+    <appSettings>
+
+    </appSettings>
+    <dllmap os="osx" dll="MediaInfo.dll" target="libmediainfo.0.dylib" />
+    <dllmap os="linux" dll="MediaInfo.dll" target="libmediainfo.so.0" />
+    <dllmap os="freebsd" dll="MediaInfo.dll" target="libmediainfo.so.0" />
+    <dllmap os="solaris" dll="MediaInfo.dll" target="libmediainfo.so.0.0.0" />
+</configuration>
diff --git a/Shoko.Server/Utilities/MediaInfoLib/MediaInfo.cs b/Shoko.Server/Utilities/MediaInfoLib/MediaInfo.cs
@@ -95,8 +95,8 @@ public static Media GetMediaInfoFromWrapper(string filename)
 
         public static Media GetMediaInfo(string filename)
         {
-            if (Utils.IsRunningOnMono())
-                return MediaInfoParserInternal.Convert(filename, ServerSettings.Instance.Import.MediaInfoTimeoutMinutes);
+            // if (Utils.IsRunningOnMono())
+            //    return MediaInfoParserInternal.Convert(filename, ServerSettings.Instance.Import.MediaInfoTimeoutMinutes);
             return GetMediaInfoFromWrapper(filename);
         }
     }