diff --git a/Kyoo.Abstractions/Controllers/IConfigurationManager.cs b/Kyoo.Abstractions/Controllers/IConfigurationManager.cs index 6f01f627..73c649d1 100644 --- a/Kyoo.Abstractions/Controllers/IConfigurationManager.cs +++ b/Kyoo.Abstractions/Controllers/IConfigurationManager.cs @@ -1,10 +1,10 @@ using System; using System.Threading.Tasks; using JetBrains.Annotations; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// A class to ease configuration management. This work WITH Microsoft's package, you can still use IOptions patterns diff --git a/Kyoo.Abstractions/Controllers/IFileSystem.cs b/Kyoo.Abstractions/Controllers/IFileSystem.cs index f443254f..36c5dd3b 100644 --- a/Kyoo.Abstractions/Controllers/IFileSystem.cs +++ b/Kyoo.Abstractions/Controllers/IFileSystem.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using JetBrains.Annotations; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Microsoft.AspNetCore.Mvc; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// A service to abstract the file system to allow custom file systems (like distant file systems or external providers) diff --git a/Kyoo.Abstractions/Controllers/IIdentifier.cs b/Kyoo.Abstractions/Controllers/IIdentifier.cs index 5d11c53b..8a9d07ed 100644 --- a/Kyoo.Abstractions/Controllers/IIdentifier.cs +++ b/Kyoo.Abstractions/Controllers/IIdentifier.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// An interface to identify episodes, shows and metadata based on the episode file. diff --git a/Kyoo.Abstractions/Controllers/ILibraryManager.cs b/Kyoo.Abstractions/Controllers/ILibraryManager.cs index 8c3442e3..856becb7 100644 --- a/Kyoo.Abstractions/Controllers/ILibraryManager.cs +++ b/Kyoo.Abstractions/Controllers/ILibraryManager.cs @@ -4,10 +4,10 @@ using System.Linq.Expressions; using System.Runtime.InteropServices; using System.Threading.Tasks; using JetBrains.Annotations; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// An interface to interract with the database. Every repository is mapped through here. diff --git a/Kyoo.Abstractions/Controllers/IMetadataProvider.cs b/Kyoo.Abstractions/Controllers/IMetadataProvider.cs index ed6ab40d..c04ac906 100644 --- a/Kyoo.Abstractions/Controllers/IMetadataProvider.cs +++ b/Kyoo.Abstractions/Controllers/IMetadataProvider.cs @@ -1,9 +1,9 @@ -using Kyoo.Models; +using Kyoo.Abstractions.Models; using System.Collections.Generic; using System.Threading.Tasks; using JetBrains.Annotations; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// An interface to automatically retrieve metadata from external providers. diff --git a/Kyoo.Abstractions/Controllers/IPlugin.cs b/Kyoo.Abstractions/Controllers/IPlugin.cs index 090774a7..0ff6c932 100644 --- a/Kyoo.Abstractions/Controllers/IPlugin.cs +++ b/Kyoo.Abstractions/Controllers/IPlugin.cs @@ -4,7 +4,7 @@ using Autofac; using JetBrains.Annotations; using Microsoft.Extensions.DependencyInjection; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// A common interface used to discord plugins diff --git a/Kyoo.Abstractions/Controllers/IPluginManager.cs b/Kyoo.Abstractions/Controllers/IPluginManager.cs index 7bf64baf..795339a4 100644 --- a/Kyoo.Abstractions/Controllers/IPluginManager.cs +++ b/Kyoo.Abstractions/Controllers/IPluginManager.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Models.Exceptions; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// A manager to load plugins and retrieve information from them. diff --git a/Kyoo.Abstractions/Controllers/IRepository.cs b/Kyoo.Abstractions/Controllers/IRepository.cs index f221bbcf..3a7dee05 100644 --- a/Kyoo.Abstractions/Controllers/IRepository.cs +++ b/Kyoo.Abstractions/Controllers/IRepository.cs @@ -4,10 +4,10 @@ using System.Linq.Expressions; using System.Runtime.InteropServices; using System.Threading.Tasks; using JetBrains.Annotations; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// Information about the pagination. How many items should be displayed and where to start. @@ -106,7 +106,7 @@ namespace Kyoo.Controllers } /// - /// A base class for repositories. Every service implementing this will be handled by the . + /// A base class for repositories. Every service implementing this will be handled by the . /// public interface IBaseRepository { diff --git a/Kyoo.Abstractions/Controllers/ITask.cs b/Kyoo.Abstractions/Controllers/ITask.cs index 0810b6bf..79c8c778 100644 --- a/Kyoo.Abstractions/Controllers/ITask.cs +++ b/Kyoo.Abstractions/Controllers/ITask.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// A single task parameter. This struct contains metadata to display and utility functions to get them in the task. diff --git a/Kyoo.Abstractions/Controllers/ITaskManager.cs b/Kyoo.Abstractions/Controllers/ITaskManager.cs index 37b40f12..2a999aad 100644 --- a/Kyoo.Abstractions/Controllers/ITaskManager.cs +++ b/Kyoo.Abstractions/Controllers/ITaskManager.cs @@ -2,10 +2,10 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Threading; -using Kyoo.Common.Models.Attributes; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Models.Attributes; +using Kyoo.Abstractions.Models.Exceptions; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// A service to handle long running tasks. diff --git a/Kyoo.Abstractions/Controllers/IThumbnailsManager.cs b/Kyoo.Abstractions/Controllers/IThumbnailsManager.cs index 61fe5345..54e5be0a 100644 --- a/Kyoo.Abstractions/Controllers/IThumbnailsManager.cs +++ b/Kyoo.Abstractions/Controllers/IThumbnailsManager.cs @@ -1,8 +1,8 @@ -using Kyoo.Models; +using Kyoo.Abstractions.Models; using System.Threading.Tasks; using JetBrains.Annotations; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// Download images and retrieve the path of those images for a resource. diff --git a/Kyoo.Abstractions/Controllers/ITranscoder.cs b/Kyoo.Abstractions/Controllers/ITranscoder.cs index 4fc109d1..d076b9f2 100644 --- a/Kyoo.Abstractions/Controllers/ITranscoder.cs +++ b/Kyoo.Abstractions/Controllers/ITranscoder.cs @@ -1,7 +1,7 @@ -using Kyoo.Models; +using Kyoo.Abstractions.Models; using System.Threading.Tasks; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { public interface ITranscoder { diff --git a/Kyoo.Abstractions/Controllers/StartupAction.cs b/Kyoo.Abstractions/Controllers/StartupAction.cs index 3d9891a0..fb2b29a5 100644 --- a/Kyoo.Abstractions/Controllers/StartupAction.cs +++ b/Kyoo.Abstractions/Controllers/StartupAction.cs @@ -1,7 +1,7 @@ using System; using Microsoft.Extensions.DependencyInjection; -namespace Kyoo.Controllers +namespace Kyoo.Abstractions.Controllers { /// /// A list of constant priorities used for 's . diff --git a/Kyoo.Abstractions/Kyoo.Abstractions.csproj b/Kyoo.Abstractions/Kyoo.Abstractions.csproj index d376d747..9831afb3 100644 --- a/Kyoo.Abstractions/Kyoo.Abstractions.csproj +++ b/Kyoo.Abstractions/Kyoo.Abstractions.csproj @@ -3,7 +3,7 @@ net5.0 true - Kyoo.Abstraction + Kyoo.Abstractions Zoe Roux Base package to create plugins for Kyoo. https://github.com/AnonymusRaccoon/Kyoo @@ -16,7 +16,7 @@ true snupkg default - Kyoo.Abstraction + Kyoo.Abstractions diff --git a/Kyoo.Abstractions/Models/AsyncRef.cs b/Kyoo.Abstractions/Models/AsyncRef.cs index 98738ac6..26885f56 100644 --- a/Kyoo.Abstractions/Models/AsyncRef.cs +++ b/Kyoo.Abstractions/Models/AsyncRef.cs @@ -1,4 +1,4 @@ -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A class wrapping a value that will be set after the completion of the task it is related to. diff --git a/Kyoo.Abstractions/Models/Attributes/ComputedAttribute.cs b/Kyoo.Abstractions/Models/Attributes/ComputedAttribute.cs index b7f07048..dbdfa09b 100644 --- a/Kyoo.Abstractions/Models/Attributes/ComputedAttribute.cs +++ b/Kyoo.Abstractions/Models/Attributes/ComputedAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Kyoo.Models.Attributes +namespace Kyoo.Abstractions.Models.Attributes { /// /// An attribute to inform that the property is computed automatically and can't be assigned manually. diff --git a/Kyoo.Abstractions/Models/Attributes/FileSystemMetadataAttribute.cs b/Kyoo.Abstractions/Models/Attributes/FileSystemMetadataAttribute.cs index d2b997a5..afab7bc1 100644 --- a/Kyoo.Abstractions/Models/Attributes/FileSystemMetadataAttribute.cs +++ b/Kyoo.Abstractions/Models/Attributes/FileSystemMetadataAttribute.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.ComponentModel.Composition; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; -namespace Kyoo.Common.Models.Attributes +namespace Kyoo.Abstractions.Models.Attributes { /// /// An attribute to inform how a works. diff --git a/Kyoo.Abstractions/Models/Attributes/MergeAttributes.cs b/Kyoo.Abstractions/Models/Attributes/MergeAttributes.cs index 54d49d52..1cfc8e13 100644 --- a/Kyoo.Abstractions/Models/Attributes/MergeAttributes.cs +++ b/Kyoo.Abstractions/Models/Attributes/MergeAttributes.cs @@ -1,6 +1,6 @@ using System; -namespace Kyoo.Models.Attributes +namespace Kyoo.Abstractions.Models.Attributes { /// /// Specify that a property can't be merged. diff --git a/Kyoo.Abstractions/Models/Attributes/PermissionAttribute.cs b/Kyoo.Abstractions/Models/Attributes/PermissionAttribute.cs index 24de7950..b343547a 100644 --- a/Kyoo.Abstractions/Models/Attributes/PermissionAttribute.cs +++ b/Kyoo.Abstractions/Models/Attributes/PermissionAttribute.cs @@ -2,7 +2,7 @@ using System; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.DependencyInjection; -namespace Kyoo.Models.Permissions +namespace Kyoo.Abstractions.Models.Permissions { /// /// The kind of permission needed. diff --git a/Kyoo.Abstractions/Models/Attributes/RelationAttributes.cs b/Kyoo.Abstractions/Models/Attributes/RelationAttributes.cs index ef84f5e5..943bd1fe 100644 --- a/Kyoo.Abstractions/Models/Attributes/RelationAttributes.cs +++ b/Kyoo.Abstractions/Models/Attributes/RelationAttributes.cs @@ -1,7 +1,7 @@ using System; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; -namespace Kyoo.Models.Attributes +namespace Kyoo.Abstractions.Models.Attributes { /// /// The targeted relation can be edited via calls to the repository's method. diff --git a/Kyoo.Abstractions/Models/Attributes/SerializeAttribute.cs b/Kyoo.Abstractions/Models/Attributes/SerializeAttribute.cs index a7958c91..d2f2eb68 100644 --- a/Kyoo.Abstractions/Models/Attributes/SerializeAttribute.cs +++ b/Kyoo.Abstractions/Models/Attributes/SerializeAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace Kyoo.Models.Attributes +namespace Kyoo.Abstractions.Models.Attributes { /// /// Remove an property from the serialization pipeline. It will simply be skipped. diff --git a/Kyoo.Abstractions/Models/Attributes/TaskMetadataAttribute.cs b/Kyoo.Abstractions/Models/Attributes/TaskMetadataAttribute.cs index 0ebe7a34..18cf7802 100644 --- a/Kyoo.Abstractions/Models/Attributes/TaskMetadataAttribute.cs +++ b/Kyoo.Abstractions/Models/Attributes/TaskMetadataAttribute.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.ComponentModel.Composition; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; -namespace Kyoo.Common.Models.Attributes +namespace Kyoo.Abstractions.Models.Attributes { /// /// An attribute to inform how a works. diff --git a/Kyoo.Abstractions/Models/Chapter.cs b/Kyoo.Abstractions/Models/Chapter.cs index 51ccc231..4605e7b4 100644 --- a/Kyoo.Abstractions/Models/Chapter.cs +++ b/Kyoo.Abstractions/Models/Chapter.cs @@ -1,4 +1,4 @@ -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A chapter to split an episode in multiple parts. diff --git a/Kyoo.Abstractions/Models/ConfigurationReference.cs b/Kyoo.Abstractions/Models/ConfigurationReference.cs index 00d20b4c..8b1064dd 100644 --- a/Kyoo.Abstractions/Models/ConfigurationReference.cs +++ b/Kyoo.Abstractions/Models/ConfigurationReference.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Reflection; using JetBrains.Annotations; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A class given information about a strongly typed configuration. diff --git a/Kyoo.Abstractions/Models/Exceptions/DuplicatedItemException.cs b/Kyoo.Abstractions/Models/Exceptions/DuplicatedItemException.cs index b0d26bf0..248ea2ba 100644 --- a/Kyoo.Abstractions/Models/Exceptions/DuplicatedItemException.cs +++ b/Kyoo.Abstractions/Models/Exceptions/DuplicatedItemException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Kyoo.Models.Exceptions +namespace Kyoo.Abstractions.Models.Exceptions { /// /// An exception raised when an item already exists in the database. diff --git a/Kyoo.Abstractions/Models/Exceptions/IdentificationFailedException.cs b/Kyoo.Abstractions/Models/Exceptions/IdentificationFailedException.cs index 7c820f5a..05740b42 100644 --- a/Kyoo.Abstractions/Models/Exceptions/IdentificationFailedException.cs +++ b/Kyoo.Abstractions/Models/Exceptions/IdentificationFailedException.cs @@ -1,8 +1,8 @@ using System; using System.Runtime.Serialization; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; -namespace Kyoo.Models.Exceptions +namespace Kyoo.Abstractions.Models.Exceptions { /// /// An exception raised when an failed. diff --git a/Kyoo.Abstractions/Models/Exceptions/ItemNotFoundException.cs b/Kyoo.Abstractions/Models/Exceptions/ItemNotFoundException.cs index d05882b1..5a16e62e 100644 --- a/Kyoo.Abstractions/Models/Exceptions/ItemNotFoundException.cs +++ b/Kyoo.Abstractions/Models/Exceptions/ItemNotFoundException.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Kyoo.Models.Exceptions +namespace Kyoo.Abstractions.Models.Exceptions { /// /// An exception raised when an item could not be found. diff --git a/Kyoo.Abstractions/Models/Exceptions/TaskFailedException.cs b/Kyoo.Abstractions/Models/Exceptions/TaskFailedException.cs index 5fe65f7c..eebc784e 100644 --- a/Kyoo.Abstractions/Models/Exceptions/TaskFailedException.cs +++ b/Kyoo.Abstractions/Models/Exceptions/TaskFailedException.cs @@ -1,8 +1,8 @@ using System; using System.Runtime.Serialization; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; -namespace Kyoo.Models.Exceptions +namespace Kyoo.Abstractions.Models.Exceptions { /// /// An exception raised when an failed. diff --git a/Kyoo.Abstractions/Models/LibraryItem.cs b/Kyoo.Abstractions/Models/LibraryItem.cs index 18680b9e..802e98a3 100644 --- a/Kyoo.Abstractions/Models/LibraryItem.cs +++ b/Kyoo.Abstractions/Models/LibraryItem.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// The type of item, ether a show, a movie or a collection. diff --git a/Kyoo.Abstractions/Models/MetadataID.cs b/Kyoo.Abstractions/Models/MetadataID.cs index cda4ce11..5cdf08ea 100644 --- a/Kyoo.Abstractions/Models/MetadataID.cs +++ b/Kyoo.Abstractions/Models/MetadataID.cs @@ -1,8 +1,8 @@ using System; using System.Linq.Expressions; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// ID and link of an item on an external provider. diff --git a/Kyoo.Abstractions/Models/Page.cs b/Kyoo.Abstractions/Models/Page.cs index 023aac3e..d5f7171b 100644 --- a/Kyoo.Abstractions/Models/Page.cs +++ b/Kyoo.Abstractions/Models/Page.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A page of resource that contains information about the pagination of resources. diff --git a/Kyoo.Abstractions/Models/PeopleRole.cs b/Kyoo.Abstractions/Models/PeopleRole.cs index daf9c7cd..934daf7d 100644 --- a/Kyoo.Abstractions/Models/PeopleRole.cs +++ b/Kyoo.Abstractions/Models/PeopleRole.cs @@ -1,4 +1,4 @@ -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A role a person played for a show. It can be an actor, musician, voice actor, director, writer... diff --git a/Kyoo.Abstractions/Models/Resources/Collection.cs b/Kyoo.Abstractions/Models/Resources/Collection.cs index 20cc481b..faa7ac9f 100644 --- a/Kyoo.Abstractions/Models/Resources/Collection.cs +++ b/Kyoo.Abstractions/Models/Resources/Collection.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A class representing collections of . diff --git a/Kyoo.Abstractions/Models/Resources/Episode.cs b/Kyoo.Abstractions/Models/Resources/Episode.cs index dd1f62e1..65e1bd29 100644 --- a/Kyoo.Abstractions/Models/Resources/Episode.cs +++ b/Kyoo.Abstractions/Models/Resources/Episode.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using JetBrains.Annotations; -using Kyoo.Controllers; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A class to represent a single show's episode. diff --git a/Kyoo.Abstractions/Models/Resources/Genre.cs b/Kyoo.Abstractions/Models/Resources/Genre.cs index e5fcbed8..b346381f 100644 --- a/Kyoo.Abstractions/Models/Resources/Genre.cs +++ b/Kyoo.Abstractions/Models/Resources/Genre.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A genre that allow one to specify categories for shows. diff --git a/Kyoo.Abstractions/Models/Resources/Interfaces/IMetadata.cs b/Kyoo.Abstractions/Models/Resources/Interfaces/IMetadata.cs index ef1e6bbc..b28d893a 100644 --- a/Kyoo.Abstractions/Models/Resources/Interfaces/IMetadata.cs +++ b/Kyoo.Abstractions/Models/Resources/Interfaces/IMetadata.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// An interface applied to resources containing external metadata. diff --git a/Kyoo.Abstractions/Models/Resources/Interfaces/IResource.cs b/Kyoo.Abstractions/Models/Resources/Interfaces/IResource.cs index 4867bc0a..bde5aef6 100644 --- a/Kyoo.Abstractions/Models/Resources/Interfaces/IResource.cs +++ b/Kyoo.Abstractions/Models/Resources/Interfaces/IResource.cs @@ -1,6 +1,6 @@ -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// An interface to represent a resource that can be retrieved from the database. diff --git a/Kyoo.Abstractions/Models/Resources/Interfaces/IThumbnails.cs b/Kyoo.Abstractions/Models/Resources/Interfaces/IThumbnails.cs index ba4999de..670dbb51 100644 --- a/Kyoo.Abstractions/Models/Resources/Interfaces/IThumbnails.cs +++ b/Kyoo.Abstractions/Models/Resources/Interfaces/IThumbnails.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// An interface representing items that contains images (like posters, thumbnails, logo, banners...) diff --git a/Kyoo.Abstractions/Models/Resources/Library.cs b/Kyoo.Abstractions/Models/Resources/Library.cs index 6580f988..fad1156e 100644 --- a/Kyoo.Abstractions/Models/Resources/Library.cs +++ b/Kyoo.Abstractions/Models/Resources/Library.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A library containing and . diff --git a/Kyoo.Abstractions/Models/Resources/People.cs b/Kyoo.Abstractions/Models/Resources/People.cs index 7bd59620..ce46c6a7 100644 --- a/Kyoo.Abstractions/Models/Resources/People.cs +++ b/Kyoo.Abstractions/Models/Resources/People.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// An actor, voice actor, writer, animator, somebody who worked on a . diff --git a/Kyoo.Abstractions/Models/Resources/Provider.cs b/Kyoo.Abstractions/Models/Resources/Provider.cs index 31b87f3f..61726100 100644 --- a/Kyoo.Abstractions/Models/Resources/Provider.cs +++ b/Kyoo.Abstractions/Models/Resources/Provider.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Kyoo.Controllers; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// This class contains metadata about . diff --git a/Kyoo.Abstractions/Models/Resources/Season.cs b/Kyoo.Abstractions/Models/Resources/Season.cs index 2c5d59eb..d60da6d8 100644 --- a/Kyoo.Abstractions/Models/Resources/Season.cs +++ b/Kyoo.Abstractions/Models/Resources/Season.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Text.RegularExpressions; using JetBrains.Annotations; -using Kyoo.Controllers; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A season of a . diff --git a/Kyoo.Abstractions/Models/Resources/Show.cs b/Kyoo.Abstractions/Models/Resources/Show.cs index 03c86e5e..77f18d99 100644 --- a/Kyoo.Abstractions/Models/Resources/Show.cs +++ b/Kyoo.Abstractions/Models/Resources/Show.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Kyoo.Controllers; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A series or a movie. diff --git a/Kyoo.Abstractions/Models/Resources/Studio.cs b/Kyoo.Abstractions/Models/Resources/Studio.cs index 03ec04df..f0e14567 100644 --- a/Kyoo.Abstractions/Models/Resources/Studio.cs +++ b/Kyoo.Abstractions/Models/Resources/Studio.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A studio that make shows. diff --git a/Kyoo.Abstractions/Models/Resources/Track.cs b/Kyoo.Abstractions/Models/Resources/Track.cs index d4454f5f..4f94b7f3 100644 --- a/Kyoo.Abstractions/Models/Resources/Track.cs +++ b/Kyoo.Abstractions/Models/Resources/Track.cs @@ -3,9 +3,9 @@ using System.Globalization; using System.Linq; using System.Text.RegularExpressions; using JetBrains.Annotations; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models.Attributes; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// The list of available stream types. diff --git a/Kyoo.Abstractions/Models/Resources/User.cs b/Kyoo.Abstractions/Models/Resources/User.cs index 3400df62..8e61cb64 100644 --- a/Kyoo.Abstractions/Models/Resources/User.cs +++ b/Kyoo.Abstractions/Models/Resources/User.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A single user of the app. diff --git a/Kyoo.Abstractions/Models/SearchResult.cs b/Kyoo.Abstractions/Models/SearchResult.cs index 9ec2bc37..9b1b5006 100644 --- a/Kyoo.Abstractions/Models/SearchResult.cs +++ b/Kyoo.Abstractions/Models/SearchResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// Results of a search request. diff --git a/Kyoo.Abstractions/Models/WatchItem.cs b/Kyoo.Abstractions/Models/WatchItem.cs index 158563a8..3f48a636 100644 --- a/Kyoo.Abstractions/Models/WatchItem.cs +++ b/Kyoo.Abstractions/Models/WatchItem.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; using PathIO = System.IO.Path; -namespace Kyoo.Models +namespace Kyoo.Abstractions.Models { /// /// A watch item give information useful for playback. diff --git a/Kyoo.Abstractions/Module.cs b/Kyoo.Abstractions/Module.cs index 7fb9bdbc..f4594387 100644 --- a/Kyoo.Abstractions/Module.cs +++ b/Kyoo.Abstractions/Module.cs @@ -1,9 +1,9 @@ using Autofac; using Autofac.Builder; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; using Microsoft.Extensions.Configuration; -namespace Kyoo +namespace Kyoo.Abstractions { /// /// A static class with helper functions to setup external modules diff --git a/Kyoo.Abstractions/Utility/Merger.cs b/Kyoo.Abstractions/Utility/Merger.cs index 32441c1d..c59f47a1 100644 --- a/Kyoo.Abstractions/Utility/Merger.cs +++ b/Kyoo.Abstractions/Utility/Merger.cs @@ -5,8 +5,8 @@ using System.ComponentModel; using System.Linq; using System.Reflection; using JetBrains.Annotations; -using Kyoo.Models; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; namespace Kyoo { diff --git a/Kyoo.Abstractions/MethodOfUtils.cs b/Kyoo.Abstractions/Utility/MethodOfUtils.cs similarity index 100% rename from Kyoo.Abstractions/MethodOfUtils.cs rename to Kyoo.Abstractions/Utility/MethodOfUtils.cs diff --git a/Kyoo.Authentication/AuthenticationModule.cs b/Kyoo.Authentication/AuthenticationModule.cs index 26dc5fc8..61f3d929 100644 --- a/Kyoo.Authentication/AuthenticationModule.cs +++ b/Kyoo.Authentication/AuthenticationModule.cs @@ -7,10 +7,11 @@ using Autofac; using IdentityServer4.Extensions; using IdentityServer4.Models; using IdentityServer4.Services; +using Kyoo.Abstractions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.Authentication.Models; using Kyoo.Authentication.Views; -using Kyoo.Controllers; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/Kyoo.Authentication/Controllers/PremissionValidator.cs b/Kyoo.Authentication/Controllers/PremissionValidator.cs index ca3102ed..d34f5e57 100644 --- a/Kyoo.Authentication/Controllers/PremissionValidator.cs +++ b/Kyoo.Authentication/Controllers/PremissionValidator.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.Authentication.Models; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http; diff --git a/Kyoo.Authentication/Extensions.cs b/Kyoo.Authentication/Extensions.cs index 718a7a44..ca37cd09 100644 --- a/Kyoo.Authentication/Extensions.cs +++ b/Kyoo.Authentication/Extensions.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Security.Claims; using IdentityModel; using IdentityServer4; -using Kyoo.Models; +using Kyoo.Abstractions.Models; namespace Kyoo.Authentication { diff --git a/Kyoo.Authentication/Models/DTO/RegisterRequest.cs b/Kyoo.Authentication/Models/DTO/RegisterRequest.cs index ad556f6d..e10967fd 100644 --- a/Kyoo.Authentication/Models/DTO/RegisterRequest.cs +++ b/Kyoo.Authentication/Models/DTO/RegisterRequest.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using Kyoo.Models; +using Kyoo.Abstractions.Models; namespace Kyoo.Authentication.Models.DTO { @@ -34,7 +34,7 @@ namespace Kyoo.Authentication.Models.DTO /// public User ToUser() { - return new() + return new User { Slug = Utility.ToSlug(Username), Username = Username, diff --git a/Kyoo.Authentication/Views/AccountApi.cs b/Kyoo.Authentication/Views/AccountApi.cs index 4288250e..1e369e31 100644 --- a/Kyoo.Authentication/Views/AccountApi.cs +++ b/Kyoo.Authentication/Views/AccountApi.cs @@ -8,11 +8,11 @@ using System.Threading.Tasks; using IdentityServer4.Extensions; using IdentityServer4.Models; using IdentityServer4.Services; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Authentication.Models; using Kyoo.Authentication.Models.DTO; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; diff --git a/Kyoo.CommonAPI/ApiHelper.cs b/Kyoo.CommonAPI/ApiHelper.cs index d3d8d951..7dc0888f 100644 --- a/Kyoo.CommonAPI/ApiHelper.cs +++ b/Kyoo.CommonAPI/ApiHelper.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Kyoo.Models; +using Kyoo.Abstractions.Models; namespace Kyoo.CommonApi { diff --git a/Kyoo.CommonAPI/CrudApi.cs b/Kyoo.CommonAPI/CrudApi.cs index a6834c31..78c7be9c 100644 --- a/Kyoo.CommonAPI/CrudApi.cs +++ b/Kyoo.CommonAPI/CrudApi.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; -using Kyoo.Models.Permissions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Microsoft.AspNetCore.Mvc; namespace Kyoo.CommonApi diff --git a/Kyoo.CommonAPI/DatabaseContext.cs b/Kyoo.CommonAPI/DatabaseContext.cs index ad96ff78..7cdbfbbe 100644 --- a/Kyoo.CommonAPI/DatabaseContext.cs +++ b/Kyoo.CommonAPI/DatabaseContext.cs @@ -5,9 +5,9 @@ using System.Linq.Expressions; using System.Threading; using System.Threading.Tasks; using JetBrains.Annotations; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; diff --git a/Kyoo.CommonAPI/JsonSerializer.cs b/Kyoo.CommonAPI/JsonSerializer.cs index 3a2caac7..153d5fd6 100644 --- a/Kyoo.CommonAPI/JsonSerializer.cs +++ b/Kyoo.CommonAPI/JsonSerializer.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; -using Kyoo.Models; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; diff --git a/Kyoo.CommonAPI/LocalRepository.cs b/Kyoo.CommonAPI/LocalRepository.cs index 67a75e12..1b7c03b7 100644 --- a/Kyoo.CommonAPI/LocalRepository.cs +++ b/Kyoo.CommonAPI/LocalRepository.cs @@ -4,10 +4,11 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; +using Kyoo.Abstractions.Models.Exceptions; using Kyoo.CommonApi; -using Kyoo.Models; -using Kyoo.Models.Attributes; -using Kyoo.Models.Exceptions; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo.CommonAPI/ResourceViewAttribute.cs b/Kyoo.CommonAPI/ResourceViewAttribute.cs index 487373c4..66d03002 100644 --- a/Kyoo.CommonAPI/ResourceViewAttribute.cs +++ b/Kyoo.CommonAPI/ResourceViewAttribute.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; diff --git a/Kyoo.Postgresql/Migrations/20210801171613_Initial.Designer.cs b/Kyoo.Postgresql/Migrations/20210801171613_Initial.Designer.cs index 20b6f7bd..958d1951 100644 --- a/Kyoo.Postgresql/Migrations/20210801171613_Initial.Designer.cs +++ b/Kyoo.Postgresql/Migrations/20210801171613_Initial.Designer.cs @@ -1,7 +1,7 @@ // using System; using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/Kyoo.Postgresql/Migrations/20210801171613_Initial.cs b/Kyoo.Postgresql/Migrations/20210801171613_Initial.cs index 395d9e27..1f336f4e 100644 --- a/Kyoo.Postgresql/Migrations/20210801171613_Initial.cs +++ b/Kyoo.Postgresql/Migrations/20210801171613_Initial.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; diff --git a/Kyoo.Postgresql/Migrations/20210801171641_Triggers.Designer.cs b/Kyoo.Postgresql/Migrations/20210801171641_Triggers.Designer.cs index fd13824a..02738ac0 100644 --- a/Kyoo.Postgresql/Migrations/20210801171641_Triggers.Designer.cs +++ b/Kyoo.Postgresql/Migrations/20210801171641_Triggers.Designer.cs @@ -1,7 +1,7 @@ // using System; using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs b/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs index cd338b2f..a3b33778 100644 --- a/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs +++ b/Kyoo.Postgresql/Migrations/PostgresContextModelSnapshot.cs @@ -1,7 +1,7 @@ // using System; using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Kyoo.Postgresql; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/Kyoo.Postgresql/PostgresContext.cs b/Kyoo.Postgresql/PostgresContext.cs index 36f12a8c..cb7aeba3 100644 --- a/Kyoo.Postgresql/PostgresContext.cs +++ b/Kyoo.Postgresql/PostgresContext.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Linq.Expressions; using System.Reflection; using EFCore.NamingConventions.Internal; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Npgsql; diff --git a/Kyoo.Postgresql/PostgresModule.cs b/Kyoo.Postgresql/PostgresModule.cs index 372d3e86..47d1e143 100644 --- a/Kyoo.Postgresql/PostgresModule.cs +++ b/Kyoo.Postgresql/PostgresModule.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; diff --git a/Kyoo.SqLite/SqLiteContext.cs b/Kyoo.SqLite/SqLiteContext.cs index cbd44659..1b549492 100644 --- a/Kyoo.SqLite/SqLiteContext.cs +++ b/Kyoo.SqLite/SqLiteContext.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; using System.Reflection; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; diff --git a/Kyoo.SqLite/SqLiteModule.cs b/Kyoo.SqLite/SqLiteModule.cs index e1c05632..340fbc34 100644 --- a/Kyoo.SqLite/SqLiteModule.cs +++ b/Kyoo.SqLite/SqLiteModule.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; diff --git a/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs b/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs index 3fe71a89..3c1460f2 100644 --- a/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TMDbLib.Objects.Search; namespace Kyoo.TheMovieDb diff --git a/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs b/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs index 75129af3..efee43df 100644 --- a/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TMDbLib.Objects.TvShows; namespace Kyoo.TheMovieDb diff --git a/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs b/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs index 450f6934..f859c489 100644 --- a/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TMDbLib.Objects.Movies; using TMDbLib.Objects.Search; diff --git a/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs b/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs index 861f21e0..32a0cbaf 100644 --- a/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TMDbLib.Objects.General; using TMDbLib.Objects.People; using TMDbLib.Objects.Search; -using Images = Kyoo.Models.Images; +using Images = Kyoo.Abstractions.Models.Images; using TvCast = TMDbLib.Objects.TvShows.Cast; using MovieCast = TMDbLib.Objects.Movies.Cast; @@ -15,11 +15,11 @@ namespace Kyoo.TheMovieDb public static partial class Convertors { /// - /// Convert a to a . + /// Convert a to a . /// /// An internal TheMovieDB cast. /// The provider that represent TheMovieDB inside Kyoo. - /// A representing the movie cast. + /// A representing the movie cast. public static PeopleRole ToPeople(this MovieCast cast, Provider provider) { return new PeopleRole diff --git a/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs b/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs index a1aa4e51..8c5dc7a1 100644 --- a/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TMDbLib.Objects.TvShows; namespace Kyoo.TheMovieDb diff --git a/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs b/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs index 946a8aea..a47b62c5 100644 --- a/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TMDbLib.Objects.Search; using TMDbLib.Objects.TvShows; diff --git a/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs b/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs index 9839d784..42290c73 100644 --- a/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs @@ -1,4 +1,4 @@ -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TMDbLib.Objects.Companies; using TMDbLib.Objects.Search; diff --git a/Kyoo.TheMovieDb/PluginTmdb.cs b/Kyoo.TheMovieDb/PluginTmdb.cs index 21990d3c..6fb94e23 100644 --- a/Kyoo.TheMovieDb/PluginTmdb.cs +++ b/Kyoo.TheMovieDb/PluginTmdb.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using Autofac; -using Kyoo.Controllers; +using Kyoo.Abstractions; +using Kyoo.Abstractions.Controllers; using Kyoo.TheMovieDb.Models; namespace Kyoo.TheMovieDb diff --git a/Kyoo.TheMovieDb/ProviderTmdb.cs b/Kyoo.TheMovieDb/ProviderTmdb.cs index b04d3f03..7d8c4057 100644 --- a/Kyoo.TheMovieDb/ProviderTmdb.cs +++ b/Kyoo.TheMovieDb/ProviderTmdb.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Kyoo.TheMovieDb.Models; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/Kyoo.TheTvdb/Convertors.cs b/Kyoo.TheTvdb/Convertors.cs index 69ee4c26..20413570 100644 --- a/Kyoo.TheTvdb/Convertors.cs +++ b/Kyoo.TheTvdb/Convertors.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using TvDbSharper.Dto; namespace Kyoo.TheTvdb diff --git a/Kyoo.TheTvdb/PluginTvdb.cs b/Kyoo.TheTvdb/PluginTvdb.cs index 2b598807..8d43cb81 100644 --- a/Kyoo.TheTvdb/PluginTvdb.cs +++ b/Kyoo.TheTvdb/PluginTvdb.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using Autofac; -using Kyoo.Controllers; +using Kyoo.Abstractions; +using Kyoo.Abstractions.Controllers; using Kyoo.TheTvdb.Models; using TvDbSharper; diff --git a/Kyoo.TheTvdb/ProviderTvdb.cs b/Kyoo.TheTvdb/ProviderTvdb.cs index 01411d1d..ae983720 100644 --- a/Kyoo.TheTvdb/ProviderTvdb.cs +++ b/Kyoo.TheTvdb/ProviderTvdb.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using JetBrains.Annotations; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Kyoo.TheTvdb.Models; using Microsoft.Extensions.Options; using TvDbSharper; diff --git a/Kyoo.WebApp/WebAppModule.cs b/Kyoo.WebApp/WebAppModule.cs index 889ec177..dc17c899 100644 --- a/Kyoo.WebApp/WebAppModule.cs +++ b/Kyoo.WebApp/WebAppModule.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.SpaServices.AngularCli; diff --git a/Kyoo/Controllers/ConfigurationManager.cs b/Kyoo/Controllers/ConfigurationManager.cs index 286c6a2a..c6476551 100644 --- a/Kyoo/Controllers/ConfigurationManager.cs +++ b/Kyoo/Controllers/ConfigurationManager.cs @@ -5,9 +5,10 @@ using System.Dynamic; using System.IO; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Api; -using Kyoo.Models; -using Kyoo.Models.Exceptions; using Microsoft.Extensions.Configuration; using Newtonsoft.Json.Linq; diff --git a/Kyoo/Controllers/FileSystems/FileSystemComposite.cs b/Kyoo/Controllers/FileSystems/FileSystemComposite.cs index b3f4f66a..bab7167d 100644 --- a/Kyoo/Controllers/FileSystems/FileSystemComposite.cs +++ b/Kyoo/Controllers/FileSystems/FileSystemComposite.cs @@ -6,8 +6,9 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using Autofac.Features.Metadata; using JetBrains.Annotations; -using Kyoo.Common.Models.Attributes; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; +using Kyoo.Abstractions.Models; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Controllers/FileSystems/HttpFileSystem.cs b/Kyoo/Controllers/FileSystems/HttpFileSystem.cs index 99155f62..8bd3d62f 100644 --- a/Kyoo/Controllers/FileSystems/HttpFileSystem.cs +++ b/Kyoo/Controllers/FileSystems/HttpFileSystem.cs @@ -4,8 +4,9 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Net.Http; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; using Microsoft.AspNetCore.Mvc; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/FileSystems/LocalFileSystem.cs b/Kyoo/Controllers/FileSystems/LocalFileSystem.cs index d5a19a68..3c4da8a0 100644 --- a/Kyoo/Controllers/FileSystems/LocalFileSystem.cs +++ b/Kyoo/Controllers/FileSystems/LocalFileSystem.cs @@ -2,8 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; using Kyoo.Models.Options; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.StaticFiles; diff --git a/Kyoo.Abstractions/Controllers/Implementations/LibraryManager.cs b/Kyoo/Controllers/LibraryManager.cs similarity index 99% rename from Kyoo.Abstractions/Controllers/Implementations/LibraryManager.cs rename to Kyoo/Controllers/LibraryManager.cs index 08475c32..2b396ed5 100644 --- a/Kyoo.Abstractions/Controllers/Implementations/LibraryManager.cs +++ b/Kyoo/Controllers/LibraryManager.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; namespace Kyoo.Controllers { diff --git a/Kyoo/Controllers/PassthroughPermissionValidator.cs b/Kyoo/Controllers/PassthroughPermissionValidator.cs index d6d2f334..5b623008 100644 --- a/Kyoo/Controllers/PassthroughPermissionValidator.cs +++ b/Kyoo/Controllers/PassthroughPermissionValidator.cs @@ -1,4 +1,4 @@ -using Kyoo.Models.Permissions; +using Kyoo.Abstractions.Models.Permissions; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; diff --git a/Kyoo/Controllers/PluginManager.cs b/Kyoo/Controllers/PluginManager.cs index c55aa906..3b60e83f 100644 --- a/Kyoo/Controllers/PluginManager.cs +++ b/Kyoo/Controllers/PluginManager.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Reflection; using System.Runtime.Loader; +using Kyoo.Abstractions.Controllers; using Kyoo.Models.Options; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/Kyoo/Controllers/ProviderComposite.cs b/Kyoo/Controllers/ProviderComposite.cs index 2474016c..dd9ecb41 100644 --- a/Kyoo/Controllers/ProviderComposite.cs +++ b/Kyoo/Controllers/ProviderComposite.cs @@ -1,8 +1,9 @@ using System; -using Kyoo.Models; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.Extensions.Logging; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/RegexIdentifier.cs b/Kyoo/Controllers/RegexIdentifier.cs index c25e3e4f..41a6e0d8 100644 --- a/Kyoo/Controllers/RegexIdentifier.cs +++ b/Kyoo/Controllers/RegexIdentifier.cs @@ -4,8 +4,9 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Models.Options; using Kyoo.Models.Watch; using Microsoft.Extensions.Options; diff --git a/Kyoo/Controllers/Repositories/CollectionRepository.cs b/Kyoo/Controllers/Repositories/CollectionRepository.cs index e4250c8f..64266be2 100644 --- a/Kyoo/Controllers/Repositories/CollectionRepository.cs +++ b/Kyoo/Controllers/Repositories/CollectionRepository.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/EpisodeRepository.cs b/Kyoo/Controllers/Repositories/EpisodeRepository.cs index 92a573a4..743c2429 100644 --- a/Kyoo/Controllers/Repositories/EpisodeRepository.cs +++ b/Kyoo/Controllers/Repositories/EpisodeRepository.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/GenreRepository.cs b/Kyoo/Controllers/Repositories/GenreRepository.cs index fe9444f5..ade3225e 100644 --- a/Kyoo/Controllers/Repositories/GenreRepository.cs +++ b/Kyoo/Controllers/Repositories/GenreRepository.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/LibraryItemRepository.cs b/Kyoo/Controllers/Repositories/LibraryItemRepository.cs index b0ec916e..aedd1842 100644 --- a/Kyoo/Controllers/Repositories/LibraryItemRepository.cs +++ b/Kyoo/Controllers/Repositories/LibraryItemRepository.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/LibraryRepository.cs b/Kyoo/Controllers/Repositories/LibraryRepository.cs index 06f57fc1..b50de2f3 100644 --- a/Kyoo/Controllers/Repositories/LibraryRepository.cs +++ b/Kyoo/Controllers/Repositories/LibraryRepository.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/PeopleRepository.cs b/Kyoo/Controllers/Repositories/PeopleRepository.cs index 3b6d3f87..ede28e52 100644 --- a/Kyoo/Controllers/Repositories/PeopleRepository.cs +++ b/Kyoo/Controllers/Repositories/PeopleRepository.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/ProviderRepository.cs b/Kyoo/Controllers/Repositories/ProviderRepository.cs index f555f5a5..04e93012 100644 --- a/Kyoo/Controllers/Repositories/ProviderRepository.cs +++ b/Kyoo/Controllers/Repositories/ProviderRepository.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/SeasonRepository.cs b/Kyoo/Controllers/Repositories/SeasonRepository.cs index 0ac7e759..fe68a51f 100644 --- a/Kyoo/Controllers/Repositories/SeasonRepository.cs +++ b/Kyoo/Controllers/Repositories/SeasonRepository.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/ShowRepository.cs b/Kyoo/Controllers/Repositories/ShowRepository.cs index 3ef8747c..dc1c276a 100644 --- a/Kyoo/Controllers/Repositories/ShowRepository.cs +++ b/Kyoo/Controllers/Repositories/ShowRepository.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/StudioRepository.cs b/Kyoo/Controllers/Repositories/StudioRepository.cs index 2c807375..040f800c 100644 --- a/Kyoo/Controllers/Repositories/StudioRepository.cs +++ b/Kyoo/Controllers/Repositories/StudioRepository.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/TrackRepository.cs b/Kyoo/Controllers/Repositories/TrackRepository.cs index a462ca23..d4c39a3e 100644 --- a/Kyoo/Controllers/Repositories/TrackRepository.cs +++ b/Kyoo/Controllers/Repositories/TrackRepository.cs @@ -2,7 +2,8 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/Repositories/UserRepository.cs b/Kyoo/Controllers/Repositories/UserRepository.cs index 5ebd4d2b..dec6c1a0 100644 --- a/Kyoo/Controllers/Repositories/UserRepository.cs +++ b/Kyoo/Controllers/Repositories/UserRepository.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; namespace Kyoo.Controllers diff --git a/Kyoo/Controllers/TaskManager.cs b/Kyoo/Controllers/TaskManager.cs index 8b5650a6..df89f290 100644 --- a/Kyoo/Controllers/TaskManager.cs +++ b/Kyoo/Controllers/TaskManager.cs @@ -7,8 +7,9 @@ using System.Threading.Tasks; using Autofac.Features.Metadata; using Autofac.Features.OwnedInstances; using JetBrains.Annotations; -using Kyoo.Common.Models.Attributes; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; +using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Models.Options; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; diff --git a/Kyoo/Controllers/ThumbnailsManager.cs b/Kyoo/Controllers/ThumbnailsManager.cs index 23469dcf..274b655f 100644 --- a/Kyoo/Controllers/ThumbnailsManager.cs +++ b/Kyoo/Controllers/ThumbnailsManager.cs @@ -1,8 +1,9 @@ -using Kyoo.Models; -using System; +using System; using System.IO; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.Logging; diff --git a/Kyoo/Controllers/Transcoder.cs b/Kyoo/Controllers/Transcoder.cs index 5942cbd2..a8adc9d1 100644 --- a/Kyoo/Controllers/Transcoder.cs +++ b/Kyoo/Controllers/Transcoder.cs @@ -2,7 +2,8 @@ using System; using System.IO; using System.Runtime.InteropServices; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Kyoo.Models.Options; using Microsoft.Extensions.Options; using Stream = Kyoo.Models.Watch.Stream; diff --git a/Kyoo/CoreModule.cs b/Kyoo/CoreModule.cs index 0ac9485a..ef456639 100644 --- a/Kyoo/CoreModule.cs +++ b/Kyoo/CoreModule.cs @@ -4,16 +4,18 @@ using Autofac; using Autofac.Core; using Autofac.Core.Registration; using Autofac.Extras.AttributeMetadata; +using Kyoo.Abstractions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.Controllers; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Kyoo.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using IMetadataProvider = Kyoo.Controllers.IMetadataProvider; +using IMetadataProvider = Kyoo.Abstractions.Controllers.IMetadataProvider; namespace Kyoo { diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index f6710ef0..4e23238a 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -45,10 +45,8 @@ - - + + diff --git a/Kyoo/Models/Options/BasicOptions.cs b/Kyoo/Models/Options/BasicOptions.cs index 60e95ee2..926010cb 100644 --- a/Kyoo/Models/Options/BasicOptions.cs +++ b/Kyoo/Models/Options/BasicOptions.cs @@ -1,3 +1,5 @@ +using Kyoo.Abstractions.Models; + namespace Kyoo.Models.Options { /// diff --git a/Kyoo/Models/Stream.cs b/Kyoo/Models/Stream.cs index 3639a4a6..6d2b4a3c 100644 --- a/Kyoo/Models/Stream.cs +++ b/Kyoo/Models/Stream.cs @@ -1,5 +1,6 @@ using System.Runtime.InteropServices; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; namespace Kyoo.Models.Watch { diff --git a/Kyoo/PluginsStartup.cs b/Kyoo/PluginsStartup.cs index 6ba2b662..4bcd362f 100644 --- a/Kyoo/PluginsStartup.cs +++ b/Kyoo/PluginsStartup.cs @@ -2,6 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using Autofac; +using Kyoo.Abstractions; +using Kyoo.Abstractions.Controllers; using Kyoo.Authentication; using Kyoo.Controllers; using Kyoo.Models.Options; diff --git a/Kyoo/Tasks/Crawler.cs b/Kyoo/Tasks/Crawler.cs index 333710a3..cc2762c4 100644 --- a/Kyoo/Tasks/Crawler.cs +++ b/Kyoo/Tasks/Crawler.cs @@ -1,12 +1,12 @@ using System; -using Kyoo.Models; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; using Kyoo.Models.Watch; using Microsoft.Extensions.Logging; diff --git a/Kyoo/Tasks/Housekeeping.cs b/Kyoo/Tasks/Housekeeping.cs index b98989f5..1724b0e7 100644 --- a/Kyoo/Tasks/Housekeeping.cs +++ b/Kyoo/Tasks/Housekeeping.cs @@ -1,9 +1,9 @@ using System; using System.Threading; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; using Microsoft.Extensions.Logging; namespace Kyoo.Tasks diff --git a/Kyoo/Tasks/MetadataProviderLoader.cs b/Kyoo/Tasks/MetadataProviderLoader.cs index 42342434..3c9163c4 100644 --- a/Kyoo/Tasks/MetadataProviderLoader.cs +++ b/Kyoo/Tasks/MetadataProviderLoader.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Controllers; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; +using Kyoo.Abstractions.Models.Exceptions; namespace Kyoo.Tasks { diff --git a/Kyoo/Tasks/PluginInitializer.cs b/Kyoo/Tasks/PluginInitializer.cs index c9f814a6..7f9e5171 100644 --- a/Kyoo/Tasks/PluginInitializer.cs +++ b/Kyoo/Tasks/PluginInitializer.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Controllers; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Attributes; namespace Kyoo.Tasks { diff --git a/Kyoo/Tasks/RegisterEpisode.cs b/Kyoo/Tasks/RegisterEpisode.cs index c7c7c3e3..851d658d 100644 --- a/Kyoo/Tasks/RegisterEpisode.cs +++ b/Kyoo/Tasks/RegisterEpisode.cs @@ -2,10 +2,10 @@ using System; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; +using Kyoo.Abstractions.Models.Exceptions; namespace Kyoo.Tasks { diff --git a/Kyoo/Tasks/RegisterSubtitle.cs b/Kyoo/Tasks/RegisterSubtitle.cs index 6c36ea58..2ace1f0b 100644 --- a/Kyoo/Tasks/RegisterSubtitle.cs +++ b/Kyoo/Tasks/RegisterSubtitle.cs @@ -1,10 +1,10 @@ using System; using System.Threading; using System.Threading.Tasks; -using Kyoo.Common.Models.Attributes; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; +using Kyoo.Abstractions.Models.Exceptions; namespace Kyoo.Tasks { diff --git a/Kyoo/Views/CollectionApi.cs b/Kyoo/Views/CollectionApi.cs index 9c26a65c..b9419819 100644 --- a/Kyoo/Views/CollectionApi.cs +++ b/Kyoo/Views/CollectionApi.cs @@ -1,14 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Kyoo.Controllers; -using Kyoo.Models; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Models.Exceptions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.Extensions.Options; namespace Kyoo.Api diff --git a/Kyoo/Views/ConfigurationApi.cs b/Kyoo/Views/ConfigurationApi.cs index 7830d786..1abef5bf 100644 --- a/Kyoo/Views/ConfigurationApi.cs +++ b/Kyoo/Views/ConfigurationApi.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models.Exceptions; -using Kyoo.Models.Permissions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Microsoft.AspNetCore.Mvc; namespace Kyoo.Api diff --git a/Kyoo/Views/EpisodeApi.cs b/Kyoo/Views/EpisodeApi.cs index e98f1f6a..eb1ceee0 100644 --- a/Kyoo/Views/EpisodeApi.cs +++ b/Kyoo/Views/EpisodeApi.cs @@ -1,14 +1,14 @@ using System; -using Kyoo.Models; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models.Exceptions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.Extensions.Options; namespace Kyoo.Api diff --git a/Kyoo/Views/GenreApi.cs b/Kyoo/Views/GenreApi.cs index e494665d..d8490638 100644 --- a/Kyoo/Views/GenreApi.cs +++ b/Kyoo/Views/GenreApi.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/LibraryApi.cs b/Kyoo/Views/LibraryApi.cs index 83d0e712..dd9f38ce 100644 --- a/Kyoo/Views/LibraryApi.cs +++ b/Kyoo/Views/LibraryApi.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using Kyoo.Controllers; -using Kyoo.Models; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.Extensions.Options; namespace Kyoo.Api diff --git a/Kyoo/Views/LibraryItemApi.cs b/Kyoo/Views/LibraryItemApi.cs index 5fd6b7e3..cc12c58c 100644 --- a/Kyoo/Views/LibraryItemApi.cs +++ b/Kyoo/Views/LibraryItemApi.cs @@ -2,12 +2,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/PeopleApi.cs b/Kyoo/Views/PeopleApi.cs index bd25491e..96cdbd77 100644 --- a/Kyoo/Views/PeopleApi.cs +++ b/Kyoo/Views/PeopleApi.cs @@ -1,12 +1,12 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/ProviderApi.cs b/Kyoo/Views/ProviderApi.cs index 5651f4f7..79d5d8c2 100644 --- a/Kyoo/Views/ProviderApi.cs +++ b/Kyoo/Views/ProviderApi.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/SearchApi.cs b/Kyoo/Views/SearchApi.cs index b78aa683..5abe1467 100644 --- a/Kyoo/Views/SearchApi.cs +++ b/Kyoo/Views/SearchApi.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Permissions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Permissions; using Microsoft.AspNetCore.Mvc; namespace Kyoo.Api diff --git a/Kyoo/Views/SeasonApi.cs b/Kyoo/Views/SeasonApi.cs index fdf98959..f504e061 100644 --- a/Kyoo/Views/SeasonApi.cs +++ b/Kyoo/Views/SeasonApi.cs @@ -2,12 +2,12 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models; using Microsoft.AspNetCore.Mvc; using System.Linq; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.Extensions.Options; namespace Kyoo.Api diff --git a/Kyoo/Views/ShowApi.cs b/Kyoo/Views/ShowApi.cs index 0c8dde65..b71c9372 100644 --- a/Kyoo/Views/ShowApi.cs +++ b/Kyoo/Views/ShowApi.cs @@ -1,15 +1,15 @@ using System; -using Kyoo.Models; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models.Exceptions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.Extensions.Options; namespace Kyoo.Api diff --git a/Kyoo/Views/StudioApi.cs b/Kyoo/Views/StudioApi.cs index a6957e33..6058cb2c 100644 --- a/Kyoo/Views/StudioApi.cs +++ b/Kyoo/Views/StudioApi.cs @@ -2,11 +2,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/SubtitleApi.cs b/Kyoo/Views/SubtitleApi.cs index 89d036aa..e4f94887 100644 --- a/Kyoo/Views/SubtitleApi.cs +++ b/Kyoo/Views/SubtitleApi.cs @@ -1,11 +1,11 @@ -using Kyoo.Models; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models.Permissions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Permissions; namespace Kyoo.Api { diff --git a/Kyoo/Views/TaskApi.cs b/Kyoo/Views/TaskApi.cs index dfad76da..25097411 100644 --- a/Kyoo/Views/TaskApi.cs +++ b/Kyoo/Views/TaskApi.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Microsoft.AspNetCore.Mvc; -using Kyoo.Controllers; -using Kyoo.Models.Exceptions; -using Kyoo.Models.Permissions; namespace Kyoo.Api { diff --git a/Kyoo/Views/TrackApi.cs b/Kyoo/Views/TrackApi.cs index 07df38ce..d8fd1157 100644 --- a/Kyoo/Views/TrackApi.cs +++ b/Kyoo/Views/TrackApi.cs @@ -1,11 +1,11 @@ using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.CommonApi; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/VideoApi.cs b/Kyoo/Views/VideoApi.cs index cbc2937b..2badb6dd 100644 --- a/Kyoo/Views/VideoApi.cs +++ b/Kyoo/Views/VideoApi.cs @@ -1,11 +1,11 @@ using System.IO; -using Kyoo.Controllers; -using Kyoo.Models; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Kyoo.Models.Options; -using Kyoo.Models.Permissions; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Options; diff --git a/Kyoo/Views/WatchApi.cs b/Kyoo/Views/WatchApi.cs index 38e65e21..d4a46e8a 100644 --- a/Kyoo/Views/WatchApi.cs +++ b/Kyoo/Views/WatchApi.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; -using Kyoo.Models.Permissions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; +using Kyoo.Abstractions.Models.Permissions; using Microsoft.AspNetCore.Mvc; namespace Kyoo.Api diff --git a/tests/Kyoo.Tests/Database/RepositoryActivator.cs b/tests/Kyoo.Tests/Database/RepositoryActivator.cs index 8e543546..8127dc52 100644 --- a/tests/Kyoo.Tests/Database/RepositoryActivator.cs +++ b/tests/Kyoo.Tests/Database/RepositoryActivator.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; using Kyoo.Controllers; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/RepositoryTests.cs b/tests/Kyoo.Tests/Database/RepositoryTests.cs index 2c984568..702a86bb 100644 --- a/tests/Kyoo.Tests/Database/RepositoryTests.cs +++ b/tests/Kyoo.Tests/Database/RepositoryTests.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Xunit; namespace Kyoo.Tests diff --git a/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs index f1f773ad..6efe7453 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/CollectionsTests.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs index 8a477100..a840257b 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/EpisodeTests.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs index dc820187..0b5d8489 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/GenreTests.cs @@ -1,5 +1,5 @@ -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs b/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs index f3e031b2..d370996a 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/LibraryItemTest.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs index 79277f61..e2fd028a 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs index 3de88edf..5a712e18 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/PeopleTests.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs index 9c022875..06edde1b 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/ProviderTests.cs @@ -1,5 +1,5 @@ -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/SanityTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/SanityTests.cs index a071ee2b..efbdbd26 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/SanityTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/SanityTests.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs index ae56415c..a0c69b13 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/SeasonTests.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs index d3111f75..d0bda03c 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using FluentAssertions; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Microsoft.EntityFrameworkCore; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs index c727f67a..8b64bded 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/StudioTests.cs @@ -1,5 +1,5 @@ -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs index 0ff0c156..2bf7cc17 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/TrackTests.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs b/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs index 24bfc789..a9f7b0bc 100644 --- a/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs +++ b/tests/Kyoo.Tests/Database/SpecificTests/UserTests.cs @@ -1,5 +1,5 @@ -using Kyoo.Controllers; -using Kyoo.Models; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Xunit; using Xunit.Abstractions; diff --git a/tests/Kyoo.Tests/Database/TestSample.cs b/tests/Kyoo.Tests/Database/TestSample.cs index 6f9a69ff..13efb26d 100644 --- a/tests/Kyoo.Tests/Database/TestSample.cs +++ b/tests/Kyoo.Tests/Database/TestSample.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Kyoo.Models; +using Kyoo.Abstractions.Models; namespace Kyoo.Tests { diff --git a/tests/Kyoo.Tests/Identifier/IdentifierTests.cs b/tests/Kyoo.Tests/Identifier/IdentifierTests.cs index 36ad94b9..93f6c345 100644 --- a/tests/Kyoo.Tests/Identifier/IdentifierTests.cs +++ b/tests/Kyoo.Tests/Identifier/IdentifierTests.cs @@ -1,7 +1,8 @@ using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Exceptions; using Kyoo.Controllers; -using Kyoo.Models; -using Kyoo.Models.Exceptions; using Kyoo.Models.Options; using Microsoft.Extensions.Options; using Moq; diff --git a/tests/Kyoo.Tests/Identifier/ProviderTests.cs b/tests/Kyoo.Tests/Identifier/ProviderTests.cs index c49ca3b2..0d9eb34a 100644 --- a/tests/Kyoo.Tests/Identifier/ProviderTests.cs +++ b/tests/Kyoo.Tests/Identifier/ProviderTests.cs @@ -2,8 +2,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Kyoo.Abstractions.Controllers; +using Kyoo.Abstractions.Models; using Kyoo.Controllers; -using Kyoo.Models; using Microsoft.Extensions.Logging; using Moq; using Xunit; diff --git a/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs b/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs index a761ab9e..48e6cf56 100644 --- a/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs +++ b/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Kyoo.TheTvdb; using TvDbSharper.Dto; using Xunit; diff --git a/tests/Kyoo.Tests/Utility/MergerTests.cs b/tests/Kyoo.Tests/Utility/MergerTests.cs index de9d3b04..a378ebb7 100644 --- a/tests/Kyoo.Tests/Utility/MergerTests.cs +++ b/tests/Kyoo.Tests/Utility/MergerTests.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; using JetBrains.Annotations; -using Kyoo.Models; -using Kyoo.Models.Attributes; +using Kyoo.Abstractions.Models; +using Kyoo.Abstractions.Models.Attributes; using Xunit; namespace Kyoo.Tests.Utility diff --git a/tests/Kyoo.Tests/Utility/UtilityTests.cs b/tests/Kyoo.Tests/Utility/UtilityTests.cs index f6f279aa..5c01069c 100644 --- a/tests/Kyoo.Tests/Utility/UtilityTests.cs +++ b/tests/Kyoo.Tests/Utility/UtilityTests.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; using System.Reflection; -using Kyoo.Models; +using Kyoo.Abstractions.Models; using Xunit; using Utils = Kyoo.Utility;