Merge branch 'master' of git://github.com/kayone/NzbDrone

This commit is contained in:
Mark McDowall 2011-06-21 23:40:16 -07:00
commit 1057c5941a
4 changed files with 16 additions and 16 deletions

View File

@ -110,13 +110,13 @@ namespace NzbDrone.Core.Providers
if (episodes.Count <= 0) if (episodes.Count <= 0)
{ {
Logger.Debug("Can't find any matching episodes in the database. skipping"); Logger.Debug("Can't find any matching episodes in the database. skipping. {0}", filePath);
return null; return null;
} }
if (episodes.Any(e => e.EpisodeFile != null && e.EpisodeFile.QualityWrapper > parseResult.Quality)) if (episodes.Any(e => e.EpisodeFile != null && e.EpisodeFile.QualityWrapper > parseResult.Quality))
{ {
Logger.Info("File with better quality is already attached. skipping {0}", filePath); Logger.Trace("File with better quality is already attached. skipping {0}", filePath);
return null; return null;
} }
@ -135,7 +135,7 @@ namespace NzbDrone.Core.Providers
{ {
ep.EpisodeFileId = fileId; ep.EpisodeFileId = fileId;
_episodeProvider.UpdateEpisode(ep); _episodeProvider.UpdateEpisode(ep);
Logger.Trace("Linking file {0} to {1}", filePath, ep); Logger.Debug("Linking file {0} to {1}", filePath, ep);
} }
@ -156,7 +156,7 @@ namespace NzbDrone.Core.Providers
_diskProvider.CreateDirectory(newFile.DirectoryName); _diskProvider.CreateDirectory(newFile.DirectoryName);
//Do the rename //Do the rename
Logger.Trace("Attempting to rename {0} to {1}", episodeFile.Path, newFile.FullName); Logger.Debug("Moving file [{0}] > [1]", episodeFile.Path, newFile.FullName);
_diskProvider.MoveFile(episodeFile.Path, newFile.FullName); _diskProvider.MoveFile(episodeFile.Path, newFile.FullName);
//Update the filename in the DB //Update the filename in the DB
@ -200,7 +200,7 @@ namespace NzbDrone.Core.Providers
var mediaFileList = filesOnDisk.Where(c => MediaExtentions.Contains(Path.GetExtension(c).ToLower())).ToList(); var mediaFileList = filesOnDisk.Where(c => MediaExtentions.Contains(Path.GetExtension(c).ToLower())).ToList();
Logger.Debug("{0} media files were found in {1}", mediaFileList.Count, path); Logger.Trace("{0} video files were found in {1}", mediaFileList.Count, path);
return mediaFileList; return mediaFileList;
} }
} }

View File

@ -53,12 +53,12 @@ namespace NzbDrone.Core.Providers.Jobs
{ {
if (settings.Id == 0) if (settings.Id == 0)
{ {
Logger.Debug("Adding job settings for {0}", settings.Name); Logger.Trace("Adding job settings for {0}", settings.Name);
_database.Insert(settings); _database.Insert(settings);
} }
else else
{ {
Logger.Debug("Updating job settings for {0}", settings.Name); Logger.Trace("Updating job settings for {0}", settings.Name);
_database.Update(settings); _database.Update(settings);
} }
} }
@ -98,7 +98,7 @@ namespace NzbDrone.Core.Providers.Jobs
_isRunning = false; _isRunning = false;
} }
Logger.Debug("Finished executing scheduled tasks."); Logger.Trace("Finished executing scheduled tasks.");
return true; return true;
} }
@ -124,7 +124,7 @@ namespace NzbDrone.Core.Providers.Jobs
} }
Queue.Add(queueTuple); Queue.Add(queueTuple);
Logger.Debug("Job ({0}:{1}) added to the queue", jobType, targetId); Logger.Trace("Job ({0}:{1}) added to the queue", jobType, targetId);
} }
@ -213,7 +213,7 @@ namespace NzbDrone.Core.Providers.Jobs
} }
else else
{ {
Logger.Debug("Finished processing jobs in the queue."); Logger.Trace("Finished processing jobs in the queue.");
} }
return; return;

View File

@ -97,7 +97,7 @@ namespace NzbDrone.Core.Providers
public virtual int RepairLinks() public virtual int RepairLinks()
{ {
Logger.Debug("Verifying Episode>Episode file relationships."); Logger.Trace("Verifying Episode>Episode file relationships.");
var updated = _database.Execute(@"UPDATE Episodes SET EpisodeFileId = 0 var updated = _database.Execute(@"UPDATE Episodes SET EpisodeFileId = 0
WHERE EpisodeFileId IN WHERE EpisodeFileId IN
(SELECT Episodes.EpisodeFileId FROM Episodes (SELECT Episodes.EpisodeFileId FROM Episodes
@ -107,7 +107,7 @@ namespace NzbDrone.Core.Providers
if (updated > 0) if (updated > 0)
{ {
Logger.Warn("Removed {0} invalid links to episode files.", updated); Logger.Debug("Removed {0} invalid links to episode files.", updated);
} }
return updated; return updated;
@ -115,7 +115,7 @@ namespace NzbDrone.Core.Providers
public virtual int DeleteOrphaned() public virtual int DeleteOrphaned()
{ {
Logger.Debug("Deleting orphaned files."); Logger.Trace("Deleting orphaned files.");
var updated = _database.Execute(@"DELETE FROM EpisodeFiles var updated = _database.Execute(@"DELETE FROM EpisodeFiles
WHERE EpisodeFileId IN WHERE EpisodeFileId IN
@ -126,7 +126,7 @@ namespace NzbDrone.Core.Providers
if (updated > 0) if (updated > 0)
{ {
Logger.Warn("Removed {0} orphaned files.", updated); Logger.Debug("Removed {0} orphaned files.", updated);
} }
return updated; return updated;
@ -186,7 +186,7 @@ namespace NzbDrone.Core.Providers
if (_configProvider.ReplaceSpaces) if (_configProvider.ReplaceSpaces)
result = result.Replace(' ', '.'); result = result.Replace(' ', '.');
Logger.Debug("New File Name is: {0}", result.Trim()); Logger.Trace("New File Name is: {0}", result.Trim());
return CleanFilename(result.Trim()); return CleanFilename(result.Trim());
} }

View File

@ -72,7 +72,7 @@ namespace NzbDrone
IISProcess.BeginOutputReadLine(); IISProcess.BeginOutputReadLine();
//Start Ping //Start Ping
_pingTimer = new Timer(30000) { AutoReset = true }; _pingTimer = new Timer(300000) { AutoReset = true };
_pingTimer.Elapsed += (PingServer); _pingTimer.Elapsed += (PingServer);
_pingTimer.Start(); _pingTimer.Start();