alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-20 22:50:35 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

prep for portable common

Browse Source
This commit is contained in:
Luke Pulverenti
2016-10-23 15:47:34 -04:00
parent 07791d46a5
commit 0f8ccfaf49
38 changed files with 71 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MediaBrowser.Common.Implementations/BaseApplicationHost.cs
View File

@@ -445,20 +445,28 @@ namespace MediaBrowser.Common.Implementations
private IPlugin LoadPlugin(IPlugin plugin)
{
var assemblyPlugin = plugin as IPluginAssembly;
if (assemblyPlugin != null)
try
{
var assembly = plugin.GetType().Assembly;
var assemblyName = assembly.GetName();
var assemblyPlugin = plugin as IPluginAssembly;
var attribute = (GuidAttribute)assembly.GetCustomAttributes(typeof(GuidAttribute), true)[0];
var assemblyId = new Guid(attribute.Value);
if (assemblyPlugin != null)
{
var assembly = plugin.GetType().Assembly;
var assemblyName = assembly.GetName();
var assemblyFileName = assemblyName.Name + ".dll";
var assemblyFilePath = Path.Combine(ApplicationPaths.PluginsPath, assemblyFileName);
var attribute = (GuidAttribute)assembly.GetCustomAttributes(typeof(GuidAttribute), true)[0];
var assemblyId = new Guid(attribute.Value);
assemblyPlugin.SetAttributes(assemblyFilePath, assemblyFileName, assemblyName.Version, assemblyId);
var assemblyFileName = assemblyName.Name + ".dll";
var assemblyFilePath = Path.Combine(ApplicationPaths.PluginsPath, assemblyFileName);
assemblyPlugin.SetAttributes(assemblyFilePath, assemblyFileName, assemblyName.Version, assemblyId);
}
}
catch (Exception ex)
{
Logger.ErrorException("Error loading plugin {0}", ex, plugin.GetType().FullName);
return null;
}
return plugin;
@@ -596,7 +604,7 @@ namespace MediaBrowser.Common.Implementations
}
catch (Exception ex)
{
Logger.ErrorException("Error creating {0}", ex, type.Name);
Logger.ErrorException("Error creating {0}", ex, type.FullName);
throw;
}
@@ -615,7 +623,7 @@ namespace MediaBrowser.Common.Implementations
}
catch (Exception ex)
{
Logger.ErrorException("Error creating {0}", ex, type.Name);
Logger.ErrorException("Error creating {0}", ex, type.FullName);
// Don't blow up in release mode
return null;
}