self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-14 11:23:42 +02:00
Code Issues Releases Activity

Major logging overhaul

Browse Source
This commit is contained in:
Mark McDowall 2014-03-13 13:12:42 -07:00
parent 953024cd40
commit 2f3430387e
102 changed files with 284 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Common/ArchiveProvider.cs
View File

@ -25,7 +25,7 @@ public ArchiveService(Logger logger)
public void Extract(string compressedFile, string destination)
{
_logger.Trace("Extracting archive [{0}] to [{1}]", compressedFile, destination);
_logger.Debug("Extracting archive [{0}] to [{1}]", compressedFile, destination);
if (OsInfo.IsWindows)
{
@ -37,7 +37,7 @@ public void Extract(string compressedFile, string destination)
ExtractTgz(compressedFile, destination);
}
_logger.Trace("Extraction complete.");
_logger.Debug("Extraction complete.");
}
private void ExtractZip(string compressedFile, string destination)

4
src/NzbDrone.Common/Disk/DiskProviderBase.cs
View File

@ -201,7 +201,7 @@ private void TransferFolder(string source, string target, TransferAction transfe
Ensure.That(source, () => source).IsValidPath();
Ensure.That(target, () => target).IsValidPath();
Logger.Trace("{0} {1} -> {2}", transferAction, source, target);
Logger.Debug("{0} {1} -> {2}", transferAction, source, target);
var sourceFolder = new DirectoryInfo(source);
var targetFolder = new DirectoryInfo(target);
@ -220,7 +220,7 @@ private void TransferFolder(string source, string target, TransferAction transfe
{
var destFile = Path.Combine(target, sourceFile.Name);
Logger.Trace("{0} {1} -> {2}", transferAction, sourceFile, destFile);
Logger.Debug("{0} {1} -> {2}", transferAction, sourceFile, destFile);
switch (transferAction)
{

6
src/NzbDrone.Common/HttpProvider.cs
View File

@ -102,14 +102,14 @@ public void DownloadFile(string url, string fileName)
fileInfo.Directory.Create();
}
_logger.Trace("Downloading [{0}] to [{1}]", url, fileName);
_logger.Debug("Downloading [{0}] to [{1}]", url, fileName);
var stopWatch = Stopwatch.StartNew();
var webClient = new WebClient();
webClient.Headers.Add(HttpRequestHeader.UserAgent, _userAgent);
webClient.DownloadFile(url, fileName);
stopWatch.Stop();
_logger.Trace("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
_logger.Debug("Downloading Completed. took {0:0}s", stopWatch.Elapsed.Seconds);
}
catch (WebException e)
{
@ -127,7 +127,7 @@ public string PostCommand(string address, string username, string password, stri
{
address = String.Format("http://{0}/jsonrpc", address);
_logger.Trace("Posting command: {0}, to {1}", command, address);
_logger.Debug("Posting command: {0}, to {1}", command, address);
byte[] byteArray = Encoding.ASCII.GetBytes(command);

2
src/NzbDrone.Common/Instrumentation/ExceptronTarget.cs
View File

@ -48,7 +48,7 @@ protected override void Write(LogEventInfo logEvent)
{
if (logEvent == null || logEvent.Exception == null) return;
InternalLogger.Trace("Sending Exception to api.exceptron.com. Process Name: {0}", Process.GetCurrentProcess().ProcessName);
InternalLogger.Debug("Sending Exception to api.exceptron.com. Process Name: {0}", Process.GetCurrentProcess().ProcessName);
try
{

8
src/NzbDrone.Common/Processes/ProcessProvider.cs
View File

@ -60,7 +60,7 @@ public ProcessPriorityClass GetCurrentProcessPriority()
public ProcessInfo GetProcessById(int id)
{
Logger.Trace("Finding process with Id:{0}", id);
Logger.Debug("Finding process with Id:{0}", id);
var processInfo = ConvertToProcessInfo(Process.GetProcesses().FirstOrDefault(p => p.Id == id));
@ -70,7 +70,7 @@ public ProcessInfo GetProcessById(int id)
}
else
{
Logger.Trace("Found process {0}", processInfo.ToString());
Logger.Debug("Found process {0}", processInfo.ToString());
}
return processInfo;
@ -186,7 +186,7 @@ public ProcessOutput StartAndCapture(string path, string args = null)
public void WaitForExit(Process process)
{
Logger.Trace("Waiting for process {0} to exit.", process.ProcessName);
Logger.Debug("Waiting for process {0} to exit.", process.ProcessName);
process.WaitForExit();
}
@ -268,7 +268,7 @@ public void Kill(int processId)
if (process.HasExited)
{
Logger.Trace("Process has already exited");
Logger.Debug("Process has already exited");
return;
}

3
src/NzbDrone.Core.Test/InstrumentationTests/DatabaseTargetFixture.cs
View File

@ -4,7 +4,6 @@
using NLog;
using NUnit.Framework;
using NzbDrone.Common.Instrumentation;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Datastore.Migration.Framework;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Instrumentation;
@ -103,7 +102,7 @@ public void exception_log_with_no_message_should_use_exceptions_message()
public void null_string_as_arg_should_not_fail()
{
var epFile = new EpisodeFile();
_logger.Trace("File {0} no longer exists on disk. removing from database.", epFile.Path);
_logger.Debug("File {0} no longer exists on disk. removing from database.", epFile.Path);
epFile.Path.Should().BeNull();
}

2
src/NzbDrone.Core/Configuration/ConfigService.cs
View File

@ -247,7 +247,7 @@ public void SetValue(string key, string value)
{
key = key.ToLowerInvariant();
_logger.Trace("Writing Setting to file. Key:'{0}' Value:'{1}'", key, value);
_logger.Trace("Writing Setting to database. Key:'{0}' Value:'{1}'", key, value);
var dbValue = _repository.Get(key);

6
src/NzbDrone.Core/DataAugmentation/Xem/XemProxy.cs
View File

@ -38,7 +38,7 @@ private static RestRequest BuildRequest(string resource)
public List<int> GetXemSeriesIds()
{
_logger.Trace("Fetching Series IDs from");
_logger.Debug("Fetching Series IDs from");
var restClient = new RestClient(XEM_BASE_URL);
@ -52,9 +52,7 @@ public List<int> GetXemSeriesIds()
public List<XemSceneTvdbMapping> GetSceneTvdbMappings(int id)
{
_logger.Trace("Fetching Mappings for: {0}", id);
var url = String.Format("{0}all?id={1}&origin=tvdb", XEM_BASE_URL, id);
_logger.Debug("Fetching Mappings for: {0}", id);
var restClient = new RestClient(XEM_BASE_URL);

10
src/NzbDrone.Core/DataAugmentation/Xem/XemService.cs
View File

@ -30,7 +30,7 @@ public XemService(IEpisodeService episodeService,
private void PerformUpdate(Series series)
{
_logger.Trace("Updating scene numbering mapping for: {0}", series);
_logger.Debug("Updating scene numbering mapping for: {0}", series);
try
{
@ -38,7 +38,7 @@ private void PerformUpdate(Series series)
if (!mappings.Any())
{
_logger.Trace("Mappings for: {0} are empty, skipping", series);
_logger.Debug("Mappings for: {0} are empty, skipping", series);
_cache.Remove(series.TvdbId.ToString());
return;
}
@ -54,13 +54,13 @@ private void PerformUpdate(Series series)
foreach (var mapping in mappings)
{
_logger.Trace("Setting scene numbering mappings for {0} S{1:00}E{2:00}", series, mapping.Tvdb.Season, mapping.Tvdb.Episode);
_logger.Debug("Setting scene numbering mappings for {0} S{1:00}E{2:00}", series, mapping.Tvdb.Season, mapping.Tvdb.Episode);
var episode = episodes.SingleOrDefault(e => e.SeasonNumber == mapping.Tvdb.Season && e.EpisodeNumber == mapping.Tvdb.Episode);
if (episode == null)
{
_logger.Trace("Information hasn't been added to TheTVDB yet, skipping.");
_logger.Debug("Information hasn't been added to TheTVDB yet, skipping.");
continue;
}
@ -105,7 +105,7 @@ public void Handle(SeriesUpdatedEvent message)
if (!_cache.Find(message.Series.TvdbId.ToString()))
{
_logger.Trace("Scene numbering is not available for {0} [{1}]", message.Series.Title, message.Series.TvdbId);
_logger.Debug("Scene numbering is not available for {0} [{1}]", message.Series.Title, message.Series.TvdbId);
return;
}

2
src/NzbDrone.Core/Datastore/Migration/Framework/MigrationLogger.cs
View File

@ -32,7 +32,7 @@ public void Emphasize(string message)
public void Sql(string sql)
{
_logger.Trace(sql);
_logger.Debug(sql);
}
public void ElapsedTime(TimeSpan timeSpan)

2
src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
View File

@ -4,7 +4,7 @@
using NLog;
using NzbDrone.Core.DecisionEngine.Specifications;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Common.Serializer;

6
src/NzbDrone.Core/DecisionEngine/QualityUpgradableSpecification.cs
View File

@ -26,7 +26,7 @@ public bool IsUpgradable(QualityProfile profile, QualityModel currentQuality, Qu
int compare = new QualityModelComparer(profile).Compare(newQuality, currentQuality);
if (compare <= 0)
{
_logger.Trace("existing item has better or equal quality. skipping");
_logger.Debug("existing item has better or equal quality. skipping");
return false;
}
@ -50,7 +50,7 @@ public bool CutoffNotMet(QualityProfile profile, QualityModel currentQuality, Qu
return true;
}
_logger.Trace("Existing item meets cut-off. skipping.");
_logger.Debug("Existing item meets cut-off. skipping.");
return false;
}
@ -63,7 +63,7 @@ public bool IsProperUpgrade(QualityModel currentQuality, QualityModel newQuality
if (currentQuality.Quality == newQuality.Quality && compare > 0)
{
_logger.Trace("New quality is a proper for existing quality");
_logger.Debug("New quality is a proper for existing quality");
return true;
}

14
src/NzbDrone.Core/DecisionEngine/Specifications/AcceptableSizeSpecification.cs
View File

@ -27,19 +27,19 @@ public string RejectionReason
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
_logger.Trace("Beginning size check for: {0}", subject);
_logger.Debug("Beginning size check for: {0}", subject);
var quality = subject.ParsedEpisodeInfo.Quality.Quality;
if (quality == Quality.RAWHD)
{
_logger.Trace("Raw-HD release found, skipping size check.");
_logger.Debug("Raw-HD release found, skipping size check.");
return true;
}
if (quality == Quality.Unknown)
{
_logger.Trace("Unknown quality. skipping size check.");
_logger.Debug("Unknown quality. skipping size check.");
return false;
}
@ -52,12 +52,12 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
//If the parsed size is smaller than minSize we don't want it
if (subject.Release.Size < minSize)
{
_logger.Trace("Item: {0}, Size: {1} is smaller than minimum allowed size ({2}), rejecting.", subject, subject.Release.Size, minSize);
_logger.Debug("Item: {0}, Size: {1} is smaller than minimum allowed size ({2}), rejecting.", subject, subject.Release.Size, minSize);
return false;
}
if (qualityDefinition.MaxSize == 0)
{
_logger.Trace("Max size is 0 (unlimited) - skipping check.");
_logger.Debug("Max size is 0 (unlimited) - skipping check.");
}
else
{
@ -75,11 +75,11 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
//If the parsed size is greater than maxSize we don't want it
if (subject.Release.Size > maxSize)
{
_logger.Trace("Item: {0}, Size: {1} is greater than maximum allowed size ({2}), rejecting.", subject, subject.Release.Size, maxSize);
_logger.Debug("Item: {0}, Size: {1} is greater than maximum allowed size ({2}), rejecting.", subject, subject.Release.Size, maxSize);
return false;
}
}
_logger.Trace("Item: {0}, meets size constraints.", subject);
_logger.Debug("Item: {0}, meets size constraints.", subject);
return true;
}
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/BlacklistSpecification.cs
View File

@ -31,13 +31,13 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
{
if (!_configService.EnableFailedDownloadHandling)
{
_logger.Trace("Failed Download Handling is not enabled");
_logger.Debug("Failed Download Handling is not enabled");
return true;
}
if (_blacklistService.Blacklisted(subject.Series.Id, subject.Release.Title))
{
_logger.Trace("{0} is blacklisted, rejecting.", subject.Release.Title);
_logger.Debug("{0} is blacklisted, rejecting.", subject.Release.Title);
return false;
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/CutoffSpecification.cs
View File

@ -28,12 +28,12 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
{
foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
{
_logger.Trace("Comparing file quality with report. Existing file is {0}", file.Quality);
_logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality);
if (!_qualityUpgradableSpecification.CutoffNotMet(subject.Series.QualityProfile, file.Quality, subject.ParsedEpisodeInfo.Quality))
{
_logger.Trace("Cutoff already met, rejecting.");
_logger.Debug("Cutoff already met, rejecting.");
return false;
}
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs
View File

@ -24,10 +24,10 @@ public string RejectionReason
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
_logger.Trace("Checking if report meets language requirements. {0}", subject.ParsedEpisodeInfo.Language);
_logger.Debug("Checking if report meets language requirements. {0}", subject.ParsedEpisodeInfo.Language);
if (subject.ParsedEpisodeInfo.Language != Language.English)
{
_logger.Trace("Report Language: {0} rejected because it is not English", subject.ParsedEpisodeInfo.Language);
_logger.Debug("Report Language: {0} rejected because it is not English", subject.ParsedEpisodeInfo.Language);
return false;
}

2
src/NzbDrone.Core/DecisionEngine/Specifications/NotInQueueSpecification.cs
View File

@ -41,7 +41,7 @@ public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriter
if (IsInQueue(subject, queue))
{
_logger.Trace("Already in queue, rejecting.");
_logger.Debug("Already in queue, rejecting.");
return false;
}

8
src/NzbDrone.Core/DecisionEngine/Specifications/NotRestrictedReleaseSpecification.cs
View File

@ -27,13 +27,13 @@ public string RejectionReason
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
_logger.Trace("Checking if release contains any restricted terms: {0}", subject);
_logger.Debug("Checking if release contains any restricted terms: {0}", subject);
var restrictionsString = _configService.ReleaseRestrictions;
if (String.IsNullOrWhiteSpace(restrictionsString))
{
_logger.Trace("No restrictions configured, allowing: {0}", subject);
_logger.Debug("No restrictions configured, allowing: {0}", subject);
return true;
}
@ -43,12 +43,12 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
{
if (subject.Release.Title.ToLowerInvariant().Contains(restriction.ToLowerInvariant()))
{
_logger.Trace("{0} is restricted: {1}", subject, restriction);
_logger.Debug("{0} is restricted: {1}", subject, restriction);
return false;
}
}
_logger.Trace("No restrictions apply, allowing: {0}", subject);
_logger.Debug("No restrictions apply, allowing: {0}", subject);
return true;
}
}

2
src/NzbDrone.Core/DecisionEngine/Specifications/NotSampleSpecification.cs
View File

@ -18,7 +18,7 @@ public bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriter
{
if (subject.Release.Title.ToLower().Contains("sample") && subject.Release.Size < 70.Megabytes())
{
_logger.Trace("Sample release, rejecting.");
_logger.Debug("Sample release, rejecting.");
return false;
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/QualityAllowedByProfileSpecification.cs
View File

@ -23,10 +23,10 @@ public string RejectionReason
public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria)
{
_logger.Trace("Checking if report meets quality requirements. {0}", subject.ParsedEpisodeInfo.Quality);
_logger.Debug("Checking if report meets quality requirements. {0}", subject.ParsedEpisodeInfo.Quality);
if (!subject.Series.QualityProfile.Value.Items.Exists(v => v.Allowed && v.Quality == subject.ParsedEpisodeInfo.Quality.Quality))
{
_logger.Trace("Quality {0} rejected by Series' quality profile", subject.ParsedEpisodeInfo.Quality);
_logger.Debug("Quality {0} rejected by Series' quality profile", subject.ParsedEpisodeInfo.Quality);
return false;
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
View File

@ -30,10 +30,10 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
var age = subject.Release.Age;
var retention = _configService.Retention;
_logger.Trace("Checking if report meets retention requirements. {0}", age);
_logger.Debug("Checking if report meets retention requirements. {0}", age);
if (retention > 0 && age > retention)
{
_logger.Trace("Report age: {0} rejected by user's retention limit", age);
_logger.Debug("Report age: {0} rejected by user's retention limit", age);
return false;
}

10
src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/HistorySpecification.cs
View File

@ -37,7 +37,7 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
{
if (searchCriteria != null)
{
_logger.Trace("Skipping history check during search");
_logger.Debug("Skipping history check during search");
return true;
}
@ -45,15 +45,15 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
if (downloadClient != null && downloadClient.GetType() == typeof (Sabnzbd))
{
_logger.Trace("Performing history status check on report");
_logger.Debug("Performing history status check on report");
foreach (var episode in subject.Episodes)
{
_logger.Trace("Checking current status of episode [{0}] in history", episode.Id);
_logger.Debug("Checking current status of episode [{0}] in history", episode.Id);
var mostRecent = _historyService.MostRecentForEpisode(episode.Id);
if (mostRecent != null && mostRecent.EventType == HistoryEventType.Grabbed)
{
_logger.Trace("Latest history item is downloading, rejecting.");
_logger.Debug("Latest history item is downloading, rejecting.");
return false;
}
}
@ -65,7 +65,7 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
var bestQualityInHistory = _historyService.GetBestQualityInHistory(subject.Series.QualityProfile, episode.Id);
if (bestQualityInHistory != null)
{
_logger.Trace("Comparing history quality with report. History is {0}", bestQualityInHistory);
_logger.Debug("Comparing history quality with report. History is {0}", bestQualityInHistory);
if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.QualityProfile, bestQualityInHistory, subject.ParsedEpisodeInfo.Quality))
return false;
}

2
src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs
View File

@ -26,7 +26,7 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
{
if (searchCriteria != null)
{
_logger.Trace("Skipping monitored check during search");
_logger.Debug("Skipping monitored check during search");
return true;
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/ProperSpecification.cs
View File

@ -41,13 +41,13 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
{
if (file.DateAdded < DateTime.Today.AddDays(-7))
{
_logger.Trace("Proper for old file, rejecting: {0}", subject);
_logger.Debug("Proper for old file, rejecting: {0}", subject);
return false;
}
if (!_configService.AutoDownloadPropers)
{
_logger.Trace("Auto downloading of propers is disabled");
_logger.Debug("Auto downloading of propers is disabled");
return false;
}
}

2
src/NzbDrone.Core/DecisionEngine/Specifications/Search/DailyEpisodeMatchSpecification.cs
View File

@ -38,7 +38,7 @@ public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase search
if (!remoteEpisode.ParsedEpisodeInfo.IsDaily() || remoteEpisode.ParsedEpisodeInfo.AirDate != episode.AirDate)
{
_logger.Trace("Episode AirDate does not match searched episode number, skipping.");
_logger.Debug("Episode AirDate does not match searched episode number, skipping.");
return false;
}

2
src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeasonMatchSpecification.cs
View File

@ -33,7 +33,7 @@ public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase search
if (singleEpisodeSpec.SeasonNumber != remoteEpisode.ParsedEpisodeInfo.SeasonNumber)
{
_logger.Trace("Season number does not match searched season number, skipping.");
_logger.Debug("Season number does not match searched season number, skipping.");
return false;
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/Search/SeriesSpecification.cs
View File

@ -28,11 +28,11 @@ public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase search
return true;
}
_logger.Trace("Checking if series matches searched series");
_logger.Debug("Checking if series matches searched series");
if (remoteEpisode.Series.Id != searchCriteria.Series.Id)
{
_logger.Trace("Series {0} does not match {1}", remoteEpisode.Series, searchCriteria.Series);
_logger.Debug("Series {0} does not match {1}", remoteEpisode.Series, searchCriteria.Series);
return false;
}

4
src/NzbDrone.Core/DecisionEngine/Specifications/Search/SingleEpisodeSearchMatchSpecification.cs
View File

@ -34,13 +34,13 @@ public bool IsSatisfiedBy(RemoteEpisode remoteEpisode, SearchCriteriaBase search
if (singleEpisodeSpec.SeasonNumber != remoteEpisode.ParsedEpisodeInfo.SeasonNumber)
{
_logger.Trace("Season number does not match searched season number, skipping.");
_logger.Debug("Season number does not match searched season number, skipping.");
return false;
}
if (!remoteEpisode.ParsedEpisodeInfo.EpisodeNumbers.Contains(singleEpisodeSpec.EpisodeNumber))
{
_logger.Trace("Episode number does not match searched episode number, skipping.");
_logger.Debug("Episode number does not match searched episode number, skipping.");
return false;
}

2
src/NzbDrone.Core/DecisionEngine/Specifications/UpgradeDiskSpecification.cs
View File

@ -28,7 +28,7 @@ public virtual bool IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase sear
{
foreach (var file in subject.Episodes.Where(c => c.EpisodeFileId != 0).Select(c => c.EpisodeFile.Value))
{
_logger.Trace("Comparing file quality with report. Existing file is {0}", file.Quality);
_logger.Debug("Comparing file quality with report. Existing file is {0}", file.Quality);
if (!_qualityUpgradableSpecification.IsUpgradable(subject.Series.QualityProfile, file.Quality, subject.ParsedEpisodeInfo.Quality))
{

4
src/NzbDrone.Core/Download/Clients/Blackhole/Blackhole.cs
View File

@ -33,9 +33,9 @@ public override string DownloadNzb(RemoteEpisode remoteEpisode)
var filename = Path.Combine(Settings.Folder, title + ".nzb");
_logger.Trace("Downloading NZB from: {0} to: {1}", url, filename);
_logger.Debug("Downloading NZB from: {0} to: {1}", url, filename);
_httpProvider.DownloadFile(url, filename);
_logger.Trace("NZB Download succeeded, saved to: {0}", filename);
_logger.Debug("NZB Download succeeded, saved to: {0}", filename);
return null;
}

2
src/NzbDrone.Core/Download/Clients/Nzbget/NzbgetProxy.cs
View File

@ -48,7 +48,7 @@ private string ProcessRequest(IRestRequest restRequest, NzbgetSettings settings)
{
var client = BuildClient(settings);
var response = client.Execute(restRequest);
_logger.Trace("Response: {0}", response.Content);
_logger.Debug("Response: {0}", response.Content);
CheckForError(response);

4
src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
View File

@ -43,10 +43,10 @@ public override string DownloadNzb(RemoteEpisode remoteEpisode)
//Save to the Pneumatic directory (The user will need to ensure its accessible by XBMC)
var filename = Path.Combine(Settings.Folder, title + ".nzb");
logger.Trace("Downloading NZB from: {0} to: {1}", url, filename);
logger.Debug("Downloading NZB from: {0} to: {1}", url, filename);
_httpProvider.DownloadFile(url, filename);
logger.Trace("NZB Download succeeded, saved to: {0}", filename);
logger.Debug("NZB Download succeeded, saved to: {0}", filename);
var contents = String.Format("plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb={0}&nzbname={1}", filename, title);
_diskProvider.WriteAllText(Path.Combine(_configService.DownloadedEpisodesFolder, title + ".strm"), contents);

3
src/NzbDrone.Core/Download/Clients/Sabnzbd/SabnzbdProxy.cs
View File

@ -5,6 +5,7 @@
using NzbDrone.Common;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Download.Clients.Sabnzbd.Responses;
using NzbDrone.Core.Instrumentation.Extensions;
using RestSharp;
namespace NzbDrone.Core.Download.Clients.Sabnzbd
@ -124,7 +125,7 @@ private IRestClient BuildClient(string action, SabnzbdSettings settings)
action,
authentication);
_logger.Trace(url);
_logger.CleansedDebug(url);
return new RestClient(url);
}

2
src/NzbDrone.Core/Download/DownloadService.cs
View File

@ -1,7 +1,7 @@
using System;
using NLog;
using NzbDrone.Common.EnsureThat;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Parser.Model;

16
src/NzbDrone.Core/Download/FailedDownloadService.cs
View File

@ -58,7 +58,7 @@ private void CheckQueue(List<History.History> grabbedHistory, List<History.Histo
if (!failedItems.Any())
{
_logger.Trace("Yay! No encrypted downloads");
_logger.Debug("Yay! No encrypted downloads");
return;
}
@ -69,13 +69,13 @@ private void CheckQueue(List<History.History> grabbedHistory, List<History.Histo
if (!historyItems.Any())
{
_logger.Trace("Unable to find matching history item");
_logger.Debug("Unable to find matching history item");
continue;
}
if (failedHistory.Any(h => failedLocal.Id.Equals(h.Data.GetValueOrDefault(DOWNLOAD_CLIENT_ID))))
{
_logger.Trace("Already added to history as failed");
_logger.Debug("Already added to history as failed");
continue;
}
@ -103,7 +103,7 @@ private void CheckHistory(List<History.History> grabbedHistory, List<History.His
if (!failedItems.Any())
{
_logger.Trace("Yay! No failed downloads");
_logger.Debug("Yay! No failed downloads");
return;
}
@ -114,13 +114,13 @@ private void CheckHistory(List<History.History> grabbedHistory, List<History.His
if (!historyItems.Any())
{
_logger.Trace("Unable to find matching history item");
_logger.Debug("Unable to find matching history item");
continue;
}
if (failedHistory.Any(h => failedLocal.Id.Equals(h.Data.GetValueOrDefault(DOWNLOAD_CLIENT_ID))))
{
_logger.Trace("Already added to history as failed");
_logger.Debug("Already added to history as failed");
continue;
}
@ -164,7 +164,7 @@ private IDownloadClient GetDownloadClient()
if (downloadClient == null)
{
_logger.Trace("No download client is configured");
_logger.Debug("No download client is configured");
}
return downloadClient;
@ -174,7 +174,7 @@ public void Execute(CheckForFailedDownloadCommand message)
{
if (!_configService.EnableFailedDownloadHandling)
{
_logger.Trace("Failed Download Handling is not enabled");
_logger.Debug("Failed Download Handling is not enabled");
return;
}

8
src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs
View File

@ -32,13 +32,13 @@ public void Redownload(int seriesId, List<int> episodeIds)
{
if (!_configService.AutoRedownloadFailed)
{
_logger.Trace("Auto redownloading failed episodes is disabled");
_logger.Debug("Auto redownloading failed episodes is disabled");
return;
}
if (episodeIds.Count == 1)
{
_logger.Trace("Failed download only contains one episode, searching again");
_logger.Debug("Failed download only contains one episode, searching again");
_commandExecutor.PublishCommandAsync(new EpisodeSearchCommand
{
@ -53,7 +53,7 @@ public void Redownload(int seriesId, List<int> episodeIds)
if (episodeIds.Count == episodesInSeason.Count)
{
_logger.Trace("Failed download was entire season, searching again");
_logger.Debug("Failed download was entire season, searching again");
_commandExecutor.PublishCommandAsync(new SeasonSearchCommand
{
@ -64,7 +64,7 @@ public void Redownload(int seriesId, List<int> episodeIds)
return;
}
_logger.Trace("Failed download contains multiple episodes, probably a double episode, searching again");
_logger.Debug("Failed download contains multiple episodes, probably a double episode, searching again");
_commandExecutor.PublishCommandAsync(new EpisodeSearchCommand
{

2
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalNamingSpecs.cs
View File

@ -16,7 +16,7 @@ public CleanupAdditionalNamingSpecs(IDatabase database, Logger logger)
public void Clean()
{
_logger.Trace("Running naming spec cleanup");
_logger.Debug("Running naming spec cleanup");
var mapper = _database.GetDataMapper();

2
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlacklist.cs
View File

@ -16,7 +16,7 @@ public CleanupOrphanedBlacklist(IDatabase database, Logger logger)
public void Clean()
{
_logger.Trace("Running orphaned blacklist cleanup");
_logger.Debug("Running orphaned blacklist cleanup");
var mapper = _database.GetDataMapper();

2
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodeFiles.cs
View File

@ -16,7 +16,7 @@ public CleanupOrphanedEpisodeFiles(IDatabase database, Logger logger)
public void Clean()
{
_logger.Trace("Running orphaned episode files cleanup");
_logger.Debug("Running orphaned episode files cleanup");
var mapper = _database.GetDataMapper();

2
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedEpisodes.cs
View File

@ -16,7 +16,7 @@ public CleanupOrphanedEpisodes(IDatabase database, Logger logger)
public void Clean()
{
_logger.Trace("Running orphaned episodes cleanup");
_logger.Debug("Running orphaned episodes cleanup");
var mapper = _database.GetDataMapper();

2
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
View File

@ -16,7 +16,7 @@ public CleanupOrphanedHistoryItems(IDatabase database, Logger logger)
public void Clean()
{
_logger.Trace("Running orphaned history cleanup");
_logger.Debug("Running orphaned history cleanup");
CleanupOrphanedBySeries();
CleanupOrphanedByEpisode();
}

2
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
View File

@ -16,7 +16,7 @@ public CleanupOrphanedMetadataFiles(IDatabase database, Logger logger)
public void Clean()
{
_logger.Trace("Running orphaned episode files cleanup");
_logger.Debug("Running orphaned episode files cleanup");
DeleteOrphanedBySeries();
DeleteOrphanedByEpisodeFile();

4
src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureRunScheduledTasks.cs
View File

@ -21,10 +21,10 @@ public void Clean()
{
if (BuildInfo.IsDebug)
{
_logger.Trace("Not running scheduled task last execution cleanup during debug");
_logger.Debug("Not running scheduled task last execution cleanup during debug");
}
_logger.Trace("Running scheduled task last execution cleanup");
_logger.Debug("Running scheduled task last execution cleanup");
var mapper = _database.GetDataMapper();
mapper.AddParameter("time", DateTime.UtcNow);

2
src/NzbDrone.Core/Housekeeping/Housekeepers/UpdateCleanTitleForSeries.cs
View File

@ -18,7 +18,7 @@ public UpdateCleanTitleForSeries(ISeriesRepository seriesRepository, Logger logg
public void Clean()
{
_logger.Trace("Updating CleanTitle for all series");
_logger.Debug("Updating CleanTitle for all series");
var series = _seriesRepository.All().ToList();

2
src/NzbDrone.Core/IndexerSearch/EpisodeSearchService.cs
View File

@ -1,6 +1,6 @@
using NLog;
using NzbDrone.Core.Download;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.IndexerSearch

2
src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs
View File

@ -8,7 +8,7 @@
using NzbDrone.Core.DecisionEngine.Specifications;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Tv;
using System.Linq;

2
src/NzbDrone.Core/IndexerSearch/SeasonSearchService.cs
View File

@ -1,6 +1,6 @@
using NLog;
using NzbDrone.Core.Download;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.IndexerSearch

2
src/NzbDrone.Core/IndexerSearch/SeriesSearchService.cs
View File

@ -1,6 +1,6 @@
using NLog;
using NzbDrone.Core.Download;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Tv;

3
src/NzbDrone.Core/Indexers/IndexerFetchService.cs
View File

@ -5,6 +5,7 @@
using NzbDrone.Common;
using NzbDrone.Core.Indexers.Exceptions;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Parser.Model;
using System.Linq;
@ -115,7 +116,7 @@ private List<ReleaseInfo> Fetch(IIndexer indexer, IEnumerable<string> urls)
{
try
{
_logger.Trace("Downloading Feed " + url);
_logger.CleansedDebug("Downloading Feed " + url);
var xml = _httpProvider.DownloadString(url);
if (!string.IsNullOrWhiteSpace(xml))
{

2
src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
View File

@ -35,7 +35,7 @@ public override IEnumerable<ProviderDefinition> DefaultDefinitions
Enable = false,
Name = "Nzb.su",
Implementation = GetType().Name,
Settings = GetSettings("https://nzb.su", new List<Int32>())
Settings = GetSettings("https://api.nzb.su", new List<Int32>())
});
list.Add(new IndexerDefinition

2
src/NzbDrone.Core/Indexers/RssParserBase.cs
View File

@ -82,7 +82,7 @@ private ReleaseInfo ParseFeedItem(XElement item, string url)
throw new SizeParsingException("Unable to parse size from: {0} [{1}]", reportInfo.Title, url);
}
_logger.Trace("Parsed: {0} from: {1}", reportInfo, item.Title());
_logger.Trace("Parsed: {0}", item.Title());
return PostProcessor(item, reportInfo);
}

2
src/NzbDrone.Core/Indexers/RssSyncService.cs
View File

@ -2,7 +2,7 @@
using NLog;
using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Download;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Messaging.Commands;
namespace NzbDrone.Core.Indexers

46
src/NzbDrone.Core/Instrumentation/Extensions/LoggerCleansedExtensions.cs Normal file
View File

@ -0,0 +1,46 @@
using System;
using System.Text.RegularExpressions;
using NLog;
namespace NzbDrone.Core.Instrumentation.Extensions
{
public static class LoggerCleansedExtensions
{
private static readonly Regex CleansingRegex = new Regex(@"(?<=apikey=)(\w+?)(?=\W|$|_)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
public static void CleansedInfo(this Logger logger, string message, params object[] args)
{
var formattedMessage = String.Format(message, args);
LogCleansedMessage(logger, LogLevel.Info, formattedMessage);
}
public static void CleansedDebug(this Logger logger, string message, params object[] args)
{
var formattedMessage = String.Format(message, args);
LogCleansedMessage(logger, LogLevel.Debug, formattedMessage);
}
public static void CleansedTrace(this Logger logger, string message, params object[] args)
{
var formattedMessage = String.Format(message, args);
LogCleansedMessage(logger, LogLevel.Trace, formattedMessage);
}
private static void LogCleansedMessage(Logger logger, LogLevel level, string message)
{
message = Cleanse(message);
var logEvent = new LogEventInfo(level, logger.Name, message);
logEvent.Properties.Add("Status", "");
logger.Log(logEvent);
}
private static string Cleanse(string message)
{
//TODO: password=
return CleansingRegex.Replace(message, "<removed>");
}
}
}

2
src/NzbDrone.Core/Instrumentation/LoggerExtensions.cs → src/NzbDrone.Core/Instrumentation/Extensions/LoggerProgressExtensions.cs
View File

@ -1,7 +1,7 @@
using System;
using NLog;
namespace NzbDrone.Core.Instrumentation
namespace NzbDrone.Core.Instrumentation.Extensions
{
public static class LoggerExtensions
{

2
src/NzbDrone.Core/Jobs/TaskManager.cs
View File

@ -93,7 +93,7 @@ public void Handle(CommandExecutedEvent message)
if (scheduledTask != null)
{
_logger.Trace("Updating last run time for: {0}", scheduledTask.TypeName);
_logger.Debug("Updating last run time for: {0}", scheduledTask.TypeName);
_scheduledTaskRepository.SetLastExecutionTime(scheduledTask.Id, DateTime.UtcNow);
}
}

4
src/NzbDrone.Core/Lifecycle/LifecycleService.cs
View File

@ -1,9 +1,7 @@
using System;
using NLog;
using NLog;
using NzbDrone.Common;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Processes;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Lifecycle.Commands;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Messaging.Events;

6
src/NzbDrone.Core/MediaFiles/DiskScanService.cs
View File

@ -1,11 +1,9 @@
using System;
using System.IO;
using System.IO;
using System.Linq;
using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.MediaFiles.EpisodeImport;
using NzbDrone.Core.MediaFiles.Events;

2
src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
View File

@ -102,7 +102,7 @@ private List<ImportDecision> ProcessSubFolder(DirectoryInfo subfolderInfo)
var cleanedUpName = GetCleanedUpFolderName(subfolderInfo.Name);
var series = _parsingService.GetSeries(cleanedUpName);
var quality = QualityParser.ParseQuality(cleanedUpName);
_logger.Trace("{0} folder quality: {1}", cleanedUpName, quality);
_logger.Debug("{0} folder quality: {1}", cleanedUpName, quality);
if (series == null)
{

12
src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
View File

@ -50,7 +50,7 @@ public EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, Series series)
var newFileName = _buildFileNames.BuildFilename(episodes, series, episodeFile);
var filePath = _buildFileNames.BuildFilePath(series, episodes.First().SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
_logger.Trace("Renaming episode file: {0} to {1}", episodeFile, filePath);
_logger.Debug("Renaming episode file: {0} to {1}", episodeFile, filePath);
return MoveFile(episodeFile, series, episodes, filePath);
}
@ -60,7 +60,7 @@ public EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, LocalEpisode localEp
var newFileName = _buildFileNames.BuildFilename(localEpisode.Episodes, localEpisode.Series, episodeFile);
var filePath = _buildFileNames.BuildFilePath(localEpisode.Series, localEpisode.SeasonNumber, newFileName, Path.GetExtension(episodeFile.Path));
_logger.Trace("Moving episode file: {0} to {1}", episodeFile, filePath);
_logger.Debug("Moving episode file: {0} to {1}", episodeFile, filePath);
return MoveFile(episodeFile, localEpisode.Series, localEpisode.Episodes, filePath);
}
@ -110,14 +110,14 @@ private EpisodeFile MoveFile(EpisodeFile episodeFile, Series series, List<Episod
try
{
_logger.Trace("Setting last write time on series folder: {0}", series.Path);
_logger.Debug("Setting last write time on series folder: {0}", series.Path);
_diskProvider.FolderSetLastWriteTimeUtc(series.Path, episodeFile.DateAdded);
if (series.SeasonFolder)
{
var seasonFolder = Path.GetDirectoryName(destinationFilename);
_logger.Trace("Setting last write time on season folder: {0}", seasonFolder);
_logger.Debug("Setting last write time on season folder: {0}", seasonFolder);
_diskProvider.FolderSetLastWriteTimeUtc(seasonFolder, episodeFile.DateAdded);
}
}
@ -140,7 +140,7 @@ private EpisodeFile MoveFile(EpisodeFile episodeFile, Series series, List<Episod
if (ex is UnauthorizedAccessException || ex is InvalidOperationException)
{
_logger.Debug("Unable to apply folder permissions to: ", destinationFilename);
_logger.TraceException(ex.Message, ex);
_logger.DebugException(ex.Message, ex);
}
else
@ -175,7 +175,7 @@ private void SetPermissions(string path, string permissions)
if (ex is UnauthorizedAccessException || ex is InvalidOperationException)
{
_logger.Debug("Unable to apply permissions to: ", path);
_logger.TraceException(ex.Message, ex);
_logger.DebugException(ex.Message, ex);
}
else
{

4
src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportDecisionMaker.cs
View File

@ -63,12 +63,12 @@ private IEnumerable<ImportDecision> GetDecisions(IEnumerable<String> videoFiles,
{
if (quality != null && new QualityModelComparer(parsedEpisode.Series.QualityProfile).Compare(quality, parsedEpisode.Quality) > 0)
{
_logger.Trace("Using quality from folder: {0}", quality);
_logger.Debug("Using quality from folder: {0}", quality);
parsedEpisode.Quality = quality;
}
parsedEpisode.Size = _diskProvider.GetFileSize(file);
_logger.Trace("Size: {0}", parsedEpisode.Size);
_logger.Debug("Size: {0}", parsedEpisode.Size);
decision = GetDecision(parsedEpisode);
}

4
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FreeSpaceSpecification.cs
View File

@ -26,7 +26,7 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
{
if (localEpisode.ExistingFile)
{
_logger.Trace("Skipping free space check for existing episode");
_logger.Debug("Skipping free space check for existing episode");
return true;
}
@ -35,7 +35,7 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
if (!freeSpace.HasValue)
{
_logger.Trace("Free space check returned an invalid result for: {0}", path);
_logger.Debug("Free space check returned an invalid result for: {0}", path);
return true;
}

2
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/FullSeasonSpecification.cs
View File

@ -21,7 +21,7 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
{
if (localEpisode.ParsedEpisodeInfo.FullSeason)
{
_logger.Trace("Single episode file detected as containing all episodes in the season");
_logger.Debug("Single episode file detected as containing all episodes in the season");
return false;
}

4
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotInUseSpecification.cs
View File

@ -21,13 +21,13 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
{
if (localEpisode.ExistingFile)
{
_logger.Trace("{0} is in series folder, skipping in use check", localEpisode.Path);
_logger.Debug("{0} is in series folder, skipping in use check", localEpisode.Path);
return true;
}
if (_diskProvider.IsFileLocked(localEpisode.Path))
{
_logger.Trace("{0} is in use");
_logger.Debug("{0} is in use");
return false;
}

18
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotSampleSpecification.cs
View File

@ -37,19 +37,19 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
{
if (localEpisode.ExistingFile)
{
_logger.Trace("Existing file, skipping sample check");
_logger.Debug("Existing file, skipping sample check");
return true;
}
if (localEpisode.Series.SeriesType == SeriesTypes.Daily)
{
_logger.Trace("Daily Series, skipping sample check");
_logger.Debug("Daily Series, skipping sample check");
return true;
}
if (localEpisode.SeasonNumber == 0)
{
_logger.Trace("Special, skipping sample check");
_logger.Debug("Special, skipping sample check");
return true;
}
@ -57,7 +57,7 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
if (extension != null && extension.Equals(".flv", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Trace("Skipping sample check for .flv file");
_logger.Debug("Skipping sample check for .flv file");
return true;
}
@ -73,19 +73,19 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
if (runTime.TotalSeconds < 90)
{
_logger.Trace("[{0}] appears to be a sample. Size: {1} Runtime: {2}", localEpisode.Path, localEpisode.Size, runTime);
_logger.Debug("[{0}] appears to be a sample. Size: {1} Runtime: {2}", localEpisode.Path, localEpisode.Size, runTime);
return false;
}
}
catch (DllNotFoundException)
{
_logger.Trace("Falling back to file size detection");
_logger.Debug("Falling back to file size detection");
return CheckSize(localEpisode);
}
_logger.Trace("Runtime is over 90 seconds");
_logger.Debug("Runtime is over 90 seconds");
return true;
}
@ -95,14 +95,14 @@ private bool CheckSize(LocalEpisode localEpisode)
{
if (localEpisode.Size < SampleSizeLimit * 2)
{
_logger.Trace("1080p file is less than sample limit");
_logger.Debug("1080p file is less than sample limit");
return false;
}
}
if (localEpisode.Size < SampleSizeLimit)
{
_logger.Trace("File is less than sample limit");
_logger.Debug("File is less than sample limit");
return false;
}

6
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/NotUnpackingSpecification.cs
View File

@ -28,7 +28,7 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
{
if (localEpisode.ExistingFile)
{
_logger.Trace("{0} is in series folder, unpacking check", localEpisode.Path);
_logger.Debug("{0} is in series folder, unpacking check", localEpisode.Path);
return true;
}
@ -38,13 +38,13 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
{
if (OsInfo.IsMono)
{
_logger.Trace("{0} is still being unpacked", localEpisode.Path);
_logger.Debug("{0} is still being unpacked", localEpisode.Path);
return false;
}
if (_diskProvider.FileGetLastWriteUtc(localEpisode.Path) > DateTime.UtcNow.AddMinutes(-5))
{
_logger.Trace("{0} appears to be unpacking still", localEpisode.Path);
_logger.Debug("{0} appears to be unpacking still", localEpisode.Path);
return false;
}
}

2
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/UpgradeSpecification.cs
View File

@ -22,7 +22,7 @@ public bool IsSatisfiedBy(LocalEpisode localEpisode)
var qualityComparer = new QualityModelComparer(localEpisode.Series.QualityProfile);
if (localEpisode.Episodes.Any(e => e.EpisodeFileId != 0 && qualityComparer.Compare(e.EpisodeFile.Value.Quality, localEpisode.Quality) > 0))
{
_logger.Trace("This file isn't an upgrade for all episodes. Skipping {0}", localEpisode.Path);
_logger.Debug("This file isn't an upgrade for all episodes. Skipping {0}", localEpisode.Path);
return false;
}

8
src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs
View File

@ -43,21 +43,21 @@ public void Execute(CleanMediaFileDb message)
{
if (!_diskProvider.FileExists(episodeFile.Path))
{
_logger.Trace("File [{0}] no longer exists on disk, removing from db", episodeFile.Path);
_logger.Debug("File [{0}] no longer exists on disk, removing from db", episodeFile.Path);
_mediaFileService.Delete(episodeFile);
continue;
}
if (!DiskProviderBase.IsParent(series.Path, episodeFile.Path))
{
_logger.Trace("File [{0}] does not belong to this series, removing from db", episodeFile.Path);
_logger.Debug("File [{0}] does not belong to this series, removing from db", episodeFile.Path);
_mediaFileService.Delete(episodeFile);
continue;
}
if (!episodes.Any(e => e.EpisodeFileId == episodeFile.Id))
{
_logger.Trace("File [{0}] is not assigned to any episodes, removing from db", episodeFile.Path);
_logger.Debug("File [{0}] is not assigned to any episodes, removing from db", episodeFile.Path);
_mediaFileService.Delete(episodeFile);
continue;
}
@ -66,7 +66,7 @@ public void Execute(CleanMediaFileDb message)
//
// if (localEpsiode == null || episodes.Count != localEpsiode.Episodes.Count)
// {
// _logger.Trace("File [{0}] parsed episodes has changed, removing from db", episodeFile.Path);
// _logger.Debug("File [{0}] parsed episodes has changed, removing from db", episodeFile.Path);
// _mediaFileService.Delete(episodeFile);
// continue;
// }

2
src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs
View File

@ -36,7 +36,7 @@ public MediaInfoModel GetMediaInfo(string filename)
try
{
mediaInfo = new MediaInfoLib.MediaInfo();
_logger.Trace("Getting media info from {0}", filename);
_logger.Debug("Getting media info from {0}", filename);
mediaInfo.Option("ParseSpeed", "0.2");
int open = mediaInfo.Open(filename);

20
src/NzbDrone.Core/MediaFiles/RecycleBinProvider.cs
View File

@ -50,10 +50,10 @@ public void DeleteFolder(string path)
{
var destination = Path.Combine(recyclingBin, new DirectoryInfo(path).Name);
logger.Trace("Moving '{0}' to '{1}'", path, destination);
logger.Debug("Moving '{0}' to '{1}'", path, destination);
_diskProvider.MoveFolder(path, destination);
logger.Trace("Setting last accessed: {0}", path);
logger.Debug("Setting last accessed: {0}", path);
_diskProvider.FolderSetLastWriteTimeUtc(destination, DateTime.UtcNow);
foreach (var file in _diskProvider.GetFiles(destination, SearchOption.AllDirectories))
{
@ -75,21 +75,21 @@ public void DeleteFile(string path)
if (!OsInfo.IsMono)
{
logger.Trace(_diskProvider.GetFileAttributes(path));
logger.Debug(_diskProvider.GetFileAttributes(path));
}
_diskProvider.DeleteFile(path);
logger.Trace("File has been permanently deleted: {0}", path);
logger.Debug("File has been permanently deleted: {0}", path);
}
else
{
var destination = Path.Combine(recyclingBin, new FileInfo(path).Name);
logger.Trace("Moving '{0}' to '{1}'", path, destination);
logger.Debug("Moving '{0}' to '{1}'", path, destination);
_diskProvider.MoveFile(path, destination);
_diskProvider.FileSetLastWriteTimeUtc(destination, DateTime.UtcNow);
logger.Trace("File has been moved to the recycling bin: {0}", destination);
logger.Debug("File has been moved to the recycling bin: {0}", destination);
}
}
@ -113,7 +113,7 @@ public void Empty()
_diskProvider.DeleteFile(file);
}
logger.Trace("Recycling Bin has been emptied.");
logger.Debug("Recycling Bin has been emptied.");
}
public void Cleanup()
@ -130,7 +130,7 @@ public void Cleanup()
{
if (_diskProvider.FolderGetLastWrite(folder).AddDays(7) > DateTime.UtcNow)
{
logger.Trace("Folder hasn't expired yet, skipping: {0}", folder);
logger.Debug("Folder hasn't expired yet, skipping: {0}", folder);
continue;
}
@ -141,14 +141,14 @@ public void Cleanup()
{
if (_diskProvider.FileGetLastWriteUtc(file).AddDays(7) > DateTime.UtcNow)
{
logger.Trace("File hasn't expired yet, skipping: {0}", file);
logger.Debug("File hasn't expired yet, skipping: {0}", file);
continue;
}
_diskProvider.DeleteFile(file);
}
logger.Trace("Recycling Bin has been cleaned up.");
logger.Debug("Recycling Bin has been cleaned up.");
}
public void HandleAsync(SeriesDeletedEvent message)

10
src/NzbDrone.Core/MediaFiles/RenameEpisodeFileService.cs
View File

@ -4,7 +4,7 @@
using System.Linq;
using NLog;
using NzbDrone.Common;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.Messaging.Commands;
@ -115,17 +115,17 @@ private void RenameFiles(List<EpisodeFile> episodeFiles, Series series)
{
try
{
_logger.Trace("Renaming episode file: {0}", episodeFile);
_logger.Debug("Renaming episode file: {0}", episodeFile);
_episodeFileMover.MoveEpisodeFile(episodeFile, series);
_mediaFileService.Update(episodeFile);
renamed.Add(episodeFile);
_logger.Trace("Renamed episode file: {0}", episodeFile);
_logger.Debug("Renamed episode file: {0}", episodeFile);
}
catch (SameFilenameException ex)
{
_logger.Trace("File not renamed, source and destination are the same: {0}", ex.Filename);
_logger.Debug("File not renamed, source and destination are the same: {0}", ex.Filename);
}
catch (Exception ex)
{
@ -151,7 +151,7 @@ public void Execute(RenameFilesCommand message)
public void Execute(RenameSeriesCommand message)
{
_logger.Trace("Renaming all files for selected series");
_logger.Debug("Renaming all files for selected series");
var seriesToRename = _seriesService.GetSeries(message.SeriesIds);
foreach (var series in seriesToRename)

2
src/NzbDrone.Core/MediaFiles/UpdateEpisodeFileService.cs
View File

@ -5,7 +5,7 @@
using NzbDrone.Common;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Tv;

2
src/NzbDrone.Core/MediaFiles/UpgradeMediaFileService.cs
View File

@ -46,7 +46,7 @@ public EpisodeFileMoveResult UpgradeEpisodeFile(EpisodeFile episodeFile, LocalEp
if (_diskProvider.FileExists(file.Path))
{
_logger.Trace("Removing existing episode file: {0}", file);
_logger.Debug("Removing existing episode file: {0}", file);
_recycleBinProvider.DeleteFile(file.Path);
}

4
src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
View File

@ -39,7 +39,7 @@ public void PublishCommand<TCommand>(TCommand command) where TCommand : Command
if (_trackCommands.FindExisting(command) != null)
{
_logger.Debug("Command is already in progress: {0}", command.GetType().Name);
_logger.Trace("Command is already in progress: {0}", command.GetType().Name);
return;
}
@ -64,7 +64,7 @@ public Command PublishCommandAsync<TCommand>(TCommand command) where TCommand :
if (existingCommand != null)
{
_logger.Debug("Command is already in progress: {0}", command.GetType().Name);
_logger.Trace("Command is already in progress: {0}", command.GetType().Name);
return existingCommand;
}

2
src/NzbDrone.Core/Messaging/Commands/TestCommandExecutor.cs
View File

@ -1,6 +1,6 @@
using System.Threading;
using NLog;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
namespace NzbDrone.Core.Messaging.Commands
{

2
src/NzbDrone.Core/Messaging/Events/EventAggregator.cs
View File

@ -83,7 +83,7 @@ private static string GetEventName(Type eventType)
return eventType.Name;
}
return string.Format("{0}<{1}>", eventType.Name.Remove(eventType.Name.IndexOf('`')), eventType.GetGenericArguments()[0].Name);
return String.Format("{0}<{1}>", eventType.Name.Remove(eventType.Name.IndexOf('`')), eventType.GetGenericArguments()[0].Name);
}
}
}

8
src/NzbDrone.Core/MetaData/Consumers/Xbmc/XbmcMetadata.cs
View File

@ -151,7 +151,7 @@ public override void AfterRename(Series series, List<MetadataFile> existingMetad
else
{
_logger.Trace("Unknown episode file metadata: {0}", metadataFile.RelativePath);
_logger.Debug("Unknown episode file metadata: {0}", metadataFile.RelativePath);
continue;
}
@ -237,7 +237,7 @@ public override MetadataFile FindMetadataFile(Series series, string path)
private MetadataFile WriteTvShowNfo(Series series, List<MetadataFile> existingMetadataFiles)
{
_logger.Trace("Generating tvshow.nfo for: {0}", series.Title);
_logger.Debug("Generating tvshow.nfo for: {0}", series.Title);
var sb = new StringBuilder();
var xws = new XmlWriterSettings();
xws.OmitXmlDeclaration = true;
@ -310,7 +310,7 @@ private IEnumerable<MetadataFile> WriteSeriesImages(Series series, List<Metadata
//TODO: Do we want to overwrite the file if it exists?
if (_diskProvider.FileExists(destination))
{
_logger.Trace("Series image: {0} already exists.", image.CoverType);
_logger.Debug("Series image: {0} already exists.", image.CoverType);
continue;
}
@ -453,7 +453,7 @@ private MetadataFile WriteEpisodeImages(Series series, EpisodeFile episodeFile,
if (screenshot == null)
{
_logger.Trace("Episode screenshot not available");
_logger.Debug("Episode screenshot not available");
return null;
}

4
src/NzbDrone.Core/MetaData/Files/CleanMetadataService.cs
View File

@ -28,7 +28,7 @@ public CleanMetadataService(IMetadataFileService metadataFileService,
public void Clean(Series series)
{
_logger.Trace("Cleaning missing metadata files for series: {0}", series.Title);
_logger.Debug("Cleaning missing metadata files for series: {0}", series.Title);
var metadataFiles = _metadataFileService.GetFilesBySeries(series.Id);
@ -36,7 +36,7 @@ public void Clean(Series series)
{
if (!_diskProvider.FileExists(Path.Combine(series.Path, metadataFile.RelativePath)))
{
_logger.Trace("Deleting metadata file from database: {0}", metadataFile.RelativePath);
_logger.Debug("Deleting metadata file from database: {0}", metadataFile.RelativePath);
_metadataFileService.Delete(metadataFile.Id);
}
}

6
src/NzbDrone.Core/Metadata/ExistingMetadataService.cs
View File

@ -37,7 +37,7 @@ public void Handle(SeriesUpdatedEvent message)
{
if (!_diskProvider.FolderExists(message.Series.Path)) return;
_logger.Trace("Looking for existing metadata in {0}", message.Series.Path);
_logger.Debug("Looking for existing metadata in {0}", message.Series.Path);
var filesOnDisk = _diskProvider.GetFiles(message.Series.Path, SearchOption.AllDirectories);
var possibleMetadataFiles = filesOnDisk.Where(c => !MediaFileExtensions.Extensions.Contains(Path.GetExtension(c).ToLower())).ToList();
@ -60,13 +60,13 @@ public void Handle(SeriesUpdatedEvent message)
if (localEpisode == null)
{
_logger.Trace("Cannot find related episodes for: {0}", possibleMetadataFile);
_logger.Debug("Cannot find related episodes for: {0}", possibleMetadataFile);
break;
}
if (localEpisode.Episodes.DistinctBy(e => e.EpisodeFileId).Count() > 1)
{
_logger.Trace("Metadata file: {0} does not match existing files.", possibleMetadataFile);
_logger.Debug("Metadata file: {0} does not match existing files.", possibleMetadataFile);
break;
}

4
src/NzbDrone.Core/Metadata/Files/MetadataFileService.cs
View File

@ -82,7 +82,7 @@ public void Delete(int id)
public void HandleAsync(SeriesDeletedEvent message)
{
_logger.Trace("Deleting Metadata from database for series: {0}", message.Series);
_logger.Debug("Deleting Metadata from database for series: {0}", message.Series);
_repository.DeleteForSeries(message.Series.Id);
}
@ -101,7 +101,7 @@ public void HandleAsync(EpisodeFileDeletedEvent message)
}
}
_logger.Trace("Deleting Metadata from database for episode file: {0}", episodeFile);
_logger.Debug("Deleting Metadata from database for episode file: {0}", episodeFile);
_repository.DeleteForEpisodeFile(episodeFile.Id);
}

2
src/NzbDrone.Core/Metadata/MetadataBase.cs
View File

@ -61,7 +61,7 @@ protected virtual void DownloadImage(Series series, string url, string path)
{
if (_diskProvider.FileExists(path))
{
_logger.Trace("Image already exists: {0}, will not download again.", path);
_logger.Debug("Image already exists: {0}, will not download again.", path);
return;
}

2
src/NzbDrone.Core/Notifications/Email/EmailService.cs
View File

@ -44,7 +44,7 @@ public void SendEmail(EmailSettings settings, string subject, string body, bool
catch(Exception ex)
{
_logger.Error("Error sending email. Subject: {0}", email.Subject);
_logger.TraceException(ex.Message, ex);
_logger.DebugException(ex.Message, ex);
}
}

4
src/NzbDrone.Core/Notifications/Growl/GrowlService.cs
View File

@ -35,13 +35,13 @@ public void SendNotification(string title, string message, string notificationTy
_growlConnector = new GrowlConnector(password, hostname, port);
Logger.Trace("Sending Notification to: {0}:{1}", hostname, port);
Logger.Debug("Sending Notification to: {0}:{1}", hostname, port);
_growlConnector.Notify(notification);
}
private void Register(string host, int port, string password)
{
Logger.Trace("Registering NzbDrone with Growl host: {0}:{1}", host, port);
Logger.Debug("Registering NzbDrone with Growl host: {0}:{1}", host, port);
_growlConnector = new GrowlConnector(password, host, port);
_growlConnector.Register(_growlApplication, _notificationTypes.ToArray());
}

8
src/NzbDrone.Core/Notifications/Plex/PlexService.cs
View File

@ -42,7 +42,7 @@ public void UpdateLibrary(PlexServerSettings settings)
{
try
{
_logger.Trace("Sending Update Request to Plex Server");
_logger.Debug("Sending Update Request to Plex Server");
var sections = GetSectionKeys(settings);
sections.ForEach(s => UpdateSection(settings, s));
}
@ -56,7 +56,7 @@ public void UpdateLibrary(PlexServerSettings settings)
public List<int> GetSectionKeys(PlexServerSettings settings)
{
_logger.Trace("Getting sections from Plex host: {0}", settings.Host);
_logger.Debug("Getting sections from Plex host: {0}", settings.Host);
var url = String.Format("http://{0}:{1}/library/sections", settings.Host, settings.Port);
var xmlStream = _httpProvider.DownloadStream(url, null);
var xDoc = XDocument.Load(xmlStream);
@ -68,7 +68,7 @@ public List<int> GetSectionKeys(PlexServerSettings settings)
public void UpdateSection(PlexServerSettings settings, int key)
{
_logger.Trace("Updating Plex host: {0}, Section: {1}", settings.Host, key);
_logger.Debug("Updating Plex host: {0}, Section: {1}", settings.Host, key);
var url = String.Format("http://{0}:{1}/library/sections/{2}/refresh", settings.Host, settings.Port, key);
_httpProvider.DownloadString(url);
}
@ -87,7 +87,7 @@ public string SendCommand(string host, int port, string command, string username
public void Execute(TestPlexClientCommand message)
{
_logger.Trace("Sending Test Notifcation to Plex Client: {0}", message.Host);
_logger.Debug("Sending Test Notifcation to Plex Client: {0}", message.Host);
var command = String.Format("ExecBuiltIn(Notification({0}, {1}))", "Test Notification", "Success! Notifications are setup correctly");
var result = SendCommand(message.Host, message.Port, command, message.Username, message.Password);

8
src/NzbDrone.Core/Notifications/Prowl/ProwlService.cs
View File

@ -36,7 +36,7 @@ public void SendNotification(string title, string message, string apiKey, Notifi
var client = new ProwlClient();
_logger.Trace("Sending Prowl Notification");
_logger.Debug("Sending Prowl Notification");
var notificationResult = client.SendNotification(notification);
@ -48,7 +48,7 @@ public void SendNotification(string title, string message, string apiKey, Notifi
catch (Exception ex)
{
_logger.TraceException(ex.Message, ex);
_logger.DebugException(ex.Message, ex);
_logger.Warn("Invalid API Key: {0}", apiKey);
}
}
@ -62,7 +62,7 @@ public void Verify(string apiKey)
var client = new ProwlClient();
_logger.Trace("Verifying API Key: {0}", apiKey);
_logger.Debug("Verifying API Key: {0}", apiKey);
var verificationResult = client.SendVerification(verificationRequest);
if (!String.IsNullOrWhiteSpace(verificationResult.ErrorMessage) &&
@ -74,7 +74,7 @@ public void Verify(string apiKey)
catch (Exception ex)
{
_logger.TraceException(ex.Message, ex);
_logger.DebugException(ex.Message, ex);
_logger.Warn("Invalid API Key: {0}", apiKey);
throw new InvalidApiKeyException("API Key: " + apiKey + " is invalid");
}

12
src/NzbDrone.Core/Notifications/Xbmc/HttpApiProvider.cs
View File

@ -33,7 +33,7 @@ public void Update(XbmcSettings settings, Series series)
{
if (!settings.AlwaysUpdate)
{
_logger.Trace("Determining if there are any active players on XBMC host: {0}", settings.Address);
_logger.Debug("Determining if there are any active players on XBMC host: {0}", settings.Address);
var activePlayers = GetActivePlayers(settings);
if (activePlayers.Any(a => a.Type.Equals("video")))
@ -77,7 +77,7 @@ public List<ActivePlayer> GetActivePlayers(XbmcSettings settings)
public bool CheckForError(string response)
{
_logger.Trace("Looking for error in response: {0}", response);
_logger.Debug("Looking for error in response: {0}", response);
if (String.IsNullOrWhiteSpace(response))
{
@ -92,7 +92,7 @@ public bool CheckForError(string response)
var errorMessage = response.Substring(errorIndex + 6);
errorMessage = errorMessage.Substring(0, errorMessage.IndexOfAny(new char[] { '<', ';' }));
_logger.Trace("Error found in response: {0}", errorMessage);
_logger.Debug("Error found in response: {0}", errorMessage);
return true;
}
@ -141,13 +141,13 @@ private void UpdateLibrary(XbmcSettings settings, Series series)
{
try
{
_logger.Trace("Sending Update DB Request to XBMC Host: {0}", settings.Address);
_logger.Debug("Sending Update DB Request to XBMC Host: {0}", settings.Address);
var xbmcSeriesPath = GetSeriesPath(settings, series);
//If the path is found update it, else update the whole library
if (!String.IsNullOrEmpty(xbmcSeriesPath))
{
_logger.Trace("Updating series [{0}] on XBMC host: {1}", series, settings.Address);
_logger.Debug("Updating series [{0}] on XBMC host: {1}", series, settings.Address);
var command = BuildExecBuiltInCommand(String.Format("UpdateLibrary(video,{0})", xbmcSeriesPath));
SendCommand(settings, command);
}
@ -155,7 +155,7 @@ private void UpdateLibrary(XbmcSettings settings, Series series)
else
{
//Update the entire library
_logger.Trace("Series [{0}] doesn't exist on XBMC host: {1}, Updating Entire Library", series, settings.Address);
_logger.Debug("Series [{0}] doesn't exist on XBMC host: {1}, Updating Entire Library", series, settings.Address);
var command = BuildExecBuiltInCommand("UpdateLibrary(video)");
SendCommand(settings, command);
}

14
src/NzbDrone.Core/Notifications/Xbmc/JsonApiProvider.cs
View File

@ -38,7 +38,7 @@ public void Update(XbmcSettings settings, Series series)
{
if (!settings.AlwaysUpdate)
{
_logger.Trace("Determining if there are any active players on XBMC host: {0}", settings.Address);
_logger.Debug("Determining if there are any active players on XBMC host: {0}", settings.Address);
var activePlayers = GetActivePlayers(settings);
if (activePlayers.Any(a => a.Type.Equals("video")))
@ -87,7 +87,7 @@ public List<ActivePlayer> GetActivePlayers(XbmcSettings settings)
public bool CheckForError(string response)
{
_logger.Trace("Looking for error in response: {0}", response);
_logger.Debug("Looking for error in response: {0}", response);
if (String.IsNullOrWhiteSpace(response))
{
@ -114,7 +114,7 @@ public string GetSeriesPath(XbmcSettings settings, Series series)
if (!allSeries.Any())
{
_logger.Trace("No TV shows returned from XBMC");
_logger.Debug("No TV shows returned from XBMC");
return null;
}
@ -140,7 +140,7 @@ private void UpdateLibrary(XbmcSettings settings, Series series)
if (seriesPath != null)
{
_logger.Trace("Updating series {0} (Path: {1}) on XBMC host: {2}", series, seriesPath, settings.Address);
_logger.Debug("Updating series {0} (Path: {1}) on XBMC host: {2}", series, seriesPath, settings.Address);
var parameters = new JObject(new JObject(new JProperty("directory", seriesPath)));
postJson = BuildJsonRequest("VideoLibrary.Scan", parameters);
@ -148,7 +148,7 @@ private void UpdateLibrary(XbmcSettings settings, Series series)
else
{
_logger.Trace("Series {0} doesn't exist on XBMC host: {1}, Updating Entire Library", series,
_logger.Debug("Series {0} doesn't exist on XBMC host: {1}, Updating Entire Library", series,
settings.Address);
postJson = BuildJsonRequest("VideoLibrary.Scan");
@ -158,12 +158,12 @@ private void UpdateLibrary(XbmcSettings settings, Series series)
if (CheckForError(response)) return;
_logger.Trace(" from response");
_logger.Debug(" from response");
var result = Json.Deserialize<XbmcJsonResult<String>>(response);
if (!result.Result.Equals("OK", StringComparison.InvariantCultureIgnoreCase))
{
_logger.Trace("Failed to update library for: {0}", settings.Address);
_logger.Debug("Failed to update library for: {0}", settings.Address);
}
}

6
src/NzbDrone.Core/Notifications/Xbmc/XbmcService.cs
View File

@ -61,7 +61,7 @@ public XbmcVersion GetJsonVersion(XbmcSettings settings)
var response = _httpProvider.PostCommand(settings.Address, settings.Username, settings.Password, postJson.ToString());
Logger.Trace("Getting version from response");
Logger.Debug("Getting version from response");
var result = Json.Deserialize<XbmcJsonResult<JObject>>(response);
var versionObject = result.Result.Property("version");
@ -108,9 +108,9 @@ public void Execute(TestXbmcCommand message)
DisplayTime = message.DisplayTime
};
Logger.Trace("Determining version of XBMC Host: {0}", settings.Address);
Logger.Debug("Determining version of XBMC Host: {0}", settings.Address);
var version = GetJsonVersion(settings);
Logger.Trace("Version is: {0}", version);
Logger.Debug("Version is: {0}", version);
if (version == new XbmcVersion(0))
{

3
src/NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -308,6 +308,8 @@
<Compile Include="Instrumentation\Commands\DeleteLogFilesCommand.cs" />
<Compile Include="Instrumentation\Commands\TrimLogCommand.cs" />
<Compile Include="Instrumentation\DeleteLogFilesService.cs" />
<Compile Include="Instrumentation\Extensions\LoggerCleansedExtensions.cs" />
<Compile Include="Instrumentation\Extensions\LoggerProgressExtensions.cs" />
<Compile Include="MediaFiles\Commands\RenameSeriesCommand.cs" />
<Compile Include="MediaFiles\Commands\RescanSeriesCommand.cs" />
<Compile Include="Lifecycle\Commands\ShutdownCommand.cs" />
@ -368,7 +370,6 @@
<Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidProxy.cs" />
<Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidSettings.cs" />
<Compile Include="Notifications\NotifyMyAndroid\TestNotifyMyAndroidCommand.cs" />
<Compile Include="Instrumentation\LoggerExtensions.cs" />
<Compile Include="MediaFiles\Commands\BackendCommandAttribute.cs" />
<Compile Include="Messaging\Commands\BackendCommandAttribute.cs" />
<Compile Include="Messaging\Commands\Command.cs" />

5
src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
View File

@ -29,5 +29,10 @@ private set
}
public int TvRageId { get; set; }
public override string ToString()
{
return String.Format("[{0}] {1} [{2}]", PublishDate, Title, Size);
}
}
}

21
src/NzbDrone.Core/Parser/Parser.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
@ -129,7 +128,7 @@ public static ParsedEpisodeInfo ParsePath(string path)
if (result == null)
{
Logger.Trace("Attempting to parse episode info using full path. {0}", fileInfo.FullName);
Logger.Debug("Attempting to parse episode info using full path. {0}", fileInfo.FullName);
result = ParseTitle(fileInfo.FullName);
}
@ -150,7 +149,7 @@ public static ParsedEpisodeInfo ParseTitle(string title)
{
if (!ValidateBeforeParsing(title)) return null;
Logger.Trace("Parsing string '{0}'", title);
Logger.Debug("Parsing string '{0}'", title);
var simpleTitle = SimpleTitleRegex.Replace(title, String.Empty);
foreach (var regex in ReportTitleRegex)
@ -166,20 +165,20 @@ public static ParsedEpisodeInfo ParseTitle(string title)
if (result != null)
{
result.Language = ParseLanguage(title);
Logger.Trace("Language parsed: {0}", result.Language);
Logger.Debug("Language parsed: {0}", result.Language);
result.Quality = QualityParser.ParseQuality(title);
Logger.Trace("Quality parsed: {0}", result.Quality);
Logger.Debug("Quality parsed: {0}", result.Quality);
result.ReleaseGroup = ParseReleaseGroup(title);
Logger.Trace("Release Group parsed: {0}", result.ReleaseGroup);
Logger.Debug("Release Group parsed: {0}", result.ReleaseGroup);
return result;
}
}
catch (InvalidDateException ex)
{
Logger.TraceException(ex.Message, ex);
Logger.DebugException(ex.Message, ex);
break;
}
}
@ -191,13 +190,13 @@ public static ParsedEpisodeInfo ParseTitle(string title)
Logger.ErrorException("An error has occurred while trying to parse " + title, e);
}
Logger.Trace("Unable to parse {0}", title);
Logger.Debug("Unable to parse {0}", title);
return null;
}
public static string ParseSeriesName(string title)
{
Logger.Trace("Parsing string '{0}'", title);
Logger.Debug("Parsing string '{0}'", title);
var parseResult = ParseTitle(title);
@ -402,7 +401,7 @@ private static ParsedEpisodeInfo ParseMatchCollection(MatchCollection matchColle
result.SeriesTitle = CleanSeriesTitle(seriesName);
result.SeriesTitleInfo = GetSeriesTitleInfo(result.SeriesTitle);
Logger.Trace("Episode Parsed. {0}", result);
Logger.Debug("Episode Parsed. {0}", result);
return result;
}
@ -492,7 +491,7 @@ private static bool ValidateBeforeParsing(string title)
{
if (title.ToLower().Contains("password") && title.ToLower().Contains("yenc"))
{
Logger.Trace("");
Logger.Debug("");
return false;
}

6
src/NzbDrone.Core/Parser/ParsingService.cs
View File

@ -66,7 +66,7 @@ public LocalEpisode GetLocalEpisode(string filename, Series series, bool sceneSo
if (!episodes.Any())
{
_logger.Trace("No matching episodes found for: {0}", parsedEpisodeInfo);
_logger.Debug("No matching episodes found for: {0}", parsedEpisodeInfo);
return null;
}
@ -256,7 +256,7 @@ public ParsedEpisodeInfo ParseSpecialEpisodeTitle(string title, int tvRageId, Se
if (series == null)
{
_logger.Trace("No matching series {0}", title);
_logger.Debug("No matching series {0}", title);
return null;
}
@ -325,7 +325,7 @@ private Series GetSeries(ParsedEpisodeInfo parsedEpisodeInfo, int tvRageId)
if (series == null)
{
_logger.Trace("No matching series {0}", parsedEpisodeInfo.SeriesTitle);
_logger.Debug("No matching series {0}", parsedEpisodeInfo.SeriesTitle);
return null;
}

2
src/NzbDrone.Core/Parser/QualityParser.cs
View File

@ -28,7 +28,7 @@ public class QualityParser
public static QualityModel ParseQuality(string name)
{
Logger.Trace("Trying to parse quality for {0}", name);
Logger.Debug("Trying to parse quality for {0}", name);
name = name.Trim();
var normalizedName = name.CleanSeriesTitle();

2
src/NzbDrone.Core/Queue/QueueService.cs
View File

@ -27,7 +27,7 @@ public List<Queue> GetQueue()
if (downloadClient == null)
{
_logger.Trace("Download client is not configured.");
_logger.Debug("Download client is not configured.");
return new List<Queue>();
}

2
src/NzbDrone.Core/Rest/RestSharpExtensions.cs
View File

@ -23,7 +23,7 @@ public static IRestResponse ValidateResponse(this IRestResponse response, IRestC
Ensure.That(response.Request, () => response.Request).IsNotNull();
Ensure.That(restClient, () => restClient).IsNotNull();
Logger.Trace("Validating Responses from [{0}] [{1}] status: [{2}]", response.Request.Method, restClient.BuildUri(response.Request), response.StatusCode);
Logger.Debug("Validating Responses from [{0}] [{1}] status: [{2}]", response.Request.Method, restClient.BuildUri(response.Request), response.StatusCode);
if (response.ResponseUri == null)
{

2
src/NzbDrone.Core/Tv/EpisodeService.cs
View File

@ -191,7 +191,7 @@ public void Handle(EpisodeFileDeletedEvent message)
{
foreach (var episode in GetEpisodesByFileId(message.EpisodeFile.Id))
{
_logger.Trace("Detaching episode {0} from file.", episode.Id);
_logger.Debug("Detaching episode {0} from file.", episode.Id);
episode.EpisodeFileId = 0;
if (!message.ForUpgrade && _configService.AutoUnmonitorPreviouslyDownloadedEpisodes)

4
src/NzbDrone.Core/Tv/RefreshSeriesService.cs
View File

@ -4,7 +4,7 @@
using System.Linq;
using NLog;
using NzbDrone.Core.DataAugmentation.DailySeries;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.MetadataSource;
@ -88,7 +88,7 @@ private List<Season> UpdateSeasons(Series series, Series seriesInfo)
//Todo: Should this should use the previous season's monitored state?
if (existingSeason == null)
{
_logger.Trace("New season ({0}) for series: [{1}] {2}, setting monitored to true", season.SeasonNumber, series.TvdbId, series.Title);
_logger.Debug("New season ({0}) for series: [{1}] {2}, setting monitored to true", season.SeasonNumber, series.TvdbId, series.Title);
season.Monitored = true;
}

4
src/NzbDrone.Core/Tv/SeriesService.cs
View File

@ -141,10 +141,10 @@ public Series FindByTitleInexact(string title)
// series are usually the first thing in release title, so we select the leftmost and longest match
var match = query.First().series;
_logger.Trace("Multiple series matched {0} from title {1}", match.Title, title);
_logger.Debug("Multiple series matched {0} from title {1}", match.Title, title);
foreach (var entry in list)
{
_logger.Trace("Multiple series match candidate: {0} cleantitle: {1}", entry.Title, entry.CleanTitle);
_logger.Debug("Multiple series match candidate: {0} cleantitle: {1}", entry.Title, entry.CleanTitle);
}
return match;

2
src/NzbDrone.Core/Update/InstallUpdateService.cs
View File

@ -5,9 +5,9 @@
using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Common.Processes;
using NzbDrone.Core.Instrumentation.Extensions;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Update.Commands;
using NzbDrone.Core.Instrumentation;
namespace NzbDrone.Core.Update
{

2
src/NzbDrone.Core/Update/UpdateCheckService.cs
View File

@ -1,7 +1,7 @@
using NLog;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.Instrumentation.Extensions;
namespace NzbDrone.Core.Update
{

4
src/NzbDrone.Host/AccessControl/FirewallAdapter.cs
View File

@ -30,13 +30,13 @@ public void MakeAccessible()
{
if (!IsNzbDronePortOpen(_configFileProvider.Port))
{
_logger.Trace("Opening Port for NzbDrone: {0}", _configFileProvider.Port);
_logger.Debug("Opening Port for NzbDrone: {0}", _configFileProvider.Port);
OpenFirewallPort(_configFileProvider.Port);
}
if (_configFileProvider.EnableSsl && !IsNzbDronePortOpen(_configFileProvider.SslPort))
{
_logger.Trace("Opening SSL Port for NzbDrone: {0}", _configFileProvider.SslPort);
_logger.Debug("Opening SSL Port for NzbDrone: {0}", _configFileProvider.SslPort);
OpenFirewallPort(_configFileProvider.SslPort);
}
}

Some files were not shown because too many files have changed in this diff Show More