mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-10-30 15:32:31 +01:00
removed redundant else
This commit is contained in:
parent
3b087ba922
commit
cf77104a02
@ -241,7 +241,7 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return TransferMode.HardLink;
|
||||
}
|
||||
else if (!mode.HasFlag(TransferMode.Copy))
|
||||
if (!mode.HasFlag(TransferMode.Copy))
|
||||
{
|
||||
throw new IOException("Hardlinking from '" + source + "' to '" + destination + "' failed.");
|
||||
}
|
||||
|
@ -48,24 +48,20 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return OsPathKind.Windows;
|
||||
}
|
||||
else if (path.Contains('/'))
|
||||
if (path.Contains('/'))
|
||||
{
|
||||
return OsPathKind.Unix;
|
||||
}
|
||||
else
|
||||
{
|
||||
return OsPathKind.Unknown;
|
||||
}
|
||||
}
|
||||
|
||||
private static String FixSlashes(String path, OsPathKind kind)
|
||||
{
|
||||
if (kind == OsPathKind.Windows)
|
||||
switch (kind)
|
||||
{
|
||||
case OsPathKind.Windows:
|
||||
return path.Replace('/', '\\');
|
||||
}
|
||||
else if (kind == OsPathKind.Unix)
|
||||
{
|
||||
case OsPathKind.Unix:
|
||||
return path.Replace('\\', '/');
|
||||
}
|
||||
|
||||
@ -103,16 +99,14 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return _path.StartsWith(@"\\") || _path.Contains(':');
|
||||
}
|
||||
else if (IsUnixPath)
|
||||
if (IsUnixPath)
|
||||
{
|
||||
return _path.StartsWith("/");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public OsPath Directory
|
||||
{
|
||||
@ -124,12 +118,10 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return new OsPath(null);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
return new OsPath(_path.Substring(0, index), _kind).AsDirectory();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public String FullPath
|
||||
{
|
||||
@ -156,12 +148,10 @@ namespace NzbDrone.Common.Disk
|
||||
|
||||
return path;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
return _path.Substring(index).Trim('\\', '/');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Int32 GetFileNameIndex()
|
||||
{
|
||||
@ -211,15 +201,12 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return Equals((OsPath)obj);
|
||||
}
|
||||
else if (obj is String)
|
||||
if (obj is String)
|
||||
{
|
||||
return Equals(new OsPath(obj as String));
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public OsPath AsDirectory()
|
||||
{
|
||||
@ -228,19 +215,15 @@ namespace NzbDrone.Common.Disk
|
||||
return this;
|
||||
}
|
||||
|
||||
if (Kind == OsPathKind.Windows)
|
||||
switch (Kind)
|
||||
{
|
||||
case OsPathKind.Windows:
|
||||
return new OsPath(_path.TrimEnd('\\') + "\\", _kind);
|
||||
}
|
||||
else if (Kind == OsPathKind.Unix)
|
||||
{
|
||||
case OsPathKind.Unix:
|
||||
return new OsPath(_path.TrimEnd('/') + "/", _kind);
|
||||
}
|
||||
else
|
||||
{
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
||||
public Boolean Contains(OsPath other)
|
||||
{
|
||||
@ -286,11 +269,8 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return String.Equals(left, right, StringComparison.InvariantCultureIgnoreCase);
|
||||
}
|
||||
else
|
||||
{
|
||||
return String.Equals(left, right, StringComparison.InvariantCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static Boolean operator ==(OsPath left, OsPath right)
|
||||
{
|
||||
@ -327,15 +307,12 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return new OsPath(String.Join("\\", left._path.TrimEnd('\\'), right._path.TrimStart('\\')), OsPathKind.Windows);
|
||||
}
|
||||
else if (left.Kind == OsPathKind.Unix || right.Kind == OsPathKind.Unix)
|
||||
if (left.Kind == OsPathKind.Unix || right.Kind == OsPathKind.Unix)
|
||||
{
|
||||
return new OsPath(String.Join("/", left._path.TrimEnd('/'), right._path), OsPathKind.Unix);
|
||||
}
|
||||
else
|
||||
{
|
||||
return new OsPath(String.Join("/", left._path, right._path), OsPathKind.Unknown);
|
||||
}
|
||||
}
|
||||
|
||||
public static OsPath operator +(OsPath left, String right)
|
||||
{
|
||||
@ -389,12 +366,9 @@ namespace NzbDrone.Common.Disk
|
||||
{
|
||||
return new OsPath(String.Join("\\", newFragments), OsPathKind.Unknown);
|
||||
}
|
||||
else
|
||||
{
|
||||
return new OsPath(String.Join("/", newFragments), OsPathKind.Unknown);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public enum OsPathKind
|
||||
{
|
||||
|
@ -63,11 +63,8 @@ namespace NzbDrone.Common.Extensions
|
||||
{
|
||||
return parentPath.Substring(0, index);
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsParentPath(this string parentPath, string childPath)
|
||||
{
|
||||
|
@ -210,29 +210,24 @@ namespace NzbDrone.Core.Download.Clients.Deluge
|
||||
catch (WebException ex)
|
||||
{
|
||||
_logger.ErrorException(ex.Message, ex);
|
||||
if (ex.Status == WebExceptionStatus.ConnectFailure)
|
||||
switch (ex.Status)
|
||||
{
|
||||
case WebExceptionStatus.ConnectFailure:
|
||||
return new NzbDroneValidationFailure("Host", "Unable to connect")
|
||||
{
|
||||
DetailedDescription = "Please verify the hostname and port."
|
||||
};
|
||||
}
|
||||
else if (ex.Status == WebExceptionStatus.ConnectionClosed)
|
||||
{
|
||||
case WebExceptionStatus.ConnectionClosed:
|
||||
return new NzbDroneValidationFailure("UseSsl", "Verify SSL settings")
|
||||
{
|
||||
DetailedDescription = "Please verify your SSL configuration on both Deluge and NzbDrone."
|
||||
};
|
||||
}
|
||||
else if (ex.Status == WebExceptionStatus.SecureChannelFailure)
|
||||
{
|
||||
case WebExceptionStatus.SecureChannelFailure:
|
||||
return new NzbDroneValidationFailure("UseSsl", "Unable to connect through SSL")
|
||||
{
|
||||
DetailedDescription = "Drone is unable to connect to Deluge using SSL. This problem could be computer related. Please try to configure both drone and Deluge to not use SSL."
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
default:
|
||||
return new NzbDroneValidationFailure(String.Empty, "Unknown exception: " + ex.Message);
|
||||
}
|
||||
}
|
||||
|
@ -264,11 +264,8 @@ namespace NzbDrone.Core.Download.Clients.Deluge
|
||||
_logger.Debug("Deluge authentication failed.");
|
||||
throw new DownloadClientAuthenticationException("Failed to authenticate with Deluge.");
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Debug("Deluge authentication succeeded.");
|
||||
_authCookieContainer = restClient.CookieContainer;
|
||||
}
|
||||
|
||||
ConnectDaemon(restClient);
|
||||
}
|
||||
|
@ -212,11 +212,8 @@ namespace NzbDrone.Core.Download.Clients.Transmission
|
||||
DetailedDescription = "Please verify the hostname and port."
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
return new NzbDroneValidationFailure(String.Empty, "Unknown exception: " + ex.Message);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.ErrorException(ex.Message, ex);
|
||||
|
@ -183,7 +183,9 @@ namespace NzbDrone.Core.Download.Clients.Transmission
|
||||
}
|
||||
|
||||
// We expect the StatusCode = Conflict, coz that will provide us with a new session id.
|
||||
if (restResponse.StatusCode == HttpStatusCode.Conflict)
|
||||
switch (restResponse.StatusCode)
|
||||
{
|
||||
case HttpStatusCode.Conflict:
|
||||
{
|
||||
var sessionId = restResponse.Headers.SingleOrDefault(o => o.Name == "X-Transmission-Session-Id");
|
||||
|
||||
@ -194,8 +196,7 @@ namespace NzbDrone.Core.Download.Clients.Transmission
|
||||
|
||||
return (String)sessionId.Value;
|
||||
}
|
||||
else if (restResponse.StatusCode == HttpStatusCode.Unauthorized)
|
||||
{
|
||||
case HttpStatusCode.Unauthorized:
|
||||
throw new DownloadClientAuthenticationException("User authentication failed.");
|
||||
}
|
||||
|
||||
|
@ -223,11 +223,8 @@ namespace NzbDrone.Core.Download.Clients.UTorrent
|
||||
DetailedDescription = "Please verify the hostname and port."
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
return new NzbDroneValidationFailure(String.Empty, "Unknown exception: " + ex.Message);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.ErrorException(ex.Message, ex);
|
||||
|
@ -108,11 +108,8 @@ namespace NzbDrone.Core.Download
|
||||
{
|
||||
return DownloadFromMagnetUrl(remoteEpisode, locationHeader);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new WebException("Remote website tried to redirect without providing a location.");
|
||||
}
|
||||
}
|
||||
|
||||
torrentFile = response.ResponseData;
|
||||
}
|
||||
|
@ -47,7 +47,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
|
||||
|
||||
return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Sabnzbd)", "Migrating-to-Completed-Download-Handling#sabnzbd-enable-completed-download-handling");
|
||||
}
|
||||
else if (downloadClients.All(v => v.downloadClient is Nzbget))
|
||||
if (downloadClients.All(v => v.downloadClient is Nzbget))
|
||||
{
|
||||
// With Nzbget we can check if the category should be changed.
|
||||
if (downloadClientOutputInDroneFactory)
|
||||
@ -57,11 +57,8 @@ namespace NzbDrone.Core.HealthCheck.Checks
|
||||
|
||||
return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Nzbget)", "Migrating-to-Completed-Download-Handling#nzbget-enable-completed-download-handling");
|
||||
}
|
||||
else
|
||||
{
|
||||
return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible", "Migrating-to-Completed-Download-Handling");
|
||||
}
|
||||
}
|
||||
|
||||
if (!_configService.EnableCompletedDownloadHandling && droneFactoryFolder.IsEmpty)
|
||||
{
|
||||
|
@ -106,10 +106,7 @@ namespace NzbDrone.Core.IndexerSearch
|
||||
{
|
||||
return v.SceneSeasonNumber.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
return v.SeasonNumber;
|
||||
}
|
||||
}).Distinct();
|
||||
|
||||
foreach (var sceneSeasonEpisodes in sceneSeasonGroups)
|
||||
|
@ -13,22 +13,21 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
|
||||
{
|
||||
var results = new List<ReleaseInfo>();
|
||||
|
||||
if (indexerResponse.HttpResponse.StatusCode == HttpStatusCode.Unauthorized)
|
||||
switch (indexerResponse.HttpResponse.StatusCode)
|
||||
{
|
||||
case HttpStatusCode.Unauthorized:
|
||||
throw new ApiKeyException("API Key invalid or not authorized");
|
||||
}
|
||||
else if (indexerResponse.HttpResponse.StatusCode == HttpStatusCode.NotFound)
|
||||
{
|
||||
case HttpStatusCode.NotFound:
|
||||
throw new IndexerException(indexerResponse, "Indexer API call returned NotFound, the Indexer API may have changed.");
|
||||
}
|
||||
else if (indexerResponse.HttpResponse.StatusCode == HttpStatusCode.ServiceUnavailable)
|
||||
{
|
||||
case HttpStatusCode.ServiceUnavailable:
|
||||
throw new RequestLimitReachedException("Cannot do more than 150 API requests per hour.");
|
||||
}
|
||||
else if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
|
||||
default:
|
||||
if (indexerResponse.HttpResponse.StatusCode != HttpStatusCode.OK)
|
||||
{
|
||||
throw new IndexerException(indexerResponse, "Indexer API call returned an unexpected StatusCode [{0}]", indexerResponse.HttpResponse.StatusCode);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
var jsonResponse = new HttpResponse<JsonRpcResponse<BroadcastheNetTorrents>>(indexerResponse.HttpResponse).Resource;
|
||||
|
||||
@ -46,7 +45,7 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
|
||||
{
|
||||
var torrentInfo = new TorrentInfo();
|
||||
|
||||
torrentInfo.Guid = String.Format("BTN-{0}", torrent.TorrentID.ToString());
|
||||
torrentInfo.Guid = String.Format("BTN-{0}", torrent.TorrentID);
|
||||
torrentInfo.Title = torrent.ReleaseName;
|
||||
torrentInfo.Size = torrent.Size;
|
||||
torrentInfo.DownloadUrl = torrent.DownloadURL;
|
||||
|
@ -100,17 +100,14 @@ namespace NzbDrone.Core.Indexers.BroadcastheNet
|
||||
parameters.Tvrage = String.Format("{0}", searchCriteria.Series.TvRageId);
|
||||
return true;
|
||||
}
|
||||
else if (searchCriteria.Series.TvdbId != 0)
|
||||
if (searchCriteria.Series.TvdbId != 0)
|
||||
{
|
||||
parameters.Tvdb = String.Format("{0}", searchCriteria.Series.TvdbId);
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// BTN is very neatly managed, so it's unlikely they map tvrage/tvdb wrongly.
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private IEnumerable<IndexerRequest> GetPagedRequests(Int32 maxPages, BroadcastheNetTorrentQuery parameters)
|
||||
{
|
||||
|
@ -147,11 +147,8 @@ namespace NzbDrone.Core.Indexers
|
||||
{
|
||||
return item.Element("enclosure").Attribute("url").Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
return item.Element("link").Value;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual string GetInfoUrl(XElement item)
|
||||
{
|
||||
@ -174,7 +171,7 @@ namespace NzbDrone.Core.Indexers
|
||||
{
|
||||
return GetEnclosureLength(item);
|
||||
}
|
||||
else if (ParseSizeInDescription)
|
||||
if (ParseSizeInDescription)
|
||||
{
|
||||
return ParseSize(item.Element("description").Value, true);
|
||||
}
|
||||
|
@ -74,16 +74,10 @@ namespace NzbDrone.Core.MediaFiles
|
||||
|
||||
return _downloadedEpisodesImportService.ProcessFolder(new DirectoryInfo(message.Path));
|
||||
}
|
||||
else
|
||||
{
|
||||
return _completedDownloadService.Import(trackedDownload, message.Path);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return _downloadedEpisodesImportService.ProcessFolder(new DirectoryInfo(message.Path));
|
||||
}
|
||||
}
|
||||
|
||||
public void Execute(DownloadedEpisodesScanCommand message)
|
||||
{
|
||||
|
@ -79,11 +79,8 @@ namespace NzbDrone.Core.MediaFiles
|
||||
{
|
||||
return TransferFile(episodeFile, localEpisode.Series, localEpisode.Episodes, filePath, TransferMode.HardLinkOrCopy);
|
||||
}
|
||||
else
|
||||
{
|
||||
return TransferFile(episodeFile, localEpisode.Series, localEpisode.Episodes, filePath, TransferMode.Copy);
|
||||
}
|
||||
}
|
||||
|
||||
private EpisodeFile TransferFile(EpisodeFile episodeFile, Series series, List<Episode> episodes, string destinationFilename, TransferMode mode)
|
||||
{
|
||||
|
@ -115,12 +115,9 @@ namespace NzbDrone.Core.Metadata.Consumers.Roksbox
|
||||
return metadata;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
metadata.Type = MetadataType.SeriesImage;
|
||||
return metadata;
|
||||
}
|
||||
}
|
||||
|
||||
var parseResult = Parser.Parser.ParseTitle(filename);
|
||||
|
||||
|
@ -112,12 +112,9 @@ namespace NzbDrone.Core.Metadata.Consumers.Wdtv
|
||||
return metadata;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
metadata.Type = MetadataType.SeriesImage;
|
||||
return metadata;
|
||||
}
|
||||
}
|
||||
|
||||
var parseResult = Parser.Parser.ParseTitle(filename);
|
||||
|
||||
|
@ -17,10 +17,7 @@ namespace NzbDrone.Core.Parser.Model
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
return torrentInfo.Seeds;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -384,10 +384,7 @@ namespace NzbDrone.Core.Parser
|
||||
{
|
||||
return String.Empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
return m.Value;
|
||||
}
|
||||
});
|
||||
|
||||
return title;
|
||||
|
@ -143,18 +143,15 @@ namespace NzbDrone.Core.Parser
|
||||
if (sourceMatch.Groups["bdrip"].Success ||
|
||||
sourceMatch.Groups["brrip"].Success)
|
||||
{
|
||||
if (resolution == Resolution._720p)
|
||||
switch (resolution)
|
||||
{
|
||||
case Resolution._720p:
|
||||
result.Quality = Quality.Bluray720p;
|
||||
return result;
|
||||
}
|
||||
else if (resolution == Resolution._1080p)
|
||||
{
|
||||
case Resolution._1080p:
|
||||
result.Quality = Quality.Bluray1080p;
|
||||
return result;
|
||||
}
|
||||
else
|
||||
{
|
||||
default:
|
||||
result.Quality = Quality.DVD;
|
||||
return result;
|
||||
}
|
||||
|
@ -113,13 +113,11 @@ namespace NzbDrone.Core.Tv
|
||||
// no series matched
|
||||
return null;
|
||||
}
|
||||
else if (list.Count == 1)
|
||||
if (list.Count == 1)
|
||||
{
|
||||
// return the first series if there is only one
|
||||
return list.Single();
|
||||
}
|
||||
else
|
||||
{
|
||||
// build ordered list of series by position in the search string
|
||||
var query =
|
||||
list.Select(series => new
|
||||
@ -146,7 +144,6 @@ namespace NzbDrone.Core.Tv
|
||||
|
||||
return match;
|
||||
}
|
||||
}
|
||||
|
||||
public Series FindByTitle(string title, int year)
|
||||
{
|
||||
|
@ -73,18 +73,15 @@ namespace NzbDrone.Update
|
||||
|
||||
if (OsInfo.IsMono)
|
||||
{
|
||||
if (args.Count() == 1)
|
||||
switch (args.Count())
|
||||
{
|
||||
case 1:
|
||||
return startupContext;
|
||||
}
|
||||
|
||||
else if (args.Count() == 3)
|
||||
{
|
||||
case 3:
|
||||
startupContext.UpdateLocation = args[1];
|
||||
startupContext.ExecutingApplication = args[2];
|
||||
}
|
||||
|
||||
else
|
||||
break;
|
||||
default:
|
||||
{
|
||||
logger.Debug("Arguments:");
|
||||
|
||||
@ -98,6 +95,7 @@ namespace NzbDrone.Update
|
||||
throw new ArgumentOutOfRangeException("args", message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return startupContext;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user