mirror of https://github.com/Radarr/Radarr
Banners folder moved to root.
This commit is contained in:
parent
bb460163c2
commit
76608fc440
|
@ -43,3 +43,4 @@ NzbDrone.zip
|
|||
NzbDrone.sln.DotSettings.user*
|
||||
config.xml
|
||||
UpdateLogs/
|
||||
NzbDrone.Web/MediaCover
|
|
@ -85,9 +85,19 @@ namespace NzbDrone.Common
|
|||
return Path.Combine(enviromentProvider.GetAppDataPath(), LOG_DB_FILE);
|
||||
}
|
||||
|
||||
public static string GetMediaCoverPath(this EnviromentProvider enviromentProvider)
|
||||
{
|
||||
return Path.Combine(enviromentProvider.GetWebRoot(), "MediaCover");
|
||||
}
|
||||
|
||||
public static string GetBannerPath(this EnviromentProvider enviromentProvider)
|
||||
{
|
||||
return Path.Combine(enviromentProvider.GetWebRoot(), "Content", "Images", "Banners");
|
||||
return Path.Combine(enviromentProvider.GetMediaCoverPath(), "Banner");
|
||||
}
|
||||
|
||||
public static string GetFanArthPath(this EnviromentProvider enviromentProvider)
|
||||
{
|
||||
return Path.Combine(enviromentProvider.GetMediaCoverPath(), "Fanart");
|
||||
}
|
||||
|
||||
public static string GetCacheFolder(this EnviromentProvider enviromentProvider)
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
using System;
|
||||
using System.Configuration;
|
||||
using System.Data.Common;
|
||||
using System.Data.EntityClient;
|
||||
using System.Data.SqlServerCe;
|
||||
using MvcMiniProfiler;
|
||||
using NzbDrone.Common;
|
||||
using NzbDrone.Core.Instrumentation;
|
||||
using PetaPoco;
|
||||
|
@ -14,15 +12,15 @@ namespace NzbDrone.Core.Datastore
|
|||
{
|
||||
private readonly EnviromentProvider _enviromentProvider;
|
||||
|
||||
|
||||
public static void InitiFacotry()
|
||||
static Connection()
|
||||
{
|
||||
Database.Mapper = new CustomeMapper();
|
||||
|
||||
var dataSet = ConfigurationManager.GetSection("system.data") as System.Data.DataSet;
|
||||
dataSet.Tables[0].Rows.Add("Microsoft SQL Server Compact Data Provider 4.0"
|
||||
, "System.Data.SqlServerCe.4.0"
|
||||
, ".NET Framework Data Provider for Microsoft SQL Server Compact"
|
||||
, "System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91");
|
||||
var dataSet = ConfigurationManager.GetSection("system.data") as System.Data.DataSet;
|
||||
dataSet.Tables[0].Rows.Add("Microsoft SQL Server Compact Data Provider 4.0"
|
||||
, "System.Data.SqlServerCe.4.0"
|
||||
, ".NET Framework Data Provider for Microsoft SQL Server Compact"
|
||||
, "System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91");
|
||||
}
|
||||
|
||||
public Connection(EnviromentProvider enviromentProvider)
|
||||
|
@ -30,12 +28,6 @@ namespace NzbDrone.Core.Datastore
|
|||
_enviromentProvider = enviromentProvider;
|
||||
}
|
||||
|
||||
static Connection()
|
||||
{
|
||||
Database.Mapper = new CustomeMapper();
|
||||
InitiFacotry();
|
||||
}
|
||||
|
||||
public String MainConnectionString
|
||||
{
|
||||
get
|
||||
|
@ -54,7 +46,6 @@ namespace NzbDrone.Core.Datastore
|
|||
|
||||
public static string GetConnectionString(string path)
|
||||
{
|
||||
//return String.Format("Data Source={0};Version=3;Cache Size=30000;Pooling=true;Default Timeout=2", path);
|
||||
return String.Format("Data Source={0}", path);
|
||||
}
|
||||
|
||||
|
@ -73,8 +64,6 @@ namespace NzbDrone.Core.Datastore
|
|||
return GetLogDbContext(LogConnectionString);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static IDatabase GetPetaPocoDb(string connectionString, Boolean profiled = true)
|
||||
{
|
||||
MigrationsHelper.Run(connectionString, true);
|
||||
|
|
|
@ -7,7 +7,6 @@ using NzbDrone.Common;
|
|||
using NzbDrone.Core.Model.Notification;
|
||||
using NzbDrone.Core.Providers;
|
||||
using NzbDrone.Core.Providers.Core;
|
||||
using NzbDrone.Core.Providers.Jobs;
|
||||
using NzbDrone.Core.Repository;
|
||||
|
||||
namespace NzbDrone.Core.Jobs
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
if(Model.HasBanner)
|
||||
{
|
||||
bannerUrl = "../../Content/Images/Banners/" + Model.SeriesId + ".jpg";
|
||||
bannerUrl = "../../MediaCover/Banner/" + Model.SeriesId + ".jpg";
|
||||
}
|
||||
}
|
||||
<img src="@bannerUrl" alt="Banner"/>
|
||||
|
|
Loading…
Reference in New Issue