aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorErwin de Haan <EraYaN@users.noreply.github.com>2019-01-17 20:24:39 +0100
committerErwin de Haan <EraYaN@users.noreply.github.com>2019-01-17 20:24:39 +0100
commit38f96af079887cce7c38fcde8340fd7c6d1150ad (patch)
tree32f2a7bdc6e0789bb9af34599234e99bcb2b9187 /MediaBrowser.Controller
parent321c440739ae7657349c6a8e672a88bea1d6753c (diff)
Reformat JustAMan review pt2 changes
Refs #575
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Channels/IHasCacheKey.cs1
-rw-r--r--MediaBrowser.Controller/Connect/UserLinkResult.cs1
-rw-r--r--MediaBrowser.Controller/Drawing/ImageCollageOptions.cs1
-rw-r--r--MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs1
-rw-r--r--MediaBrowser.Controller/Entities/BasePluginFolder.cs1
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs2
-rw-r--r--MediaBrowser.Controller/Entities/IHasDisplayOrder.cs1
-rw-r--r--MediaBrowser.Controller/Entities/IHasScreenshots.cs1
-rw-r--r--MediaBrowser.Controller/Entities/IHasSeries.cs1
-rw-r--r--MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs1
-rw-r--r--MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs1
-rw-r--r--MediaBrowser.Controller/Entities/SourceType.cs1
-rw-r--r--MediaBrowser.Controller/Entities/Year.cs4
-rw-r--r--MediaBrowser.Controller/Library/DeleteOptions.cs1
-rw-r--r--MediaBrowser.Controller/LiveTv/TimerInfo.cs8
-rw-r--r--MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs1
-rw-r--r--MediaBrowser.Controller/Providers/DirectoryService.cs6
-rw-r--r--MediaBrowser.Controller/Providers/IForcedProvider.cs1
-rw-r--r--MediaBrowser.Controller/Providers/MetadataProviderPriority.cs1
-rw-r--r--MediaBrowser.Controller/Providers/VideoContentType.cs1
-rw-r--r--MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs1
-rw-r--r--MediaBrowser.Controller/Resolvers/ResolverPriority.cs1
-rw-r--r--MediaBrowser.Controller/Security/IEncryptionManager.cs1
-rw-r--r--MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs1
24 files changed, 14 insertions, 26 deletions
diff --git a/MediaBrowser.Controller/Channels/IHasCacheKey.cs b/MediaBrowser.Controller/Channels/IHasCacheKey.cs
index 1814a890bf..d86ad0dba3 100644
--- a/MediaBrowser.Controller/Channels/IHasCacheKey.cs
+++ b/MediaBrowser.Controller/Channels/IHasCacheKey.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Channels
{
public interface IHasCacheKey
diff --git a/MediaBrowser.Controller/Connect/UserLinkResult.cs b/MediaBrowser.Controller/Connect/UserLinkResult.cs
index 0388a6430d..327ceb9524 100644
--- a/MediaBrowser.Controller/Connect/UserLinkResult.cs
+++ b/MediaBrowser.Controller/Connect/UserLinkResult.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Connect
{
public class UserLinkResult
diff --git a/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs b/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
index c296128108..3f762fad07 100644
--- a/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
+++ b/MediaBrowser.Controller/Drawing/ImageCollageOptions.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Drawing
{
public class ImageCollageOptions
diff --git a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
index c28eebffa2..a269b34863 100644
--- a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Entities.Audio
{
public interface IHasAlbumArtist
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index c15ba1a1e5..8cdb9695cc 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -1,4 +1,3 @@
-
using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Controller.Entities
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index b40bccde62..2103e0045b 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -331,7 +331,7 @@ namespace MediaBrowser.Controller.Entities
foreach (var child in nonCachedChildren)
{
- if (currentChildren.TryGetValue(child.Id, out var currentChild))
+ if (currentChildren.TryGetValue(child.Id, out BaseItem currentChild))
{
validChildren.Add(currentChild);
diff --git a/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs b/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs
index 0da9369142..abee75a28d 100644
--- a/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs
+++ b/MediaBrowser.Controller/Entities/IHasDisplayOrder.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Entities
{
/// <summary>
diff --git a/MediaBrowser.Controller/Entities/IHasScreenshots.cs b/MediaBrowser.Controller/Entities/IHasScreenshots.cs
index d25f47af4c..0975242f5b 100644
--- a/MediaBrowser.Controller/Entities/IHasScreenshots.cs
+++ b/MediaBrowser.Controller/Entities/IHasScreenshots.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Entities
{
/// <summary>
diff --git a/MediaBrowser.Controller/Entities/IHasSeries.cs b/MediaBrowser.Controller/Entities/IHasSeries.cs
index a0cc00a72e..7da53f730a 100644
--- a/MediaBrowser.Controller/Entities/IHasSeries.cs
+++ b/MediaBrowser.Controller/Entities/IHasSeries.cs
@@ -1,4 +1,3 @@
-
using System;
namespace MediaBrowser.Controller.Entities
diff --git a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
index 8545901983..7d13bf3259 100644
--- a/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
+++ b/MediaBrowser.Controller/Entities/ISupportsBoxSetGrouping.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Entities
{
/// <summary>
diff --git a/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs b/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs
index 083cb4ebe7..3e96771c30 100644
--- a/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs
+++ b/MediaBrowser.Controller/Entities/ISupportsPlaceHolders.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Entities
{
public interface ISupportsPlaceHolders
diff --git a/MediaBrowser.Controller/Entities/SourceType.cs b/MediaBrowser.Controller/Entities/SourceType.cs
index 5fc7401dc1..927483b939 100644
--- a/MediaBrowser.Controller/Entities/SourceType.cs
+++ b/MediaBrowser.Controller/Entities/SourceType.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Entities
{
public enum SourceType
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index cad5ed863e..13e82fada3 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -64,9 +64,9 @@ namespace MediaBrowser.Controller.Entities
public int? GetYearValue()
{
- if (int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var i))
+ if (int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year))
{
- return i;
+ return year;
}
return null;
diff --git a/MediaBrowser.Controller/Library/DeleteOptions.cs b/MediaBrowser.Controller/Library/DeleteOptions.cs
index 50bb874740..751b904816 100644
--- a/MediaBrowser.Controller/Library/DeleteOptions.cs
+++ b/MediaBrowser.Controller/Library/DeleteOptions.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Library
{
public class DeleteOptions
diff --git a/MediaBrowser.Controller/LiveTv/TimerInfo.cs b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
index d89ec4fbf0..2fea6a8cb5 100644
--- a/MediaBrowser.Controller/LiveTv/TimerInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/TimerInfo.cs
@@ -114,12 +114,15 @@ namespace MediaBrowser.Controller.LiveTv
/// </summary>
/// <value>The episode number.</value>
public int? EpisodeNumber { get; set; }
+
public bool IsMovie { get; set; }
+
public bool IsKids => Tags.Contains("Kids", StringComparer.OrdinalIgnoreCase);
public bool IsSports => Tags.Contains("Sports", StringComparer.OrdinalIgnoreCase);
public bool IsNews => Tags.Contains("News", StringComparer.OrdinalIgnoreCase);
+
public bool IsSeries { get; set; }
/// <summary>
@@ -133,10 +136,15 @@ namespace MediaBrowser.Controller.LiveTv
public bool IsPremiere => Tags.Contains("Premiere", StringComparer.OrdinalIgnoreCase);
public int? ProductionYear { get; set; }
+
public string EpisodeTitle { get; set; }
+
public DateTime? OriginalAirDate { get; set; }
+
public bool IsProgramSeries { get; set; }
+
public bool IsRepeat { get; set; }
+
public string HomePageUrl { get; set; }
public float? CommunityRating { get; set; }
public string OfficialRating { get; set; }
diff --git a/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs b/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
index 2d6acc1a0d..361dd79dcc 100644
--- a/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ImageEncodingOptions.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.MediaEncoding
{
public class ImageEncodingOptions
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index ab3196aba8..133e7c115a 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Providers
public FileSystemMetadata[] GetFileSystemEntries(string path)
{
- if (!_cache.TryGetValue(path, out var entries))
+ if (!_cache.TryGetValue(path, out FileSystemMetadata[] entries))
{
//_logger.LogDebug("Getting files for " + path);
@@ -54,7 +54,7 @@ namespace MediaBrowser.Controller.Providers
public FileSystemMetadata GetFile(string path)
{
- if (!_fileCache.TryGetValue(path, out var file))
+ if (!_fileCache.TryGetValue(path, out FileSystemMetadata file))
{
file = _fileSystem.GetFileInfo(path);
@@ -80,7 +80,7 @@ namespace MediaBrowser.Controller.Providers
public List<string> GetFilePaths(string path, bool clearCache)
{
- if (clearCache || !_filePathCache.TryGetValue(path, out var result))
+ if (clearCache || !_filePathCache.TryGetValue(path, out List<string> result))
{
result = _fileSystem.GetFilePaths(path).ToList();
diff --git a/MediaBrowser.Controller/Providers/IForcedProvider.cs b/MediaBrowser.Controller/Providers/IForcedProvider.cs
index c7af376ebb..35fa29d94d 100644
--- a/MediaBrowser.Controller/Providers/IForcedProvider.cs
+++ b/MediaBrowser.Controller/Providers/IForcedProvider.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Providers
{
/// <summary>
diff --git a/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs b/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs
index 81eb990423..0076bb9721 100644
--- a/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs
+++ b/MediaBrowser.Controller/Providers/MetadataProviderPriority.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Providers
{
/// <summary>
diff --git a/MediaBrowser.Controller/Providers/VideoContentType.cs b/MediaBrowser.Controller/Providers/VideoContentType.cs
index 3d6d15c342..c3b8964a37 100644
--- a/MediaBrowser.Controller/Providers/VideoContentType.cs
+++ b/MediaBrowser.Controller/Providers/VideoContentType.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Providers
{
/// <summary>
diff --git a/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs b/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
index e6d91e5bed..b40cc157a8 100644
--- a/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
+++ b/MediaBrowser.Controller/Resolvers/IResolverIgnoreRule.cs
@@ -1,4 +1,3 @@
-
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.IO;
diff --git a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
index b405a1f9ed..e393100952 100644
--- a/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
+++ b/MediaBrowser.Controller/Resolvers/ResolverPriority.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Resolvers
{
/// <summary>
diff --git a/MediaBrowser.Controller/Security/IEncryptionManager.cs b/MediaBrowser.Controller/Security/IEncryptionManager.cs
index b4fd74773f..68680fdf3f 100644
--- a/MediaBrowser.Controller/Security/IEncryptionManager.cs
+++ b/MediaBrowser.Controller/Security/IEncryptionManager.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Security
{
public interface IEncryptionManager
diff --git a/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs b/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs
index b1a492497c..c0b62b7530 100644
--- a/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs
+++ b/MediaBrowser.Controller/Sync/IRemoteSyncProvider.cs
@@ -1,4 +1,3 @@
-
namespace MediaBrowser.Controller.Sync
{
/// <summary>