mirror of
https://github.com/Radarr/Radarr.git
synced 2026-04-18 21:35:51 -04:00
@@ -1,12 +0,0 @@
|
|||||||
namespace NzbDrone.Core.Organizer
|
|
||||||
{
|
|
||||||
public class BasicNamingConfig
|
|
||||||
{
|
|
||||||
public bool IncludeSeriesTitle { get; set; }
|
|
||||||
public bool IncludeEpisodeTitle { get; set; }
|
|
||||||
public bool IncludeQuality { get; set; }
|
|
||||||
public bool ReplaceSpaces { get; set; }
|
|
||||||
public string Separator { get; set; }
|
|
||||||
public string NumberStyle { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -24,7 +24,6 @@ namespace NzbDrone.Core.Organizer
|
|||||||
{
|
{
|
||||||
string BuildFileName(Movie movie, MovieFile movieFile, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null);
|
string BuildFileName(Movie movie, MovieFile movieFile, NamingConfig namingConfig = null, List<CustomFormat> customFormats = null);
|
||||||
string BuildFilePath(Movie movie, string fileName, string extension);
|
string BuildFilePath(Movie movie, string fileName, string extension);
|
||||||
BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec);
|
|
||||||
string GetMovieFolder(Movie movie, NamingConfig namingConfig = null);
|
string GetMovieFolder(Movie movie, NamingConfig namingConfig = null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,11 +154,6 @@ namespace NzbDrone.Core.Organizer
|
|||||||
return Path.Combine(path, fileName + extension);
|
return Path.Combine(path, fileName + extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec)
|
|
||||||
{
|
|
||||||
return new BasicNamingConfig(); // For now let's be lazy
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
|
public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
|
||||||
{
|
{
|
||||||
if (namingConfig == null)
|
if (namingConfig == null)
|
||||||
|
|||||||
@@ -44,12 +44,6 @@ namespace Radarr.Api.V3.Config
|
|||||||
var nameSpec = _namingConfigService.GetConfig();
|
var nameSpec = _namingConfigService.GetConfig();
|
||||||
var resource = nameSpec.ToResource();
|
var resource = nameSpec.ToResource();
|
||||||
|
|
||||||
if (resource.StandardMovieFormat.IsNotNullOrWhiteSpace())
|
|
||||||
{
|
|
||||||
var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec);
|
|
||||||
basicConfig.AddToResource(resource);
|
|
||||||
}
|
|
||||||
|
|
||||||
return resource;
|
return resource;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,9 +10,5 @@ namespace Radarr.Api.V3.Config
|
|||||||
public ColonReplacementFormat ColonReplacementFormat { get; set; }
|
public ColonReplacementFormat ColonReplacementFormat { get; set; }
|
||||||
public string StandardMovieFormat { get; set; }
|
public string StandardMovieFormat { get; set; }
|
||||||
public string MovieFolderFormat { get; set; }
|
public string MovieFolderFormat { get; set; }
|
||||||
public bool IncludeQuality { get; set; }
|
|
||||||
public bool ReplaceSpaces { get; set; }
|
|
||||||
public string Separator { get; set; }
|
|
||||||
public string NumberStyle { get; set; }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,23 +20,10 @@ namespace Radarr.Api.V3.Config
|
|||||||
ReplaceIllegalCharacters = model.ReplaceIllegalCharacters,
|
ReplaceIllegalCharacters = model.ReplaceIllegalCharacters,
|
||||||
ColonReplacementFormat = model.ColonReplacementFormat,
|
ColonReplacementFormat = model.ColonReplacementFormat,
|
||||||
StandardMovieFormat = model.StandardMovieFormat,
|
StandardMovieFormat = model.StandardMovieFormat,
|
||||||
MovieFolderFormat = model.MovieFolderFormat,
|
MovieFolderFormat = model.MovieFolderFormat
|
||||||
|
|
||||||
// IncludeQuality
|
|
||||||
// ReplaceSpaces
|
|
||||||
// Separator
|
|
||||||
// NumberStyle
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void AddToResource(this BasicNamingConfig basicNamingConfig, NamingConfigResource resource)
|
|
||||||
{
|
|
||||||
resource.IncludeQuality = basicNamingConfig.IncludeQuality;
|
|
||||||
resource.ReplaceSpaces = basicNamingConfig.ReplaceSpaces;
|
|
||||||
resource.Separator = basicNamingConfig.Separator;
|
|
||||||
resource.NumberStyle = basicNamingConfig.NumberStyle;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static NamingConfig ToModel(this NamingConfigResource resource)
|
public static NamingConfig ToModel(this NamingConfigResource resource)
|
||||||
{
|
{
|
||||||
return new NamingConfig
|
return new NamingConfig
|
||||||
|
|||||||
Reference in New Issue
Block a user