From 78ba88bc7e923bd48fb694e11d1ef3a608f9cb01 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 23 Oct 2016 20:09:43 -0400 Subject: move classes to model --- MediaBrowser.Api/Library/LibraryService.cs | 1 - MediaBrowser.Api/NewsService.cs | 3 +-- MediaBrowser.Api/Reports/ReportsService.cs | 1 - MediaBrowser.Api/Social/SharingService.cs | 1 - MediaBrowser.Api/System/ActivityLogService.cs | 3 +-- .../System/ActivityLogWebSocketListener.cs | 3 +-- .../Activity/IActivityManager.cs | 17 ------------- .../Activity/IActivityRepository.cs | 14 ----------- .../MediaBrowser.Controller.csproj | 4 ---- MediaBrowser.Controller/News/INewsService.cs | 18 -------------- MediaBrowser.Controller/Social/ISharingManager.cs | 28 ---------------------- MediaBrowser.Model/Activity/IActivityManager.cs | 16 +++++++++++++ MediaBrowser.Model/Activity/IActivityRepository.cs | 13 ++++++++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 4 ++++ MediaBrowser.Model/News/INewsService.cs | 17 +++++++++++++ MediaBrowser.Model/Social/ISharingManager.cs | 27 +++++++++++++++++++++ .../Activity/ActivityManager.cs | 1 - .../Activity/ActivityRepository.cs | 1 - .../EntryPoints/ActivityLogEntryPoint.cs | 1 - .../News/NewsService.cs | 1 - .../Social/SharingManager.cs | 1 - .../ApplicationHost.cs | 6 ++--- 22 files changed, 83 insertions(+), 98 deletions(-) delete mode 100644 MediaBrowser.Controller/Activity/IActivityManager.cs delete mode 100644 MediaBrowser.Controller/Activity/IActivityRepository.cs delete mode 100644 MediaBrowser.Controller/News/INewsService.cs delete mode 100644 MediaBrowser.Controller/Social/ISharingManager.cs create mode 100644 MediaBrowser.Model/Activity/IActivityManager.cs create mode 100644 MediaBrowser.Model/Activity/IActivityRepository.cs create mode 100644 MediaBrowser.Model/News/INewsService.cs create mode 100644 MediaBrowser.Model/Social/ISharingManager.cs diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs index e0dfcb9ad2..57739cdd4c 100644 --- a/MediaBrowser.Api/Library/LibraryService.cs +++ b/MediaBrowser.Api/Library/LibraryService.cs @@ -1,6 +1,5 @@ using MediaBrowser.Api.Movies; using MediaBrowser.Api.Music; -using MediaBrowser.Controller.Activity; using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; diff --git a/MediaBrowser.Api/NewsService.cs b/MediaBrowser.Api/NewsService.cs index 6243bf25f4..0ab6b1eb03 100644 --- a/MediaBrowser.Api/NewsService.cs +++ b/MediaBrowser.Api/NewsService.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Controller.News; -using MediaBrowser.Model.News; +using MediaBrowser.Model.News; using MediaBrowser.Model.Querying; using ServiceStack; diff --git a/MediaBrowser.Api/Reports/ReportsService.cs b/MediaBrowser.Api/Reports/ReportsService.cs index cb03d93822..4543772aa4 100644 --- a/MediaBrowser.Api/Reports/ReportsService.cs +++ b/MediaBrowser.Api/Reports/ReportsService.cs @@ -9,7 +9,6 @@ using MediaBrowser.Controller.Localization; using System; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Activity; -using MediaBrowser.Controller.Activity; namespace MediaBrowser.Api.Reports { diff --git a/MediaBrowser.Api/Social/SharingService.cs b/MediaBrowser.Api/Social/SharingService.cs index 7d61c24ecb..7f7c787959 100644 --- a/MediaBrowser.Api/Social/SharingService.cs +++ b/MediaBrowser.Api/Social/SharingService.cs @@ -3,7 +3,6 @@ using MediaBrowser.Controller.Dlna; using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Net; -using MediaBrowser.Controller.Social; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Social; using ServiceStack; diff --git a/MediaBrowser.Api/System/ActivityLogService.cs b/MediaBrowser.Api/System/ActivityLogService.cs index d24bc99cb6..3c36b4c758 100644 --- a/MediaBrowser.Api/System/ActivityLogService.cs +++ b/MediaBrowser.Api/System/ActivityLogService.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Controller.Activity; -using MediaBrowser.Controller.Net; +using MediaBrowser.Controller.Net; using MediaBrowser.Model.Activity; using MediaBrowser.Model.Querying; using ServiceStack; diff --git a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs index a951cd3d68..aaf9a33479 100644 --- a/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs +++ b/MediaBrowser.Api/System/ActivityLogWebSocketListener.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Controller.Activity; -using MediaBrowser.Controller.Net; +using MediaBrowser.Controller.Net; using MediaBrowser.Model.Activity; using MediaBrowser.Model.Events; using MediaBrowser.Model.Logging; diff --git a/MediaBrowser.Controller/Activity/IActivityManager.cs b/MediaBrowser.Controller/Activity/IActivityManager.cs deleted file mode 100644 index 7285489112..0000000000 --- a/MediaBrowser.Controller/Activity/IActivityManager.cs +++ /dev/null @@ -1,17 +0,0 @@ -using MediaBrowser.Model.Activity; -using MediaBrowser.Model.Events; -using MediaBrowser.Model.Querying; -using System; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Activity -{ - public interface IActivityManager - { - event EventHandler> EntryCreated; - - Task Create(ActivityLogEntry entry); - - QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit); - } -} diff --git a/MediaBrowser.Controller/Activity/IActivityRepository.cs b/MediaBrowser.Controller/Activity/IActivityRepository.cs deleted file mode 100644 index 7ccbc2e99b..0000000000 --- a/MediaBrowser.Controller/Activity/IActivityRepository.cs +++ /dev/null @@ -1,14 +0,0 @@ -using MediaBrowser.Model.Activity; -using MediaBrowser.Model.Querying; -using System; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Activity -{ - public interface IActivityRepository - { - Task Create(ActivityLogEntry entry); - - QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit); - } -} diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 670b08a3fa..c0eeaaa369 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -71,8 +71,6 @@ Properties\SharedVersion.cs - - @@ -240,7 +238,6 @@ - @@ -307,7 +304,6 @@ - diff --git a/MediaBrowser.Controller/News/INewsService.cs b/MediaBrowser.Controller/News/INewsService.cs deleted file mode 100644 index 8237764df4..0000000000 --- a/MediaBrowser.Controller/News/INewsService.cs +++ /dev/null @@ -1,18 +0,0 @@ -using MediaBrowser.Model.News; -using MediaBrowser.Model.Querying; - -namespace MediaBrowser.Controller.News -{ - /// - /// Interface INewsFeed - /// - public interface INewsService - { - /// - /// Gets the product news. - /// - /// The query. - /// QueryResult{NewsItem}. - QueryResult GetProductNews(NewsQuery query); - } -} diff --git a/MediaBrowser.Controller/Social/ISharingManager.cs b/MediaBrowser.Controller/Social/ISharingManager.cs deleted file mode 100644 index ded37771af..0000000000 --- a/MediaBrowser.Controller/Social/ISharingManager.cs +++ /dev/null @@ -1,28 +0,0 @@ -using MediaBrowser.Model.Social; -using System.Threading.Tasks; - -namespace MediaBrowser.Controller.Social -{ - public interface ISharingManager - { - /// - /// Creates the share. - /// - /// The item identifier. - /// The user identifier. - /// Task<SocialShareInfo>. - Task CreateShare(string itemId, string userId); - /// - /// Gets the share information. - /// - /// The identifier. - /// SocialShareInfo. - SocialShareInfo GetShareInfo(string id); - /// - /// Deletes the share. - /// - /// The identifier. - /// Task. - Task DeleteShare(string id); - } -} diff --git a/MediaBrowser.Model/Activity/IActivityManager.cs b/MediaBrowser.Model/Activity/IActivityManager.cs new file mode 100644 index 0000000000..7032dff143 --- /dev/null +++ b/MediaBrowser.Model/Activity/IActivityManager.cs @@ -0,0 +1,16 @@ +using System; +using System.Threading.Tasks; +using MediaBrowser.Model.Events; +using MediaBrowser.Model.Querying; + +namespace MediaBrowser.Model.Activity +{ + public interface IActivityManager + { + event EventHandler> EntryCreated; + + Task Create(ActivityLogEntry entry); + + QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit); + } +} diff --git a/MediaBrowser.Model/Activity/IActivityRepository.cs b/MediaBrowser.Model/Activity/IActivityRepository.cs new file mode 100644 index 0000000000..c1952d436b --- /dev/null +++ b/MediaBrowser.Model/Activity/IActivityRepository.cs @@ -0,0 +1,13 @@ +using System; +using System.Threading.Tasks; +using MediaBrowser.Model.Querying; + +namespace MediaBrowser.Model.Activity +{ + public interface IActivityRepository + { + Task Create(ActivityLogEntry entry); + + QueryResult GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit); + } +} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 68009e21d8..712922e8ca 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -43,6 +43,8 @@ Properties\SharedVersion.cs + + @@ -162,6 +164,7 @@ + @@ -356,6 +359,7 @@ + diff --git a/MediaBrowser.Model/News/INewsService.cs b/MediaBrowser.Model/News/INewsService.cs new file mode 100644 index 0000000000..4c92664d9b --- /dev/null +++ b/MediaBrowser.Model/News/INewsService.cs @@ -0,0 +1,17 @@ +using MediaBrowser.Model.Querying; + +namespace MediaBrowser.Model.News +{ + /// + /// Interface INewsFeed + /// + public interface INewsService + { + /// + /// Gets the product news. + /// + /// The query. + /// QueryResult{NewsItem}. + QueryResult GetProductNews(NewsQuery query); + } +} diff --git a/MediaBrowser.Model/Social/ISharingManager.cs b/MediaBrowser.Model/Social/ISharingManager.cs new file mode 100644 index 0000000000..94c22baba5 --- /dev/null +++ b/MediaBrowser.Model/Social/ISharingManager.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; + +namespace MediaBrowser.Model.Social +{ + public interface ISharingManager + { + /// + /// Creates the share. + /// + /// The item identifier. + /// The user identifier. + /// Task<SocialShareInfo>. + Task CreateShare(string itemId, string userId); + /// + /// Gets the share information. + /// + /// The identifier. + /// SocialShareInfo. + SocialShareInfo GetShareInfo(string id); + /// + /// Deletes the share. + /// + /// The identifier. + /// Task. + Task DeleteShare(string id); + } +} diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs index 0904c92f1c..2af9395c37 100644 --- a/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs +++ b/MediaBrowser.Server.Implementations/Activity/ActivityManager.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Events; -using MediaBrowser.Controller.Activity; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Activity; using MediaBrowser.Model.Events; diff --git a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs index c992def39d..f3c52088be 100644 --- a/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs +++ b/MediaBrowser.Server.Implementations/Activity/ActivityRepository.cs @@ -1,5 +1,4 @@ using MediaBrowser.Controller; -using MediaBrowser.Controller.Activity; using MediaBrowser.Model.Activity; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Querying; diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs index 6e4451d96a..4931ba2bb0 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs @@ -4,7 +4,6 @@ using MediaBrowser.Common.Plugins; using MediaBrowser.Common.ScheduledTasks; using MediaBrowser.Common.Updates; using MediaBrowser.Controller; -using MediaBrowser.Controller.Activity; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; diff --git a/MediaBrowser.Server.Implementations/News/NewsService.cs b/MediaBrowser.Server.Implementations/News/NewsService.cs index 684363d01a..0059ba4214 100644 --- a/MediaBrowser.Server.Implementations/News/NewsService.cs +++ b/MediaBrowser.Server.Implementations/News/NewsService.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Configuration; -using MediaBrowser.Controller.News; using MediaBrowser.Model.News; using MediaBrowser.Model.Querying; using MediaBrowser.Model.Serialization; diff --git a/MediaBrowser.Server.Implementations/Social/SharingManager.cs b/MediaBrowser.Server.Implementations/Social/SharingManager.cs index 95f0ece0c2..0bab7a70d7 100644 --- a/MediaBrowser.Server.Implementations/Social/SharingManager.cs +++ b/MediaBrowser.Server.Implementations/Social/SharingManager.cs @@ -3,7 +3,6 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; -using MediaBrowser.Controller.Social; using MediaBrowser.Model.Social; using System; using System.Threading.Tasks; diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs index 1d687b7d26..ef92217e17 100644 --- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs +++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs @@ -11,7 +11,6 @@ using MediaBrowser.Common.Implementations.ScheduledTasks; using MediaBrowser.Common.Net; using MediaBrowser.Common.Progress; using MediaBrowser.Controller; -using MediaBrowser.Controller.Activity; using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Chapters; using MediaBrowser.Controller.Collections; @@ -28,7 +27,6 @@ using MediaBrowser.Controller.LiveTv; using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.MediaEncoding; using MediaBrowser.Controller.Net; -using MediaBrowser.Controller.News; using MediaBrowser.Controller.Notifications; using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Playlists; @@ -37,7 +35,6 @@ using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Security; using MediaBrowser.Controller.Session; -using MediaBrowser.Controller.Social; using MediaBrowser.Controller.Sorting; using MediaBrowser.Controller.Subtitles; using MediaBrowser.Controller.Sync; @@ -108,7 +105,10 @@ using MediaBrowser.Common.Implementations.Updates; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Model.Activity; +using MediaBrowser.Model.News; using MediaBrowser.Model.Serialization; +using MediaBrowser.Model.Social; namespace MediaBrowser.Server.Startup.Common { -- cgit v1.2.3