tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-24 22:35:49 -04:00
Code Issues Projects Releases Wiki Activity

Reformat and apply Stylecop rules

Browse Source
This commit is contained in:
ta264
2019-12-22 22:08:53 +00:00
committed by Qstick
parent d4fa9b7345
commit f02fa629cc
1186 changed files with 7105 additions and 5616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs
+9 -6
View File
@@ -29,14 +29,17 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.MediaBrowser
{
var filename = Path.GetFileName(path);
if (filename == null) return null;
if (filename == null)
{
return null;
}
var metadata = new MetadataFile
{
MovieId = movie.Id,
Consumer = GetType().Name,
RelativePath = movie.Path.GetRelativePath(path)
};
{
MovieId = movie.Id,
Consumer = GetType().Name,
RelativePath = movie.Path.GetRelativePath(path)
};
if (filename.Equals("movie.xml", StringComparison.InvariantCultureIgnoreCase))
{
src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
+27 -25
View File
@@ -32,7 +32,6 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Roksbox
//Re-enable when/if we store and use mpaa certification
//private static List<string> ValidCertification = new List<string> { "G", "NC-17", "PG", "PG-13", "R", "UR", "UNRATED", "NR", "TV-Y", "TV-Y7", "TV-Y7-FV", "TV-G", "TV-PG", "TV-14", "TV-MA" };
public override string Name => "Roksbox";
public override string GetFilenameAfterMove(Movie movie, MovieFile movieFile, MetadataFile metadataFile)
@@ -57,15 +56,19 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Roksbox
{
var filename = Path.GetFileName(path);
if (filename == null) return null;
if (filename == null)
{
return null;
}
var parentdir = Directory.GetParent(path);
var metadata = new MetadataFile
{
MovieId = movie.Id,
Consumer = GetType().Name,
RelativePath = movie.Path.GetRelativePath(path)
};
{
MovieId = movie.Id,
Consumer = GetType().Name,
RelativePath = movie.Path.GetRelativePath(path)
};
var parseResult = Parser.Parser.ParseMovieTitle(filename, false);
@@ -103,29 +106,28 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Roksbox
var xmlResult = string.Empty;
var sb = new StringBuilder();
var xws = new XmlWriterSettings();
xws.OmitXmlDeclaration = true;
xws.Indent = false;
var sb = new StringBuilder();
var xws = new XmlWriterSettings();
xws.OmitXmlDeclaration = true;
xws.Indent = false;
using (var xw = XmlWriter.Create(sb, xws))
{
var doc = new XDocument();
using (var xw = XmlWriter.Create(sb, xws))
{
var doc = new XDocument();
var details = new XElement("video");
details.Add(new XElement("title", movie.Title));
var details = new XElement("video");
details.Add(new XElement("title", movie.Title));
details.Add(new XElement("genre", string.Join(" / ", movie.Genres)));
details.Add(new XElement("description", movie.Overview));
details.Add(new XElement("length", movie.Runtime));
details.Add(new XElement("genre", string.Join(" / ", movie.Genres)));
details.Add(new XElement("description", movie.Overview));
details.Add(new XElement("length", movie.Runtime));
doc.Add(details);
doc.Save(xw);
xmlResult += doc.ToString();
xmlResult += Environment.NewLine;
}
doc.Add(details);
doc.Save(xw);
xmlResult += doc.ToString();
xmlResult += Environment.NewLine;
}
return new MetadataFileResult(GetMovieFileMetadataFilename(movieFile.RelativePath), xmlResult.Trim(Environment.NewLine.ToCharArray()));
}
src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
+26 -26
View File
@@ -48,21 +48,23 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Wdtv
_logger.Debug("Unknown movie file metadata: {0}", metadataFile.RelativePath);
return Path.Combine(movie.Path, metadataFile.RelativePath);
}
public override MetadataFile FindMetadataFile(Movie movie, string path)
{
var filename = Path.GetFileName(path);
if (filename == null) return null;
if (filename == null)
{
return null;
}
var metadata = new MetadataFile
{
MovieId = movie.Id,
Consumer = GetType().Name,
RelativePath = movie.Path.GetRelativePath(path)
};
{
MovieId = movie.Id,
Consumer = GetType().Name,
RelativePath = movie.Path.GetRelativePath(path)
};
if (Path.GetFileName(filename).Equals("folder.jpg", StringComparison.InvariantCultureIgnoreCase))
{
@@ -83,7 +85,6 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Wdtv
metadata.Type = MetadataType.MovieImage;
return metadata;
}
}
return null;
@@ -100,28 +101,27 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Wdtv
var xmlResult = string.Empty;
var sb = new StringBuilder();
var xws = new XmlWriterSettings();
xws.OmitXmlDeclaration = true;
xws.Indent = false;
var sb = new StringBuilder();
var xws = new XmlWriterSettings();
xws.OmitXmlDeclaration = true;
xws.Indent = false;
using (var xw = XmlWriter.Create(sb, xws))
{
var doc = new XDocument();
using (var xw = XmlWriter.Create(sb, xws))
{
var doc = new XDocument();
var details = new XElement("details");
details.Add(new XElement("id", movie.Id));
details.Add(new XElement("title", movie.Title));
details.Add(new XElement("genre", string.Join(" / ", movie.Genres)));
details.Add(new XElement("overview", movie.Overview));
var details = new XElement("details");
details.Add(new XElement("id", movie.Id));
details.Add(new XElement("title", movie.Title));
details.Add(new XElement("genre", string.Join(" / ", movie.Genres)));
details.Add(new XElement("overview", movie.Overview));
doc.Add(details);
doc.Save(xw);
xmlResult += doc.ToString();
xmlResult += Environment.NewLine;
}
doc.Add(details);
doc.Save(xw);
xmlResult += doc.ToString();
xmlResult += Environment.NewLine;
}
var filename = GetMovieFileMetadataFilename(movieFile.RelativePath);
src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
+6 -3
View File
@@ -33,7 +33,6 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
_mediaCoverService = mediaCoverService;
_diskProvider = diskProvider;
_detectNfo = detectNfo;
}
private static readonly Regex MovieImagesRegex = new Regex(@"^(?<type>poster|banner|fanart|clearart|discart|landscape|logo|backdrop|clearlogo)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
@@ -59,7 +58,10 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
{
var filename = Path.GetFileName(path);
if (filename == null) return null;
if (filename == null)
{
return null;
}
var metadata = new MetadataFile
{
@@ -162,7 +164,6 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
{
details.Add(new XElement("thumb"));
}
else
{
details.Add(new XElement("thumb", thumbnail.Url));
@@ -186,6 +187,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
fanartElement.Add(new XElement("thumb", fanart.Url));
}
}
details.Add(fanartElement);
}
@@ -240,6 +242,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
xmlResult += Environment.NewLine;
}
}
if (Settings.MovieMetadataURL)
{
xmlResult += "https://www.themoviedb.org/movie/" + movie.TmdbId;
src/NzbDrone.Core/Extras/Metadata/ExistingMetadataImporter.cs
+1 -3
View File
@@ -5,8 +5,8 @@ using NLog;
using NzbDrone.Core.Extras.Files;
using NzbDrone.Core.Extras.Metadata.Files;
using NzbDrone.Core.Extras.Subtitles;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Movies;
using NzbDrone.Core.Parser;
namespace NzbDrone.Core.Extras.Metadata
{
@@ -41,7 +41,6 @@ namespace NzbDrone.Core.Extras.Metadata
foreach (var possibleMetadataFile in filterResult.FilesOnDisk)
{
// Don't process files that have known Subtitle file extensions (saves a bit of unecessary processing)
if (SubtitleFileExtensions.Extensions.Contains(Path.GetExtension(possibleMetadataFile)))
{
continue;
@@ -81,7 +80,6 @@ namespace NzbDrone.Core.Extras.Metadata
// Return files that were just imported along with files that were
// previously imported so previously imported files aren't imported twice
return metadataFiles.Concat(filterResult.PreviouslyImported);
}
}
src/NzbDrone.Core/Extras/Metadata/IMetadata.cs
+1 -1
View File
@@ -1,8 +1,8 @@
using System.Collections.Generic;
using NzbDrone.Core.Extras.Metadata.Files;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Movies;
using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Extras.Metadata
{
src/NzbDrone.Core/Extras/Metadata/MetadataBase.cs
+7 -3
View File
@@ -4,12 +4,13 @@ using System.IO;
using FluentValidation.Results;
using NzbDrone.Core.Extras.Metadata.Files;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Movies;
using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Extras.Metadata
{
public abstract class MetadataBase<TSettings> : IMetadata where TSettings : IProviderConfig, new()
public abstract class MetadataBase<TSettings> : IMetadata
where TSettings : IProviderConfig, new()
{
public abstract string Name { get; }
@@ -40,7 +41,10 @@ namespace NzbDrone.Core.Extras.Metadata
public abstract MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFile);
public abstract List<ImageFileResult> MovieImages(Movie movie);
public virtual object RequestAction(string action, IDictionary<string, string> query) { return null; }
public virtual object RequestAction(string action, IDictionary<string, string> query)
{
return null;
}
protected TSettings Settings => (TSettings)Definition.Settings;
src/NzbDrone.Core/Extras/Metadata/MetadataService.cs
+1 -2
View File
@@ -133,7 +133,6 @@ namespace NzbDrone.Core.Extras.Metadata
// TODO: Move EpisodeImage and EpisodeMetadata metadata files, instead of relying on consumers to do it
// (Xbmc's EpisodeImage is more than just the extension)
foreach (var consumer in _metadataFactory.GetAvailableProviders())
{
foreach (var movieFile in movieFiles)
@@ -278,6 +277,7 @@ namespace NzbDrone.Core.Extras.Metadata
{
_diskProvider.CopyFile(image.Url, fullPath);
}
_mediaFileAttributeService.SetFilePermissions(fullPath);
}
catch (WebException ex)
@@ -316,7 +316,6 @@ namespace NzbDrone.Core.Extras.Metadata
_metadataFileService.Delete(file.Id);
}
return matchingMetadataFiles.First();
}
}