diff options
154 files changed, 2714 insertions, 2062 deletions
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 7f8f4c325..57d265796 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -62,6 +62,9 @@ <Compile Include="..\MediaBrowser.Model\ApiClient\ApiClientExtensions.cs"> <Link>ApiClient\ApiClientExtensions.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\ApiClient\GeneralCommandEventArgs.cs"> + <Link>ApiClient\GeneralCommandEventArgs.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\ApiClient\HttpResponseEventArgs.cs"> <Link>ApiClient\HttpResponseEventArgs.cs</Link> </Compile> @@ -71,45 +74,93 @@ <Compile Include="..\MediaBrowser.Model\ApiClient\IServerEvents.cs"> <Link>ApiClient\IServerEvents.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\ApiClient\ServerEventArgs.cs"> - <Link>ApiClient\ServerEventArgs.cs</Link> + <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs"> + <Link>ApiClient\SessionUpdatesEventArgs.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Channels\ChannelItemQuery.cs"> + <Link>Channels\ChannelItemQuery.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Channels\ChannelQuery.cs"> <Link>Channels\ChannelQuery.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Configuration\AutoOrganize.cs"> - <Link>Configuration\AutoOrganize.cs</Link> - </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\BaseApplicationConfiguration.cs"> <Link>Configuration\BaseApplicationConfiguration.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\DlnaOptions.cs"> <Link>Configuration\DlnaOptions.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\EncodingQuality.cs"> + <Link>Configuration\EncodingQuality.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\ImageOption.cs"> + <Link>Configuration\ImageOption.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\ImageSavingConvention.cs"> + <Link>Configuration\ImageSavingConvention.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\LiveTvOptions.cs"> + <Link>Configuration\LiveTvOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\MetadataOptions.cs"> <Link>Configuration\MetadataOptions.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPlugin.cs"> <Link>Configuration\MetadataPlugin.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPluginSummary.cs"> + <Link>Configuration\MetadataPluginSummary.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPluginType.cs"> + <Link>Configuration\MetadataPluginType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOption.cs"> + <Link>Configuration\NotificationOption.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOptions.cs"> <Link>Configuration\NotificationOptions.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\NotificationType.cs"> + <Link>Configuration\NotificationType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\PathSubstitution.cs"> + <Link>Configuration\PathSubstitution.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\SendToUserType.cs"> + <Link>Configuration\SendToUserType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs"> <Link>Configuration\ServerConfiguration.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\SubtitleOptions.cs"> + <Link>Configuration\SubtitleOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\TvFileOrganizationOptions.cs"> + <Link>Configuration\TvFileOrganizationOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\UnratedItem.cs"> + <Link>Configuration\UnratedItem.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\UserConfiguration.cs"> <Link>Configuration\UserConfiguration.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\AudioOptions.cs"> + <Link>Dlna\AudioOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\CodecProfile.cs"> <Link>Dlna\CodecProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\CodecType.cs"> + <Link>Dlna\CodecType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\ConditionProcessor.cs"> <Link>Dlna\ConditionProcessor.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\ContainerProfile.cs"> <Link>Dlna\ContainerProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ContentFeatureBuilder.cs"> + <Link>Dlna\ContentFeatureBuilder.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\DeviceIdentification.cs"> <Link>Dlna\DeviceIdentification.cs</Link> </Compile> @@ -119,30 +170,57 @@ <Compile Include="..\MediaBrowser.Model\Dlna\DeviceProfileInfo.cs"> <Link>Dlna\DeviceProfileInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\DeviceProfileType.cs"> + <Link>Dlna\DeviceProfileType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\DirectPlayProfile.cs"> <Link>Dlna\DirectPlayProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\DlnaFlags.cs"> + <Link>Dlna\DlnaFlags.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\DlnaMaps.cs"> <Link>Dlna\DlnaMaps.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\DlnaProfileType.cs"> + <Link>Dlna\DlnaProfileType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\EventSubscription.cs"> <Link>Dlna\EventSubscription.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\Filter.cs"> <Link>Dlna\Filter.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\HeaderMatchType.cs"> + <Link>Dlna\HeaderMatchType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\HttpHeaderInfo.cs"> + <Link>Dlna\HttpHeaderInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\MediaFormatProfile.cs"> <Link>Dlna\MediaFormatProfile.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\MediaFormatProfileResolver.cs"> <Link>Dlna\MediaFormatProfileResolver.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ProfileCondition.cs"> + <Link>Dlna\ProfileCondition.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ProfileConditionType.cs"> + <Link>Dlna\ProfileConditionType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ProfileConditionValue.cs"> + <Link>Dlna\ProfileConditionValue.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\ResponseProfile.cs"> <Link>Dlna\ResponseProfile.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\SearchCriteria.cs"> <Link>Dlna\SearchCriteria.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\SearchType.cs"> + <Link>Dlna\SearchType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\SortCriteria.cs"> <Link>Dlna\SortCriteria.cs</Link> </Compile> @@ -152,15 +230,27 @@ <Compile Include="..\MediaBrowser.Model\Dlna\StreamInfo.cs"> <Link>Dlna\StreamInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\TranscodeSeekInfo.cs"> + <Link>Dlna\TranscodeSeekInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\TranscodingProfile.cs"> <Link>Dlna\TranscodingProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\VideoOptions.cs"> + <Link>Dlna\VideoOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\XmlAttribute.cs"> + <Link>Dlna\XmlAttribute.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs"> <Link>Drawing\DrawingUtils.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Drawing\ImageOutputFormat.cs"> <Link>Drawing\ImageOutputFormat.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Drawing\ImageSize.cs"> + <Link>Drawing\ImageSize.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dto\BaseItemDto.cs"> <Link>Dto\BaseItemDto.cs</Link> </Compile> @@ -191,24 +281,36 @@ <Compile Include="..\MediaBrowser.Model\Dto\ItemIndex.cs"> <Link>Dto\ItemIndex.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Dto\MediaVersionInfo.cs"> - <Link>Dto\MediaVersionInfo.cs</Link> + <Compile Include="..\MediaBrowser.Model\Dto\MediaSourceInfo.cs"> + <Link>Dto\MediaSourceInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\RatingType.cs"> + <Link>Dto\RatingType.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dto\RecommendationDto.cs"> <Link>Dto\RecommendationDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\RecommendationType.cs"> + <Link>Dto\RecommendationType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dto\StreamOptions.cs"> <Link>Dto\StreamOptions.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dto\StudioDto.cs"> <Link>Dto\StudioDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\SubtitleDownloadOptions.cs"> + <Link>Dto\SubtitleDownloadOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dto\UserDto.cs"> <Link>Dto\UserDto.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dto\UserItemDataDto.cs"> <Link>Dto\UserItemDataDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\VideoStreamOptions.cs"> + <Link>Dto\VideoStreamOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\BaseItemInfo.cs"> <Link>Entities\BaseItemInfo.cs</Link> </Compile> @@ -221,12 +323,18 @@ <Compile Include="..\MediaBrowser.Model\Entities\DisplayPreferences.cs"> <Link>Entities\DisplayPreferences.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\EmptyRequestResult.cs"> + <Link>Entities\EmptyRequestResult.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\IHasProviderIds.cs"> <Link>Entities\IHasProviderIds.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Entities\ImageType.cs"> <Link>Entities\ImageType.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\IsoType.cs"> + <Link>Entities\IsoType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\ItemReview.cs"> <Link>Entities\ItemReview.cs</Link> </Compile> @@ -239,9 +347,15 @@ <Compile Include="..\MediaBrowser.Model\Entities\MBRegistrationRecord.cs"> <Link>Entities\MBRegistrationRecord.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MediaInfo.cs"> + <Link>Entities\MediaInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\MediaStream.cs"> <Link>Entities\MediaStream.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MediaStreamType.cs"> + <Link>Entities\MediaStreamType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\MediaType.cs"> <Link>Entities\MediaType.cs</Link> </Compile> @@ -254,6 +368,9 @@ <Compile Include="..\MediaBrowser.Model\Entities\MetadataProviders.cs"> <Link>Entities\MetadataProviders.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\PackageReviewInfo.cs"> + <Link>Entities\PackageReviewInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\ParentalRating.cs"> <Link>Entities\ParentalRating.cs</Link> </Compile> @@ -263,15 +380,27 @@ <Compile Include="..\MediaBrowser.Model\Entities\PluginSecurityInfo.cs"> <Link>Entities\PluginSecurityInfo.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Entities\RequestResult.cs"> - <Link>Entities\RequestResult.cs</Link> + <Compile Include="..\MediaBrowser.Model\Entities\ProviderIdsExtensions.cs"> + <Link>Entities\ProviderIdsExtensions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\ScrollDirection.cs"> + <Link>Entities\ScrollDirection.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Entities\SeriesStatus.cs"> <Link>Entities\SeriesStatus.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\SortOrder.cs"> + <Link>Entities\SortOrder.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\UserDataSaveReason.cs"> + <Link>Entities\UserDataSaveReason.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\Video3DFormat.cs"> <Link>Entities\Video3DFormat.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\VideoSize.cs"> + <Link>Entities\VideoSize.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\VideoType.cs"> <Link>Entities\VideoType.cs</Link> </Compile> @@ -281,12 +410,21 @@ <Compile Include="..\MediaBrowser.Model\Events\GenericEventArgs.cs"> <Link>Events\GenericEventArgs.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizationQuery.cs"> - <Link>FileOrganization\FileOrganizationQuery.cs</Link> + <Compile Include="..\MediaBrowser.Model\FileOrganization\EpisodeFileOrganizationRequest.cs"> + <Link>FileOrganization\EpisodeFileOrganizationRequest.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizationResult.cs"> <Link>FileOrganization\FileOrganizationResult.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizationResultQuery.cs"> + <Link>FileOrganization\FileOrganizationResultQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizerType.cs"> + <Link>FileOrganization\FileOrganizerType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\FileOrganization\FileSortingStatus.cs"> + <Link>FileOrganization\FileSortingStatus.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Games\GameSystem.cs"> <Link>Games\GameSystem.cs</Link> </Compile> @@ -296,15 +434,33 @@ <Compile Include="..\MediaBrowser.Model\Globalization\CultureDto.cs"> <Link>Globalization\CultureDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Globalization\LocalizatonOption.cs"> + <Link>Globalization\LocalizatonOption.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\IO\FileSystemEntryInfo.cs"> <Link>IO\FileSystemEntryInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\IO\FileSystemEntryType.cs"> + <Link>IO\FileSystemEntryType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\IO\IIsoManager.cs"> + <Link>IO\IIsoManager.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\IO\IIsoMount.cs"> + <Link>IO\IIsoMount.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\IO\IIsoMounter.cs"> + <Link>IO\IIsoMounter.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\IO\IZipClient.cs"> <Link>IO\IZipClient.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Library\PlayAccess.cs"> <Link>Library\PlayAccess.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\BaseTimerInfoDto.cs"> + <Link>LiveTv\BaseTimerInfoDto.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelInfoDto.cs"> <Link>LiveTv\ChannelInfoDto.cs</Link> </Compile> @@ -314,18 +470,45 @@ <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelType.cs"> <Link>LiveTv\ChannelType.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\DayPattern.cs"> + <Link>LiveTv\DayPattern.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\GuideInfo.cs"> + <Link>LiveTv\GuideInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvInfo.cs"> + <Link>LiveTv\LiveTvInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvServiceInfo.cs"> <Link>LiveTv\LiveTvServiceInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvServiceStatus.cs"> + <Link>LiveTv\LiveTvServiceStatus.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvTunerInfoDto.cs"> + <Link>LiveTv\LiveTvTunerInfoDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvTunerStatus.cs"> + <Link>LiveTv\LiveTvTunerStatus.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\ProgramAudio.cs"> + <Link>LiveTv\ProgramAudio.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\ProgramInfoDto.cs"> <Link>LiveTv\ProgramInfoDto.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\ProgramQuery.cs"> <Link>LiveTv\ProgramQuery.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\RecommendedProgramQuery.cs"> + <Link>LiveTv\RecommendedProgramQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupDto.cs"> <Link>LiveTv\RecordingGroupDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupQuery.cs"> + <Link>LiveTv\RecordingGroupQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\RecordingInfoDto.cs"> <Link>LiveTv\RecordingInfoDto.cs</Link> </Compile> @@ -338,9 +521,15 @@ <Compile Include="..\MediaBrowser.Model\LiveTv\SeriesTimerInfoDto.cs"> <Link>LiveTv\SeriesTimerInfoDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\SeriesTimerQuery.cs"> + <Link>LiveTv\SeriesTimerQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\TimerInfoDto.cs"> <Link>LiveTv\TimerInfoDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\TimerQuery.cs"> + <Link>LiveTv\TimerQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Logging\ILogger.cs"> <Link>Logging\ILogger.cs</Link> </Compile> @@ -353,15 +542,27 @@ <Compile Include="..\MediaBrowser.Model\Logging\NullLogger.cs"> <Link>Logging\NullLogger.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\AudioCodec.cs"> + <Link>MediaInfo\AudioCodec.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\MediaInfo\BlurayDiscInfo.cs"> <Link>MediaInfo\BlurayDiscInfo.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\MediaInfo\Constants.cs"> - <Link>MediaInfo\Constants.cs</Link> + <Compile Include="..\MediaBrowser.Model\MediaInfo\Container.cs"> + <Link>MediaInfo\Container.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\MediaInfo\IBlurayExaminer.cs"> <Link>MediaInfo\IBlurayExaminer.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleFormat.cs"> + <Link>MediaInfo\SubtitleFormat.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\TransportStreamTimestamp.cs"> + <Link>MediaInfo\TransportStreamTimestamp.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\VideoCodec.cs"> + <Link>MediaInfo\VideoCodec.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Net\HttpException.cs"> <Link>Net\HttpException.cs</Link> </Compile> @@ -380,9 +581,15 @@ <Compile Include="..\MediaBrowser.Model\Net\WebSocketState.cs"> <Link>Net\WebSocketState.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\News\NewsChannel.cs"> + <Link>News\NewsChannel.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\News\NewsItem.cs"> <Link>News\NewsItem.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\News\NewsQuery.cs"> + <Link>News\NewsQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Notifications\Notification.cs"> <Link>Notifications\Notification.cs</Link> </Compile> @@ -392,12 +599,21 @@ <Compile Include="..\MediaBrowser.Model\Notifications\NotificationQuery.cs"> <Link>Notifications\NotificationQuery.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Notifications\NotificationRequest.cs"> + <Link>Notifications\NotificationRequest.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Notifications\NotificationResult.cs"> <Link>Notifications\NotificationResult.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Notifications\NotificationServiceInfo.cs"> + <Link>Notifications\NotificationServiceInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Notifications\NotificationsSummary.cs"> <Link>Notifications\NotificationsSummary.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Notifications\NotificationTypeInfo.cs"> + <Link>Notifications\NotificationTypeInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Plugins\BasePluginConfiguration.cs"> <Link>Plugins\BasePluginConfiguration.cs</Link> </Compile> @@ -407,12 +623,18 @@ <Compile Include="..\MediaBrowser.Model\Providers\ExternalIdInfo.cs"> <Link>Providers\ExternalIdInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Providers\ExternalUrl.cs"> + <Link>Providers\ExternalUrl.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Providers\ImageProviderInfo.cs"> <Link>Providers\ImageProviderInfo.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Providers\RemoteImageInfo.cs"> <Link>Providers\RemoteImageInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Providers\RemoteImageQuery.cs"> + <Link>Providers\RemoteImageQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Providers\RemoteImageResult.cs"> <Link>Providers\RemoteImageResult.cs</Link> </Compile> @@ -422,6 +644,9 @@ <Compile Include="..\MediaBrowser.Model\Providers\RemoteSubtitleInfo.cs"> <Link>Providers\RemoteSubtitleInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\AllThemeMediaResult.cs"> + <Link>Querying\AllThemeMediaResult.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Querying\ArtistsQuery.cs"> <Link>Querying\ArtistsQuery.cs</Link> </Compile> @@ -458,14 +683,23 @@ <Compile Include="..\MediaBrowser.Model\Querying\QueryResult.cs"> <Link>Querying\QueryResult.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\SeasonQuery.cs"> + <Link>Querying\SeasonQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Querying\SessionQuery.cs"> <Link>Querying\SessionQuery.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\SimilarItemsByNameQuery.cs"> + <Link>Querying\SimilarItemsByNameQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Querying\SimilarItemsQuery.cs"> <Link>Querying\SimilarItemsQuery.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Querying\ThemeSongsResult.cs"> - <Link>Querying\ThemeSongsResult.cs</Link> + <Compile Include="..\MediaBrowser.Model\Querying\ThemeMediaResult.cs"> + <Link>Querying\ThemeMediaResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\UpcomingEpisodesQuery.cs"> + <Link>Querying\UpcomingEpisodesQuery.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Querying\UserQuery.cs"> <Link>Querying\UserQuery.cs</Link> @@ -488,14 +722,35 @@ <Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs"> <Link>Session\BrowseRequest.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\ClientCapabilities.cs"> + <Link>Session\ClientCapabilities.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\GeneralCommand.cs"> <Link>Session\GeneralCommand.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\GeneralCommandType.cs"> + <Link>Session\GeneralCommandType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs"> <Link>Session\MessageCommand.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Session\PlaybackReports.cs"> - <Link>Session\PlaybackReports.cs</Link> + <Compile Include="..\MediaBrowser.Model\Session\PlaybackProgressInfo.cs"> + <Link>Session\PlaybackProgressInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlaybackStartInfo.cs"> + <Link>Session\PlaybackStartInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlaybackStopInfo.cs"> + <Link>Session\PlaybackStopInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlayCommand.cs"> + <Link>Session\PlayCommand.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlayerStateInfo.cs"> + <Link>Session\PlayerStateInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlayMethod.cs"> + <Link>Session\PlayMethod.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Session\PlayRequest.cs"> <Link>Session\PlayRequest.cs</Link> @@ -503,12 +758,18 @@ <Compile Include="..\MediaBrowser.Model\Session\PlaystateCommand.cs"> <Link>Session\PlaystateCommand.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlaystateRequest.cs"> + <Link>Session\PlaystateRequest.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\SessionCapabilities.cs"> <Link>Session\SessionCapabilities.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Session\SessionInfoDto.cs"> <Link>Session\SessionInfoDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\SessionUserInfo.cs"> + <Link>Session\SessionUserInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs"> <Link>Session\UserDataChangeInfo.cs</Link> </Compile> @@ -536,6 +797,9 @@ <Compile Include="..\MediaBrowser.Model\Themes\AppTheme.cs"> <Link>Themes\AppTheme.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Themes\AppThemeInfo.cs"> + <Link>Themes\AppThemeInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Themes\ThemeImage.cs"> <Link>Themes\ThemeImage.cs</Link> </Compile> @@ -577,6 +841,7 @@ <ItemGroup> <Content Include="FodyWeavers.xml" /> </ItemGroup> + <ItemGroup /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <PropertyGroup> <PostBuildEvent>if $(ConfigurationName) == Release ( diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index d65aef7f0..318a26b7c 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -52,51 +52,102 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="..\MediaBrowser.Model\ApiClient\GeneralCommandEventArgs.cs"> + <Link>ApiClient\GeneralCommandEventArgs.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\ApiClient\HttpResponseEventArgs.cs"> <Link>ApiClient\HttpResponseEventArgs.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\ApiClient\IServerEvents.cs"> <Link>ApiClient\IServerEvents.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\ApiClient\ServerEventArgs.cs"> - <Link>ApiClient\ServerEventArgs.cs</Link> + <Compile Include="..\MediaBrowser.Model\ApiClient\SessionUpdatesEventArgs.cs"> + <Link>ApiClient\SessionUpdatesEventArgs.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Channels\ChannelItemQuery.cs"> + <Link>Channels\ChannelItemQuery.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Channels\ChannelQuery.cs"> <Link>Channels\ChannelQuery.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Configuration\AutoOrganize.cs"> - <Link>Configuration\AutoOrganize.cs</Link> - </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\BaseApplicationConfiguration.cs"> <Link>Configuration\BaseApplicationConfiguration.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\DlnaOptions.cs"> <Link>Configuration\DlnaOptions.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\EncodingQuality.cs"> + <Link>Configuration\EncodingQuality.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\ImageOption.cs"> + <Link>Configuration\ImageOption.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\ImageSavingConvention.cs"> + <Link>Configuration\ImageSavingConvention.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\LiveTvOptions.cs"> + <Link>Configuration\LiveTvOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\MetadataOptions.cs"> <Link>Configuration\MetadataOptions.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPlugin.cs"> <Link>Configuration\MetadataPlugin.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPluginSummary.cs"> + <Link>Configuration\MetadataPluginSummary.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\MetadataPluginType.cs"> + <Link>Configuration\MetadataPluginType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOption.cs"> + <Link>Configuration\NotificationOption.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\NotificationOptions.cs"> <Link>Configuration\NotificationOptions.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\NotificationType.cs"> + <Link>Configuration\NotificationType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\PathSubstitution.cs"> + <Link>Configuration\PathSubstitution.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\SendToUserType.cs"> + <Link>Configuration\SendToUserType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs"> <Link>Configuration\ServerConfiguration.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\SubtitleOptions.cs"> + <Link>Configuration\SubtitleOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\TvFileOrganizationOptions.cs"> + <Link>Configuration\TvFileOrganizationOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\UnratedItem.cs"> + <Link>Configuration\UnratedItem.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Configuration\UserConfiguration.cs"> <Link>Configuration\UserConfiguration.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\AudioOptions.cs"> + <Link>Dlna\AudioOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\CodecProfile.cs"> <Link>Dlna\CodecProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\CodecType.cs"> + <Link>Dlna\CodecType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\ConditionProcessor.cs"> <Link>Dlna\ConditionProcessor.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\ContainerProfile.cs"> <Link>Dlna\ContainerProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ContentFeatureBuilder.cs"> + <Link>Dlna\ContentFeatureBuilder.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\DeviceIdentification.cs"> <Link>Dlna\DeviceIdentification.cs</Link> </Compile> @@ -106,30 +157,57 @@ <Compile Include="..\MediaBrowser.Model\Dlna\DeviceProfileInfo.cs"> <Link>Dlna\DeviceProfileInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\DeviceProfileType.cs"> + <Link>Dlna\DeviceProfileType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\DirectPlayProfile.cs"> <Link>Dlna\DirectPlayProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\DlnaFlags.cs"> + <Link>Dlna\DlnaFlags.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\DlnaMaps.cs"> <Link>Dlna\DlnaMaps.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\DlnaProfileType.cs"> + <Link>Dlna\DlnaProfileType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\EventSubscription.cs"> <Link>Dlna\EventSubscription.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\Filter.cs"> <Link>Dlna\Filter.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\HeaderMatchType.cs"> + <Link>Dlna\HeaderMatchType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\HttpHeaderInfo.cs"> + <Link>Dlna\HttpHeaderInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\MediaFormatProfile.cs"> <Link>Dlna\MediaFormatProfile.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\MediaFormatProfileResolver.cs"> <Link>Dlna\MediaFormatProfileResolver.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ProfileCondition.cs"> + <Link>Dlna\ProfileCondition.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ProfileConditionType.cs"> + <Link>Dlna\ProfileConditionType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\ProfileConditionValue.cs"> + <Link>Dlna\ProfileConditionValue.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\ResponseProfile.cs"> <Link>Dlna\ResponseProfile.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\SearchCriteria.cs"> <Link>Dlna\SearchCriteria.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\SearchType.cs"> + <Link>Dlna\SearchType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\SortCriteria.cs"> <Link>Dlna\SortCriteria.cs</Link> </Compile> @@ -139,15 +217,27 @@ <Compile Include="..\MediaBrowser.Model\Dlna\StreamInfo.cs"> <Link>Dlna\StreamInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\TranscodeSeekInfo.cs"> + <Link>Dlna\TranscodeSeekInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dlna\TranscodingProfile.cs"> <Link>Dlna\TranscodingProfile.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\VideoOptions.cs"> + <Link>Dlna\VideoOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dlna\XmlAttribute.cs"> + <Link>Dlna\XmlAttribute.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs"> <Link>Drawing\DrawingUtils.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Drawing\ImageOutputFormat.cs"> <Link>Drawing\ImageOutputFormat.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Drawing\ImageSize.cs"> + <Link>Drawing\ImageSize.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dto\BaseItemDto.cs"> <Link>Dto\BaseItemDto.cs</Link> </Compile> @@ -178,24 +268,36 @@ <Compile Include="..\MediaBrowser.Model\Dto\ItemIndex.cs"> <Link>Dto\ItemIndex.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Dto\MediaVersionInfo.cs"> - <Link>Dto\MediaVersionInfo.cs</Link> + <Compile Include="..\MediaBrowser.Model\Dto\MediaSourceInfo.cs"> + <Link>Dto\MediaSourceInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\RatingType.cs"> + <Link>Dto\RatingType.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dto\RecommendationDto.cs"> <Link>Dto\RecommendationDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\RecommendationType.cs"> + <Link>Dto\RecommendationType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dto\StreamOptions.cs"> <Link>Dto\StreamOptions.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dto\StudioDto.cs"> <Link>Dto\StudioDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\SubtitleDownloadOptions.cs"> + <Link>Dto\SubtitleDownloadOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Dto\UserDto.cs"> <Link>Dto\UserDto.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Dto\UserItemDataDto.cs"> <Link>Dto\UserItemDataDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\VideoStreamOptions.cs"> + <Link>Dto\VideoStreamOptions.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\BaseItemInfo.cs"> <Link>Entities\BaseItemInfo.cs</Link> </Compile> @@ -208,12 +310,18 @@ <Compile Include="..\MediaBrowser.Model\Entities\DisplayPreferences.cs"> <Link>Entities\DisplayPreferences.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\EmptyRequestResult.cs"> + <Link>Entities\EmptyRequestResult.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\IHasProviderIds.cs"> <Link>Entities\IHasProviderIds.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Entities\ImageType.cs"> <Link>Entities\ImageType.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\IsoType.cs"> + <Link>Entities\IsoType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\ItemReview.cs"> <Link>Entities\ItemReview.cs</Link> </Compile> @@ -226,9 +334,15 @@ <Compile Include="..\MediaBrowser.Model\Entities\MBRegistrationRecord.cs"> <Link>Entities\MBRegistrationRecord.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MediaInfo.cs"> + <Link>Entities\MediaInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\MediaStream.cs"> <Link>Entities\MediaStream.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MediaStreamType.cs"> + <Link>Entities\MediaStreamType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\MediaType.cs"> <Link>Entities\MediaType.cs</Link> </Compile> @@ -241,6 +355,9 @@ <Compile Include="..\MediaBrowser.Model\Entities\MetadataProviders.cs"> <Link>Entities\MetadataProviders.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\PackageReviewInfo.cs"> + <Link>Entities\PackageReviewInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\ParentalRating.cs"> <Link>Entities\ParentalRating.cs</Link> </Compile> @@ -250,15 +367,27 @@ <Compile Include="..\MediaBrowser.Model\Entities\PluginSecurityInfo.cs"> <Link>Entities\PluginSecurityInfo.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Entities\RequestResult.cs"> - <Link>Entities\RequestResult.cs</Link> + <Compile Include="..\MediaBrowser.Model\Entities\ProviderIdsExtensions.cs"> + <Link>Entities\ProviderIdsExtensions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\ScrollDirection.cs"> + <Link>Entities\ScrollDirection.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Entities\SeriesStatus.cs"> <Link>Entities\SeriesStatus.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\SortOrder.cs"> + <Link>Entities\SortOrder.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\UserDataSaveReason.cs"> + <Link>Entities\UserDataSaveReason.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\Video3DFormat.cs"> <Link>Entities\Video3DFormat.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\VideoSize.cs"> + <Link>Entities\VideoSize.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Entities\VideoType.cs"> <Link>Entities\VideoType.cs</Link> </Compile> @@ -268,12 +397,21 @@ <Compile Include="..\MediaBrowser.Model\Events\GenericEventArgs.cs"> <Link>Events\GenericEventArgs.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizationQuery.cs"> - <Link>FileOrganization\FileOrganizationQuery.cs</Link> + <Compile Include="..\MediaBrowser.Model\FileOrganization\EpisodeFileOrganizationRequest.cs"> + <Link>FileOrganization\EpisodeFileOrganizationRequest.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizationResult.cs"> <Link>FileOrganization\FileOrganizationResult.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizationResultQuery.cs"> + <Link>FileOrganization\FileOrganizationResultQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\FileOrganization\FileOrganizerType.cs"> + <Link>FileOrganization\FileOrganizerType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\FileOrganization\FileSortingStatus.cs"> + <Link>FileOrganization\FileSortingStatus.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Games\GameSystem.cs"> <Link>Games\GameSystem.cs</Link> </Compile> @@ -283,15 +421,27 @@ <Compile Include="..\MediaBrowser.Model\Globalization\CultureDto.cs"> <Link>Globalization\CultureDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Globalization\LocalizatonOption.cs"> + <Link>Globalization\LocalizatonOption.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\IO\FileSystemEntryInfo.cs"> <Link>IO\FileSystemEntryInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\IO\FileSystemEntryType.cs"> + <Link>IO\FileSystemEntryType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\IO\IIsoMount.cs"> + <Link>IO\IIsoMount.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\IO\IZipClient.cs"> <Link>IO\IZipClient.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Library\PlayAccess.cs"> <Link>Library\PlayAccess.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\BaseTimerInfoDto.cs"> + <Link>LiveTv\BaseTimerInfoDto.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelInfoDto.cs"> <Link>LiveTv\ChannelInfoDto.cs</Link> </Compile> @@ -301,18 +451,45 @@ <Compile Include="..\MediaBrowser.Model\LiveTv\ChannelType.cs"> <Link>LiveTv\ChannelType.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\DayPattern.cs"> + <Link>LiveTv\DayPattern.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\GuideInfo.cs"> + <Link>LiveTv\GuideInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvInfo.cs"> + <Link>LiveTv\LiveTvInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvServiceInfo.cs"> <Link>LiveTv\LiveTvServiceInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvServiceStatus.cs"> + <Link>LiveTv\LiveTvServiceStatus.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvTunerInfoDto.cs"> + <Link>LiveTv\LiveTvTunerInfoDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\LiveTvTunerStatus.cs"> + <Link>LiveTv\LiveTvTunerStatus.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\ProgramAudio.cs"> + <Link>LiveTv\ProgramAudio.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\ProgramInfoDto.cs"> <Link>LiveTv\ProgramInfoDto.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\ProgramQuery.cs"> <Link>LiveTv\ProgramQuery.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\RecommendedProgramQuery.cs"> + <Link>LiveTv\RecommendedProgramQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupDto.cs"> <Link>LiveTv\RecordingGroupDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\RecordingGroupQuery.cs"> + <Link>LiveTv\RecordingGroupQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\RecordingInfoDto.cs"> <Link>LiveTv\RecordingInfoDto.cs</Link> </Compile> @@ -325,9 +502,15 @@ <Compile Include="..\MediaBrowser.Model\LiveTv\SeriesTimerInfoDto.cs"> <Link>LiveTv\SeriesTimerInfoDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\SeriesTimerQuery.cs"> + <Link>LiveTv\SeriesTimerQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\LiveTv\TimerInfoDto.cs"> <Link>LiveTv\TimerInfoDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\LiveTv\TimerQuery.cs"> + <Link>LiveTv\TimerQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Logging\ILogger.cs"> <Link>Logging\ILogger.cs</Link> </Compile> @@ -340,15 +523,27 @@ <Compile Include="..\MediaBrowser.Model\Logging\NullLogger.cs"> <Link>Logging\NullLogger.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\AudioCodec.cs"> + <Link>MediaInfo\AudioCodec.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\MediaInfo\BlurayDiscInfo.cs"> <Link>MediaInfo\BlurayDiscInfo.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\MediaInfo\Constants.cs"> - <Link>MediaInfo\Constants.cs</Link> + <Compile Include="..\MediaBrowser.Model\MediaInfo\Container.cs"> + <Link>MediaInfo\Container.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\MediaInfo\IBlurayExaminer.cs"> <Link>MediaInfo\IBlurayExaminer.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleFormat.cs"> + <Link>MediaInfo\SubtitleFormat.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\TransportStreamTimestamp.cs"> + <Link>MediaInfo\TransportStreamTimestamp.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\VideoCodec.cs"> + <Link>MediaInfo\VideoCodec.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Net\HttpException.cs"> <Link>Net\HttpException.cs</Link> </Compile> @@ -367,9 +562,15 @@ <Compile Include="..\MediaBrowser.Model\Net\WebSocketState.cs"> <Link>Net\WebSocketState.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\News\NewsChannel.cs"> + <Link>News\NewsChannel.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\News\NewsItem.cs"> <Link>News\NewsItem.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\News\NewsQuery.cs"> + <Link>News\NewsQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Notifications\Notification.cs"> <Link>Notifications\Notification.cs</Link> </Compile> @@ -379,12 +580,21 @@ <Compile Include="..\MediaBrowser.Model\Notifications\NotificationQuery.cs"> <Link>Notifications\NotificationQuery.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Notifications\NotificationRequest.cs"> + <Link>Notifications\NotificationRequest.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Notifications\NotificationResult.cs"> <Link>Notifications\NotificationResult.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Notifications\NotificationServiceInfo.cs"> + <Link>Notifications\NotificationServiceInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Notifications\NotificationsSummary.cs"> <Link>Notifications\NotificationsSummary.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Notifications\NotificationTypeInfo.cs"> + <Link>Notifications\NotificationTypeInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Plugins\BasePluginConfiguration.cs"> <Link>Plugins\BasePluginConfiguration.cs</Link> </Compile> @@ -394,12 +604,18 @@ <Compile Include="..\MediaBrowser.Model\Providers\ExternalIdInfo.cs"> <Link>Providers\ExternalIdInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Providers\ExternalUrl.cs"> + <Link>Providers\ExternalUrl.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Providers\ImageProviderInfo.cs"> <Link>Providers\ImageProviderInfo.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Providers\RemoteImageInfo.cs"> <Link>Providers\RemoteImageInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Providers\RemoteImageQuery.cs"> + <Link>Providers\RemoteImageQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Providers\RemoteImageResult.cs"> <Link>Providers\RemoteImageResult.cs</Link> </Compile> @@ -409,6 +625,9 @@ <Compile Include="..\MediaBrowser.Model\Providers\RemoteSubtitleInfo.cs"> <Link>Providers\RemoteSubtitleInfo.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\AllThemeMediaResult.cs"> + <Link>Querying\AllThemeMediaResult.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Querying\ArtistsQuery.cs"> <Link>Querying\ArtistsQuery.cs</Link> </Compile> @@ -445,14 +664,23 @@ <Compile Include="..\MediaBrowser.Model\Querying\QueryResult.cs"> <Link>Querying\QueryResult.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\SeasonQuery.cs"> + <Link>Querying\SeasonQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Querying\SessionQuery.cs"> <Link>Querying\SessionQuery.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\SimilarItemsByNameQuery.cs"> + <Link>Querying\SimilarItemsByNameQuery.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Querying\SimilarItemsQuery.cs"> <Link>Querying\SimilarItemsQuery.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Querying\ThemeSongsResult.cs"> - <Link>Querying\ThemeSongsResult.cs</Link> + <Compile Include="..\MediaBrowser.Model\Querying\ThemeMediaResult.cs"> + <Link>Querying\ThemeMediaResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\UpcomingEpisodesQuery.cs"> + <Link>Querying\UpcomingEpisodesQuery.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Querying\UserQuery.cs"> <Link>Querying\UserQuery.cs</Link> @@ -475,14 +703,35 @@ <Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs"> <Link>Session\BrowseRequest.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\ClientCapabilities.cs"> + <Link>Session\ClientCapabilities.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\GeneralCommand.cs"> <Link>Session\GeneralCommand.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\GeneralCommandType.cs"> + <Link>Session\GeneralCommandType.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\MessageCommand.cs"> <Link>Session\MessageCommand.cs</Link> </Compile> - <Compile Include="..\MediaBrowser.Model\Session\PlaybackReports.cs"> - <Link>Session\PlaybackReports.cs</Link> + <Compile Include="..\MediaBrowser.Model\Session\PlaybackProgressInfo.cs"> + <Link>Session\PlaybackProgressInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlaybackStartInfo.cs"> + <Link>Session\PlaybackStartInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlaybackStopInfo.cs"> + <Link>Session\PlaybackStopInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlayCommand.cs"> + <Link>Session\PlayCommand.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlayerStateInfo.cs"> + <Link>Session\PlayerStateInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlayMethod.cs"> + <Link>Session\PlayMethod.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Session\PlayRequest.cs"> <Link>Session\PlayRequest.cs</Link> @@ -490,12 +739,18 @@ <Compile Include="..\MediaBrowser.Model\Session\PlaystateCommand.cs"> <Link>Session\PlaystateCommand.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlaystateRequest.cs"> + <Link>Session\PlaystateRequest.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\SessionCapabilities.cs"> <Link>Session\SessionCapabilities.cs</Link> </Compile> <Compile Include="..\MediaBrowser.Model\Session\SessionInfoDto.cs"> <Link>Session\SessionInfoDto.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Session\SessionUserInfo.cs"> + <Link>Session\SessionUserInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Session\UserDataChangeInfo.cs"> <Link>Session\UserDataChangeInfo.cs</Link> </Compile> @@ -523,6 +778,9 @@ <Compile Include="..\MediaBrowser.Model\Themes\AppTheme.cs"> <Link>Themes\AppTheme.cs</Link> </Compile> + <Compile Include="..\MediaBrowser.Model\Themes\AppThemeInfo.cs"> + <Link>Themes\AppThemeInfo.cs</Link> + </Compile> <Compile Include="..\MediaBrowser.Model\Themes\ThemeImage.cs"> <Link>Themes\ThemeImage.cs</Link> </Compile> diff --git a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs index ad0defe68..ce518a7cc 100644 --- a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs +++ b/MediaBrowser.Model/ApiClient/GeneralCommandEventArgs.cs @@ -20,12 +20,4 @@ namespace MediaBrowser.Model.ApiClient /// <value>The type of the known command.</value> public GeneralCommandType? KnownCommandType { get; set; } } - - /// <summary> - /// Class SessionUpdatesEventArgs - /// </summary> - public class SessionUpdatesEventArgs : EventArgs - { - public SessionInfoDto[] Sessions { get; set; } - } } diff --git a/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs new file mode 100644 index 000000000..483ee45d0 --- /dev/null +++ b/MediaBrowser.Model/ApiClient/SessionUpdatesEventArgs.cs @@ -0,0 +1,13 @@ +using System; +using MediaBrowser.Model.Session; + +namespace MediaBrowser.Model.ApiClient +{ + /// <summary> + /// Class SessionUpdatesEventArgs + /// </summary> + public class SessionUpdatesEventArgs : EventArgs + { + public SessionInfoDto[] Sessions { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Channels/ChannelItemQuery.cs b/MediaBrowser.Model/Channels/ChannelItemQuery.cs new file mode 100644 index 000000000..2da955e88 --- /dev/null +++ b/MediaBrowser.Model/Channels/ChannelItemQuery.cs @@ -0,0 +1,48 @@ +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Querying; + +namespace MediaBrowser.Model.Channels +{ + public class ChannelItemQuery + { + /// <summary> + /// Gets or sets the channel identifier. + /// </summary> + /// <value>The channel identifier.</value> + public string ChannelId { get; set; } + + /// <summary> + /// Gets or sets the category identifier. + /// </summary> + /// <value>The category identifier.</value> + public string CategoryId { get; set; } + + /// <summary> + /// Gets or sets the user identifier. + /// </summary> + /// <value>The user identifier.</value> + public string UserId { get; set; } + + /// <summary> + /// Skips over a given number of items within the results. Use for paging. + /// </summary> + /// <value>The start index.</value> + public int? StartIndex { get; set; } + + /// <summary> + /// The maximum number of items to return + /// </summary> + /// <value>The limit.</value> + public int? Limit { get; set; } + + public SortOrder? SortOrder { get; set; } + public string[] SortBy { get; set; } + public ItemFilter[] Filters { get; set; } + + public ChannelItemQuery() + { + Filters = new ItemFilter[] { }; + SortBy = new string[] { }; + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs index e09769b00..7c3f76fda 100644 --- a/MediaBrowser.Model/Channels/ChannelQuery.cs +++ b/MediaBrowser.Model/Channels/ChannelQuery.cs @@ -1,7 +1,4 @@ -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Querying; - -namespace MediaBrowser.Model.Channels +namespace MediaBrowser.Model.Channels { public class ChannelQuery { @@ -23,47 +20,4 @@ namespace MediaBrowser.Model.Channels /// <value>The limit.</value> public int? Limit { get; set; } } - - public class ChannelItemQuery - { - /// <summary> - /// Gets or sets the channel identifier. - /// </summary> - /// <value>The channel identifier.</value> - public string ChannelId { get; set; } - - /// <summary> - /// Gets or sets the category identifier. - /// </summary> - /// <value>The category identifier.</value> - public string CategoryId { get; set; } - - /// <summary> - /// Gets or sets the user identifier. - /// </summary> - /// <value>The user identifier.</value> - public string UserId { get; set; } - - /// <summary> - /// Skips over a given number of items within the results. Use for paging. - /// </summary> - /// <value>The start index.</value> - public int? StartIndex { get; set; } - - /// <summary> - /// The maximum number of items to return - /// </summary> - /// <value>The limit.</value> - public int? Limit { get; set; } - - public SortOrder? SortOrder { get; set; } - public string[] SortBy { get; set; } - public ItemFilter[] Filters { get; set; } - - public ChannelItemQuery() - { - Filters = new ItemFilter[] { }; - SortBy = new string[] { }; - } - } } diff --git a/MediaBrowser.Model/Configuration/EncodingQuality.cs b/MediaBrowser.Model/Configuration/EncodingQuality.cs new file mode 100644 index 000000000..ba5a1f279 --- /dev/null +++ b/MediaBrowser.Model/Configuration/EncodingQuality.cs @@ -0,0 +1,10 @@ +namespace MediaBrowser.Model.Configuration +{ + public enum EncodingQuality + { + Auto, + HighSpeed, + HighQuality, + MaxQuality + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/ImageOption.cs b/MediaBrowser.Model/Configuration/ImageOption.cs new file mode 100644 index 000000000..ade0af83e --- /dev/null +++ b/MediaBrowser.Model/Configuration/ImageOption.cs @@ -0,0 +1,29 @@ +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Model.Configuration +{ + public class ImageOption + { + /// <summary> + /// Gets or sets the type. + /// </summary> + /// <value>The type.</value> + public ImageType Type { get; set; } + /// <summary> + /// Gets or sets the limit. + /// </summary> + /// <value>The limit.</value> + public int Limit { get; set; } + + /// <summary> + /// Gets or sets the minimum width. + /// </summary> + /// <value>The minimum width.</value> + public int MinWidth { get; set; } + + public ImageOption() + { + Limit = 1; + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/ImageSavingConvention.cs b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs new file mode 100644 index 000000000..611678e67 --- /dev/null +++ b/MediaBrowser.Model/Configuration/ImageSavingConvention.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Configuration +{ + public enum ImageSavingConvention + { + Legacy, + Compatible + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/LiveTvOptions.cs b/MediaBrowser.Model/Configuration/LiveTvOptions.cs new file mode 100644 index 000000000..ae8aeb200 --- /dev/null +++ b/MediaBrowser.Model/Configuration/LiveTvOptions.cs @@ -0,0 +1,7 @@ +namespace MediaBrowser.Model.Configuration +{ + public class LiveTvOptions + { + public int? GuideDays { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs index 7b2bcc178..88fa486f9 100644 --- a/MediaBrowser.Model/Configuration/MetadataOptions.cs +++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs @@ -74,29 +74,4 @@ namespace MediaBrowser.Model.Configuration return !DisabledMetadataSavers.Contains(name, StringComparer.OrdinalIgnoreCase); } } - - public class ImageOption - { - /// <summary> - /// Gets or sets the type. - /// </summary> - /// <value>The type.</value> - public ImageType Type { get; set; } - /// <summary> - /// Gets or sets the limit. - /// </summary> - /// <value>The limit.</value> - public int Limit { get; set; } - - /// <summary> - /// Gets or sets the minimum width. - /// </summary> - /// <value>The minimum width.</value> - public int MinWidth { get; set; } - - public ImageOption() - { - Limit = 1; - } - } } diff --git a/MediaBrowser.Model/Configuration/MetadataPlugin.cs b/MediaBrowser.Model/Configuration/MetadataPlugin.cs index b019cf71a..f3e0ce106 100644 --- a/MediaBrowser.Model/Configuration/MetadataPlugin.cs +++ b/MediaBrowser.Model/Configuration/MetadataPlugin.cs @@ -1,7 +1,4 @@ -using MediaBrowser.Model.Entities; -using System.Collections.Generic; - -namespace MediaBrowser.Model.Configuration +namespace MediaBrowser.Model.Configuration { public class MetadataPlugin { @@ -17,44 +14,4 @@ namespace MediaBrowser.Model.Configuration /// <value>The type.</value> public MetadataPluginType Type { get; set; } } - - public class MetadataPluginSummary - { - /// <summary> - /// Gets or sets the type of the item. - /// </summary> - /// <value>The type of the item.</value> - public string ItemType { get; set; } - - /// <summary> - /// Gets or sets the plugins. - /// </summary> - /// <value>The plugins.</value> - public List<MetadataPlugin> Plugins { get; set; } - - /// <summary> - /// Gets or sets the supported image types. - /// </summary> - /// <value>The supported image types.</value> - public List<ImageType> SupportedImageTypes { get; set; } - - public MetadataPluginSummary() - { - SupportedImageTypes = new List<ImageType>(); - Plugins = new List<MetadataPlugin>(); - } - } - - /// <summary> - /// Enum MetadataPluginType - /// </summary> - public enum MetadataPluginType - { - LocalImageProvider, - ImageFetcher, - ImageSaver, - LocalMetadataProvider, - MetadataFetcher, - MetadataSaver - } } diff --git a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs new file mode 100644 index 000000000..90b3933eb --- /dev/null +++ b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs @@ -0,0 +1,32 @@ +using System.Collections.Generic; +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Model.Configuration +{ + public class MetadataPluginSummary + { + /// <summary> + /// Gets or sets the type of the item. + /// </summary> + /// <value>The type of the item.</value> + public string ItemType { get; set; } + + /// <summary> + /// Gets or sets the plugins. + /// </summary> + /// <value>The plugins.</value> + public List<MetadataPlugin> Plugins { get; set; } + + /// <summary> + /// Gets or sets the supported image types. + /// </summary> + /// <value>The supported image types.</value> + public List<ImageType> SupportedImageTypes { get; set; } + + public MetadataPluginSummary() + { + SupportedImageTypes = new List<ImageType>(); + Plugins = new List<MetadataPlugin>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/MetadataPluginType.cs b/MediaBrowser.Model/Configuration/MetadataPluginType.cs new file mode 100644 index 000000000..95ca3b2e6 --- /dev/null +++ b/MediaBrowser.Model/Configuration/MetadataPluginType.cs @@ -0,0 +1,15 @@ +namespace MediaBrowser.Model.Configuration +{ + /// <summary> + /// Enum MetadataPluginType + /// </summary> + public enum MetadataPluginType + { + LocalImageProvider, + ImageFetcher, + ImageSaver, + LocalMetadataProvider, + MetadataFetcher, + MetadataSaver + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/NotificationOption.cs b/MediaBrowser.Model/Configuration/NotificationOption.cs new file mode 100644 index 000000000..5fcf3550c --- /dev/null +++ b/MediaBrowser.Model/Configuration/NotificationOption.cs @@ -0,0 +1,54 @@ +namespace MediaBrowser.Model.Configuration +{ + public class NotificationOption + { + public string Type { get; set; } + + /// <summary> + /// User Ids to not monitor (it's opt out) + /// </summary> + public string[] DisabledMonitorUsers { get; set; } + + /// <summary> + /// User Ids to send to (if SendToUserMode == Custom) + /// </summary> + public string[] SendToUsers { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this <see cref="NotificationOption"/> is enabled. + /// </summary> + /// <value><c>true</c> if enabled; otherwise, <c>false</c>.</value> + public bool Enabled { get; set; } + + /// <summary> + /// Gets or sets the title format string. + /// </summary> + /// <value>The title format string.</value> + public string Title { get; set; } + + /// <summary> + /// Gets or sets the description. + /// </summary> + /// <value>The description.</value> + public string Description { get; set; } + + /// <summary> + /// Gets or sets the disabled services. + /// </summary> + /// <value>The disabled services.</value> + public string[] DisabledServices { get; set; } + + /// <summary> + /// Gets or sets the send to user mode. + /// </summary> + /// <value>The send to user mode.</value> + public SendToUserType SendToUserMode { get; set; } + + public NotificationOption() + { + DisabledServices = new string[] { }; + DisabledMonitorUsers = new string[] { }; + SendToUsers = new string[] { }; + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/NotificationOptions.cs b/MediaBrowser.Model/Configuration/NotificationOptions.cs index fedc1c2f8..7034bd39e 100644 --- a/MediaBrowser.Model/Configuration/NotificationOptions.cs +++ b/MediaBrowser.Model/Configuration/NotificationOptions.cs @@ -118,80 +118,4 @@ namespace MediaBrowser.Model.Configuration return false; } } - - public class NotificationOption - { - public string Type { get; set; } - - /// <summary> - /// User Ids to not monitor (it's opt out) - /// </summary> - public string[] DisabledMonitorUsers { get; set; } - - /// <summary> - /// User Ids to send to (if SendToUserMode == Custom) - /// </summary> - public string[] SendToUsers { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this <see cref="NotificationOption"/> is enabled. - /// </summary> - /// <value><c>true</c> if enabled; otherwise, <c>false</c>.</value> - public bool Enabled { get; set; } - - /// <summary> - /// Gets or sets the title format string. - /// </summary> - /// <value>The title format string.</value> - public string Title { get; set; } - - /// <summary> - /// Gets or sets the description. - /// </summary> - /// <value>The description.</value> - public string Description { get; set; } - - /// <summary> - /// Gets or sets the disabled services. - /// </summary> - /// <value>The disabled services.</value> - public string[] DisabledServices { get; set; } - - /// <summary> - /// Gets or sets the send to user mode. - /// </summary> - /// <value>The send to user mode.</value> - public SendToUserType SendToUserMode { get; set; } - - public NotificationOption() - { - DisabledServices = new string[] { }; - DisabledMonitorUsers = new string[] { }; - SendToUsers = new string[] { }; - } - } - - public enum NotificationType - { - ApplicationUpdateAvailable, - ApplicationUpdateInstalled, - AudioPlayback, - GamePlayback, - InstallationFailed, - PluginError, - PluginInstalled, - PluginUpdateInstalled, - PluginUninstalled, - NewLibraryContent, - ServerRestartRequired, - TaskFailed, - VideoPlayback - } - - public enum SendToUserType - { - All = 0, - Admins = 1, - Custom = 2 - } } diff --git a/MediaBrowser.Model/Configuration/NotificationType.cs b/MediaBrowser.Model/Configuration/NotificationType.cs new file mode 100644 index 000000000..eaafb651c --- /dev/null +++ b/MediaBrowser.Model/Configuration/NotificationType.cs @@ -0,0 +1,19 @@ +namespace MediaBrowser.Model.Configuration +{ + public enum NotificationType + { + ApplicationUpdateAvailable, + ApplicationUpdateInstalled, + AudioPlayback, + GamePlayback, + InstallationFailed, + PluginError, + PluginInstalled, + PluginUpdateInstalled, + PluginUninstalled, + NewLibraryContent, + ServerRestartRequired, + TaskFailed, + VideoPlayback + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/PathSubstitution.cs b/MediaBrowser.Model/Configuration/PathSubstitution.cs new file mode 100644 index 000000000..576dd2d5a --- /dev/null +++ b/MediaBrowser.Model/Configuration/PathSubstitution.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Configuration +{ + public class PathSubstitution + { + public string From { get; set; } + public string To { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/SendToUserType.cs b/MediaBrowser.Model/Configuration/SendToUserType.cs new file mode 100644 index 000000000..a2eac4c2d --- /dev/null +++ b/MediaBrowser.Model/Configuration/SendToUserType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.Configuration +{ + public enum SendToUserType + { + All = 0, + Admins = 1, + Custom = 2 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index b2c499b9a..36598b245 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -290,48 +290,4 @@ namespace MediaBrowser.Model.Configuration SubtitleOptions = new SubtitleOptions(); } } - - public enum ImageSavingConvention - { - Legacy, - Compatible - } - - public enum EncodingQuality - { - Auto, - HighSpeed, - HighQuality, - MaxQuality - } - - public class LiveTvOptions - { - public int? GuideDays { get; set; } - } - - public class PathSubstitution - { - public string From { get; set; } - public string To { get; set; } - } - - public class SubtitleOptions - { - public bool SkipIfGraphicalSubtitlesPresent { get; set; } - public bool SkipIfAudioTrackMatches { get; set; } - public string[] DownloadLanguages { get; set; } - public bool DownloadMovieSubtitles { get; set; } - public bool DownloadEpisodeSubtitles { get; set; } - - public string OpenSubtitlesUsername { get; set; } - public string OpenSubtitlesPasswordHash { get; set; } - - public SubtitleOptions() - { - DownloadLanguages = new string[] { }; - - SkipIfAudioTrackMatches = true; - } - } } diff --git a/MediaBrowser.Model/Configuration/SubtitleOptions.cs b/MediaBrowser.Model/Configuration/SubtitleOptions.cs new file mode 100644 index 000000000..96e04e511 --- /dev/null +++ b/MediaBrowser.Model/Configuration/SubtitleOptions.cs @@ -0,0 +1,21 @@ +namespace MediaBrowser.Model.Configuration +{ + public class SubtitleOptions + { + public bool SkipIfGraphicalSubtitlesPresent { get; set; } + public bool SkipIfAudioTrackMatches { get; set; } + public string[] DownloadLanguages { get; set; } + public bool DownloadMovieSubtitles { get; set; } + public bool DownloadEpisodeSubtitles { get; set; } + + public string OpenSubtitlesUsername { get; set; } + public string OpenSubtitlesPasswordHash { get; set; } + + public SubtitleOptions() + { + DownloadLanguages = new string[] { }; + + SkipIfAudioTrackMatches = true; + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/AutoOrganize.cs b/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs index fe32d4a80..fe32d4a80 100644 --- a/MediaBrowser.Model/Configuration/AutoOrganize.cs +++ b/MediaBrowser.Model/Configuration/TvFileOrganizationOptions.cs diff --git a/MediaBrowser.Model/Configuration/UnratedItem.cs b/MediaBrowser.Model/Configuration/UnratedItem.cs new file mode 100644 index 000000000..1082d684b --- /dev/null +++ b/MediaBrowser.Model/Configuration/UnratedItem.cs @@ -0,0 +1,16 @@ +namespace MediaBrowser.Model.Configuration +{ + public enum UnratedItem + { + Movie, + Trailer, + Series, + Music, + Game, + Book, + LiveTvChannel, + LiveTvProgram, + ChannelContent, + Other + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index f8df19436..2658e8973 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -79,18 +79,4 @@ namespace MediaBrowser.Model.Configuration BlockUnratedItems = new UnratedItem[] { }; } } - - public enum UnratedItem - { - Movie, - Trailer, - Series, - Music, - Game, - Book, - LiveTvChannel, - LiveTvProgram, - ChannelContent, - Other - } } diff --git a/MediaBrowser.Model/Dlna/AudioOptions.cs b/MediaBrowser.Model/Dlna/AudioOptions.cs new file mode 100644 index 000000000..d04133a3d --- /dev/null +++ b/MediaBrowser.Model/Dlna/AudioOptions.cs @@ -0,0 +1,33 @@ +using System.Collections.Generic; +using MediaBrowser.Model.Dto; + +namespace MediaBrowser.Model.Dlna +{ + /// <summary> + /// Class AudioOptions. + /// </summary> + public class AudioOptions + { + public string ItemId { get; set; } + public List<MediaSourceInfo> MediaSources { get; set; } + public DeviceProfile Profile { get; set; } + + /// <summary> + /// Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested. + /// </summary> + public string MediaSourceId { get; set; } + + public string DeviceId { get; set; } + + /// <summary> + /// Allows an override of supported number of audio channels + /// Example: DeviceProfile supports five channel, but user only has stereo speakers + /// </summary> + public int? MaxAudioChannels { get; set; } + + /// <summary> + /// The application's configured quality setting + /// </summary> + public int? MaxBitrate { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs index 2b04b7fdb..7d7e0057e 100644 --- a/MediaBrowser.Model/Dlna/CodecProfile.cs +++ b/MediaBrowser.Model/Dlna/CodecProfile.cs @@ -32,56 +32,4 @@ namespace MediaBrowser.Model.Dlna return codecs.Count == 0 || codecs.Contains(codec, StringComparer.OrdinalIgnoreCase); } } - - public enum CodecType - { - Video = 0, - VideoAudio = 1, - Audio = 2 - } - - public class ProfileCondition - { - [XmlAttribute("condition")] - public ProfileConditionType Condition { get; set; } - - [XmlAttribute("property")] - public ProfileConditionValue Property { get; set; } - - [XmlAttribute("value")] - public string Value { get; set; } - - [XmlAttribute("isRequired")] - public bool IsRequired { get; set; } - - public ProfileCondition() - { - IsRequired = true; - } - } - - public enum ProfileConditionType - { - Equals = 0, - NotEquals = 1, - LessThanEqual = 2, - GreaterThanEqual = 3 - } - - public enum ProfileConditionValue - { - AudioChannels, - AudioBitrate, - AudioProfile, - Width, - Height, - Has64BitOffsets, - PacketLength, - VideoBitDepth, - VideoBitrate, - VideoFramerate, - VideoLevel, - VideoProfile, - VideoTimestamp - } } diff --git a/MediaBrowser.Model/Dlna/CodecType.cs b/MediaBrowser.Model/Dlna/CodecType.cs new file mode 100644 index 000000000..415cae7ac --- /dev/null +++ b/MediaBrowser.Model/Dlna/CodecType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum CodecType + { + Video = 0, + VideoAudio = 1, + Audio = 2 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/DeviceIdentification.cs b/MediaBrowser.Model/Dlna/DeviceIdentification.cs index 87cf000b1..97f4409da 100644 --- a/MediaBrowser.Model/Dlna/DeviceIdentification.cs +++ b/MediaBrowser.Model/Dlna/DeviceIdentification.cs @@ -1,6 +1,4 @@ -using System.Xml.Serialization; - -namespace MediaBrowser.Model.Dlna +namespace MediaBrowser.Model.Dlna { public class DeviceIdentification { @@ -60,23 +58,4 @@ namespace MediaBrowser.Model.Dlna Headers = new HttpHeaderInfo[] {}; } } - - public class HttpHeaderInfo - { - [XmlAttribute("name")] - public string Name { get; set; } - - [XmlAttribute("value")] - public string Value { get; set; } - - [XmlAttribute("match")] - public HeaderMatchType Match { get; set; } - } - - public enum HeaderMatchType - { - Equals = 0, - Regex = 1, - Substring = 2 - } } diff --git a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs index ceb27386c..b2afdf292 100644 --- a/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs +++ b/MediaBrowser.Model/Dlna/DeviceProfileInfo.cs @@ -21,10 +21,4 @@ namespace MediaBrowser.Model.Dlna /// <value>The type.</value> public DeviceProfileType Type { get; set; } } - - public enum DeviceProfileType - { - System = 0, - User = 1 - } } diff --git a/MediaBrowser.Model/Dlna/DeviceProfileType.cs b/MediaBrowser.Model/Dlna/DeviceProfileType.cs new file mode 100644 index 000000000..f881a4539 --- /dev/null +++ b/MediaBrowser.Model/Dlna/DeviceProfileType.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum DeviceProfileType + { + System = 0, + User = 1 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs index e195c9450..5cfcafca4 100644 --- a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs +++ b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs @@ -33,20 +33,4 @@ namespace MediaBrowser.Model.Dlna return (VideoCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrEmpty(i)).ToList(); } } - - public class XmlAttribute - { - [XmlAttribute("name")] - public string Name { get; set; } - - [XmlAttribute("value")] - public string Value { get; set; } - } - - public enum DlnaProfileType - { - Audio = 0, - Video = 1, - Photo = 2 - } } diff --git a/MediaBrowser.Model/Dlna/DlnaFlags.cs b/MediaBrowser.Model/Dlna/DlnaFlags.cs new file mode 100644 index 000000000..23859312d --- /dev/null +++ b/MediaBrowser.Model/Dlna/DlnaFlags.cs @@ -0,0 +1,21 @@ +using System; + +namespace MediaBrowser.Model.Dlna +{ + [Flags] + public enum DlnaFlags : ulong + { + BackgroundTransferMode = (1 << 22), + ByteBasedSeek = (1 << 29), + ConnectionStall = (1 << 21), + DlnaV15 = (1 << 20), + InteractiveTransferMode = (1 << 23), + PlayContainer = (1 << 28), + RtspPause = (1 << 25), + S0Increase = (1 << 27), + SenderPaced = (1L << 31), + SnIncrease = (1 << 26), + StreamingTransferMode = (1 << 24), + TimeBasedSeek = (1 << 30) + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/DlnaMaps.cs b/MediaBrowser.Model/Dlna/DlnaMaps.cs index d2871474a..0a4069d8f 100644 --- a/MediaBrowser.Model/Dlna/DlnaMaps.cs +++ b/MediaBrowser.Model/Dlna/DlnaMaps.cs @@ -1,6 +1,4 @@ -using System; - -namespace MediaBrowser.Model.Dlna +namespace MediaBrowser.Model.Dlna { public class DlnaMaps { @@ -55,21 +53,4 @@ namespace MediaBrowser.Model.Dlna return orgOp; } } - - [Flags] - public enum DlnaFlags : ulong - { - BackgroundTransferMode = (1 << 22), - ByteBasedSeek = (1 << 29), - ConnectionStall = (1 << 21), - DlnaV15 = (1 << 20), - InteractiveTransferMode = (1 << 23), - PlayContainer = (1 << 28), - RtspPause = (1 << 25), - S0Increase = (1 << 27), - SenderPaced = (1L << 31), - SnIncrease = (1 << 26), - StreamingTransferMode = (1 << 24), - TimeBasedSeek = (1 << 30) - } } diff --git a/MediaBrowser.Model/Dlna/DlnaProfileType.cs b/MediaBrowser.Model/Dlna/DlnaProfileType.cs new file mode 100644 index 000000000..1bad14081 --- /dev/null +++ b/MediaBrowser.Model/Dlna/DlnaProfileType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum DlnaProfileType + { + Audio = 0, + Video = 1, + Photo = 2 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/HeaderMatchType.cs b/MediaBrowser.Model/Dlna/HeaderMatchType.cs new file mode 100644 index 000000000..7a0d5c24f --- /dev/null +++ b/MediaBrowser.Model/Dlna/HeaderMatchType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum HeaderMatchType + { + Equals = 0, + Regex = 1, + Substring = 2 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs new file mode 100644 index 000000000..926963ef6 --- /dev/null +++ b/MediaBrowser.Model/Dlna/HttpHeaderInfo.cs @@ -0,0 +1,16 @@ +using System.Xml.Serialization; + +namespace MediaBrowser.Model.Dlna +{ + public class HttpHeaderInfo + { + [XmlAttribute("name")] + public string Name { get; set; } + + [XmlAttribute("value")] + public string Value { get; set; } + + [XmlAttribute("match")] + public HeaderMatchType Match { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/ProfileCondition.cs b/MediaBrowser.Model/Dlna/ProfileCondition.cs new file mode 100644 index 000000000..24733426c --- /dev/null +++ b/MediaBrowser.Model/Dlna/ProfileCondition.cs @@ -0,0 +1,24 @@ +using System.Xml.Serialization; + +namespace MediaBrowser.Model.Dlna +{ + public class ProfileCondition + { + [XmlAttribute("condition")] + public ProfileConditionType Condition { get; set; } + + [XmlAttribute("property")] + public ProfileConditionValue Property { get; set; } + + [XmlAttribute("value")] + public string Value { get; set; } + + [XmlAttribute("isRequired")] + public bool IsRequired { get; set; } + + public ProfileCondition() + { + IsRequired = true; + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/ProfileConditionType.cs b/MediaBrowser.Model/Dlna/ProfileConditionType.cs new file mode 100644 index 000000000..22156c47d --- /dev/null +++ b/MediaBrowser.Model/Dlna/ProfileConditionType.cs @@ -0,0 +1,10 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum ProfileConditionType + { + Equals = 0, + NotEquals = 1, + LessThanEqual = 2, + GreaterThanEqual = 3 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/ProfileConditionValue.cs b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs new file mode 100644 index 000000000..56a322f5a --- /dev/null +++ b/MediaBrowser.Model/Dlna/ProfileConditionValue.cs @@ -0,0 +1,19 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum ProfileConditionValue + { + AudioChannels, + AudioBitrate, + AudioProfile, + Width, + Height, + Has64BitOffsets, + PacketLength, + VideoBitDepth, + VideoBitrate, + VideoFramerate, + VideoLevel, + VideoProfile, + VideoTimestamp + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/SearchCriteria.cs b/MediaBrowser.Model/Dlna/SearchCriteria.cs index d3f8b8332..bb4221b51 100644 --- a/MediaBrowser.Model/Dlna/SearchCriteria.cs +++ b/MediaBrowser.Model/Dlna/SearchCriteria.cs @@ -37,13 +37,4 @@ namespace MediaBrowser.Model.Dlna } } } - - public enum SearchType - { - Unknown = 0, - Audio = 1, - Image = 2, - Video = 3, - Playlist = 4 - } } diff --git a/MediaBrowser.Model/Dlna/SearchType.cs b/MediaBrowser.Model/Dlna/SearchType.cs new file mode 100644 index 000000000..68c047603 --- /dev/null +++ b/MediaBrowser.Model/Dlna/SearchType.cs @@ -0,0 +1,11 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum SearchType + { + Unknown = 0, + Audio = 1, + Image = 2, + Video = 3, + Playlist = 4 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index ae9806f97..9af3689b2 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -403,47 +403,4 @@ namespace MediaBrowser.Model.Dlna } } } - - /// <summary> - /// Class AudioOptions. - /// </summary> - public class AudioOptions - { - public string ItemId { get; set; } - public List<MediaSourceInfo> MediaSources { get; set; } - public DeviceProfile Profile { get; set; } - - /// <summary> - /// Optional. Only needed if a specific AudioStreamIndex or SubtitleStreamIndex are requested. - /// </summary> - public string MediaSourceId { get; set; } - - public string DeviceId { get; set; } - - /// <summary> - /// Allows an override of supported number of audio channels - /// Example: DeviceProfile supports five channel, but user only has stereo speakers - /// </summary> - public int? MaxAudioChannels { get; set; } - - /// <summary> - /// The application's configured quality setting - /// </summary> - public int? MaxBitrate { get; set; } - } - - /// <summary> - /// Class VideoOptions. - /// </summary> - public class VideoOptions : AudioOptions - { - public int? AudioStreamIndex { get; set; } - public int? SubtitleStreamIndex { get; set; } - public int? MaxAudioTranscodingBitrate { get; set; } - - public VideoOptions() - { - MaxAudioTranscodingBitrate = 128000; - } - } } diff --git a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs new file mode 100644 index 000000000..564ce5c60 --- /dev/null +++ b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Dlna +{ + public enum TranscodeSeekInfo + { + Auto = 0, + Bytes = 1 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs index ba02e9be2..162d62718 100644 --- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs +++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs @@ -38,10 +38,4 @@ namespace MediaBrowser.Model.Dlna return (AudioCodec ?? string.Empty).Split(',').Where(i => !string.IsNullOrEmpty(i)).ToList(); } } - - public enum TranscodeSeekInfo - { - Auto = 0, - Bytes = 1 - } } diff --git a/MediaBrowser.Model/Dlna/VideoOptions.cs b/MediaBrowser.Model/Dlna/VideoOptions.cs new file mode 100644 index 000000000..39a5ab1b1 --- /dev/null +++ b/MediaBrowser.Model/Dlna/VideoOptions.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Dlna +{ + /// <summary> + /// Class VideoOptions. + /// </summary> + public class VideoOptions : AudioOptions + { + public int? AudioStreamIndex { get; set; } + public int? SubtitleStreamIndex { get; set; } + public int? MaxAudioTranscodingBitrate { get; set; } + + public VideoOptions() + { + MaxAudioTranscodingBitrate = 128000; + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dlna/XmlAttribute.cs b/MediaBrowser.Model/Dlna/XmlAttribute.cs new file mode 100644 index 000000000..e8e13ba0d --- /dev/null +++ b/MediaBrowser.Model/Dlna/XmlAttribute.cs @@ -0,0 +1,13 @@ +using System.Xml.Serialization; + +namespace MediaBrowser.Model.Dlna +{ + public class XmlAttribute + { + [XmlAttribute("name")] + public string Name { get; set; } + + [XmlAttribute("value")] + public string Value { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Drawing/DrawingUtils.cs b/MediaBrowser.Model/Drawing/DrawingUtils.cs index ae483b6f6..7f679a826 100644 --- a/MediaBrowser.Model/Drawing/DrawingUtils.cs +++ b/MediaBrowser.Model/Drawing/DrawingUtils.cs @@ -1,6 +1,4 @@ -using System.Globalization; - -namespace MediaBrowser.Model.Drawing +namespace MediaBrowser.Model.Drawing { /// <summary> /// Class DrawingUtils @@ -145,83 +143,4 @@ namespace MediaBrowser.Model.Drawing return scaleFactor; } } - - /// <summary> - /// Struct ImageSize - /// </summary> - public struct ImageSize - { - private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); - - private double _height; - private double _width; - - /// <summary> - /// Gets or sets the height. - /// </summary> - /// <value>The height.</value> - public double Height - { - get - { - return _height; - } - set - { - _height = value; - } - } - - /// <summary> - /// Gets or sets the width. - /// </summary> - /// <value>The width.</value> - public double Width - { - get { return _width; } - set { _width = value; } - } - - public bool Equals(ImageSize size) - { - return Width.Equals(size.Width) && Height.Equals(size.Height); - } - - public override string ToString() - { - return string.Format("{0}-{1}", Width, Height); - } - - public ImageSize(string value) - { - _width = 0; - - _height = 0; - - ParseValue(value); - } - - private void ParseValue(string value) - { - if (!string.IsNullOrEmpty(value)) - { - string[] parts = value.Split('-'); - - if (parts.Length == 2) - { - double val; - - if (double.TryParse(parts[0], NumberStyles.Any, UsCulture, out val)) - { - _width = val; - } - - if (double.TryParse(parts[1], NumberStyles.Any, UsCulture, out val)) - { - _height = val; - } - } - } - } - } } diff --git a/MediaBrowser.Model/Drawing/ImageSize.cs b/MediaBrowser.Model/Drawing/ImageSize.cs new file mode 100644 index 000000000..acc245938 --- /dev/null +++ b/MediaBrowser.Model/Drawing/ImageSize.cs @@ -0,0 +1,83 @@ +using System.Globalization; + +namespace MediaBrowser.Model.Drawing +{ + /// <summary> + /// Struct ImageSize + /// </summary> + public struct ImageSize + { + private static readonly CultureInfo UsCulture = new CultureInfo("en-US"); + + private double _height; + private double _width; + + /// <summary> + /// Gets or sets the height. + /// </summary> + /// <value>The height.</value> + public double Height + { + get + { + return _height; + } + set + { + _height = value; + } + } + + /// <summary> + /// Gets or sets the width. + /// </summary> + /// <value>The width.</value> + public double Width + { + get { return _width; } + set { _width = value; } + } + + public bool Equals(ImageSize size) + { + return Width.Equals(size.Width) && Height.Equals(size.Height); + } + + public override string ToString() + { + return string.Format("{0}-{1}", Width, Height); + } + + public ImageSize(string value) + { + _width = 0; + + _height = 0; + + ParseValue(value); + } + + private void ParseValue(string value) + { + if (!string.IsNullOrEmpty(value)) + { + string[] parts = value.Split('-'); + + if (parts.Length == 2) + { + double val; + + if (double.TryParse(parts[0], NumberStyles.Any, UsCulture, out val)) + { + _width = val; + } + + if (double.TryParse(parts[1], NumberStyles.Any, UsCulture, out val)) + { + _height = val; + } + } + } + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dto/IItemDto.cs b/MediaBrowser.Model/Dto/IItemDto.cs index 3ec641918..af46d29b9 100644 --- a/MediaBrowser.Model/Dto/IItemDto.cs +++ b/MediaBrowser.Model/Dto/IItemDto.cs @@ -18,10 +18,4 @@ namespace MediaBrowser.Model.Dto /// <value>The original primary image aspect ratio.</value> double? OriginalPrimaryImageAspectRatio { get; set; } } - - public enum RatingType - { - Score, - Likes - } } diff --git a/MediaBrowser.Model/Dto/MediaVersionInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs index 2e94f4f0c..2e94f4f0c 100644 --- a/MediaBrowser.Model/Dto/MediaVersionInfo.cs +++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs diff --git a/MediaBrowser.Model/Dto/RatingType.cs b/MediaBrowser.Model/Dto/RatingType.cs new file mode 100644 index 000000000..f151adce9 --- /dev/null +++ b/MediaBrowser.Model/Dto/RatingType.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Dto +{ + public enum RatingType + { + Score, + Likes + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dto/RecommendationDto.cs b/MediaBrowser.Model/Dto/RecommendationDto.cs index 68b71e466..275f97c28 100644 --- a/MediaBrowser.Model/Dto/RecommendationDto.cs +++ b/MediaBrowser.Model/Dto/RecommendationDto.cs @@ -11,19 +11,4 @@ namespace MediaBrowser.Model.Dto public string CategoryId { get; set; } } - - public enum RecommendationType - { - SimilarToRecentlyPlayed = 0, - - SimilarToLikedItem = 1, - - HasDirectorFromRecentlyPlayed = 2, - - HasActorFromRecentlyPlayed = 3, - - HasLikedDirector = 4, - - HasLikedActor = 5 - } } diff --git a/MediaBrowser.Model/Dto/RecommendationType.cs b/MediaBrowser.Model/Dto/RecommendationType.cs new file mode 100644 index 000000000..1adf9b082 --- /dev/null +++ b/MediaBrowser.Model/Dto/RecommendationType.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Dto +{ + public enum RecommendationType + { + SimilarToRecentlyPlayed = 0, + + SimilarToLikedItem = 1, + + HasDirectorFromRecentlyPlayed = 2, + + HasActorFromRecentlyPlayed = 3, + + HasLikedDirector = 4, + + HasLikedActor = 5 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dto/StreamOptions.cs b/MediaBrowser.Model/Dto/StreamOptions.cs index 861fa4e01..9cf301270 100644 --- a/MediaBrowser.Model/Dto/StreamOptions.cs +++ b/MediaBrowser.Model/Dto/StreamOptions.cs @@ -1,103 +1,6 @@ namespace MediaBrowser.Model.Dto { /// <summary> - /// Class VideoStreamOptions - /// </summary> - public class VideoStreamOptions : StreamOptions - { - /// <summary> - /// Gets or sets the video codec. - /// Omit to copy - /// </summary> - /// <value>The video codec.</value> - public string VideoCodec { get; set; } - - /// <summary> - /// Gets or sets the video bit rate. - /// </summary> - /// <value>The video bit rate.</value> - public int? VideoBitRate { get; set; } - - /// <summary> - /// Gets or sets the width. - /// </summary> - /// <value>The width.</value> - public int? Width { get; set; } - - /// <summary> - /// Gets or sets the height. - /// </summary> - /// <value>The height.</value> - public int? Height { get; set; } - - /// <summary> - /// Gets or sets the width of the max. - /// </summary> - /// <value>The width of the max.</value> - public int? MaxWidth { get; set; } - - /// <summary> - /// Gets or sets the height of the max. - /// </summary> - /// <value>The height of the max.</value> - public int? MaxHeight { get; set; } - - /// <summary> - /// Gets or sets the frame rate. - /// </summary> - /// <value>The frame rate.</value> - public double? FrameRate { get; set; } - - /// <summary> - /// Gets or sets the index of the audio stream. - /// </summary> - /// <value>The index of the audio stream.</value> - public int? AudioStreamIndex { get; set; } - - /// <summary> - /// Gets or sets the index of the video stream. - /// </summary> - /// <value>The index of the video stream.</value> - public int? VideoStreamIndex { get; set; } - - /// <summary> - /// Gets or sets the index of the subtitle stream. - /// </summary> - /// <value>The index of the subtitle stream.</value> - public int? SubtitleStreamIndex { get; set; } - - /// <summary> - /// Gets or sets the profile. - /// </summary> - /// <value>The profile.</value> - public string Profile { get; set; } - - /// <summary> - /// Gets or sets the level. - /// </summary> - /// <value>The level.</value> - public string Level { get; set; } - - /// <summary> - /// Gets or sets the baseline stream audio bit rate. - /// </summary> - /// <value>The baseline stream audio bit rate.</value> - public int? BaselineStreamAudioBitRate { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether [append baseline stream]. - /// </summary> - /// <value><c>true</c> if [append baseline stream]; otherwise, <c>false</c>.</value> - public bool AppendBaselineStream { get; set; } - - /// <summary> - /// Gets or sets the time stamp offset ms. Only used with HLS. - /// </summary> - /// <value>The time stamp offset ms.</value> - public int? TimeStampOffsetMs { get; set; } - } - - /// <summary> /// Class StreamOptions /// </summary> public class StreamOptions @@ -158,19 +61,4 @@ /// <value>The device id.</value> public string DeviceId { get; set; } } - - public class SubtitleDownloadOptions - { - /// <summary> - /// Gets or sets the item identifier. - /// </summary> - /// <value>The item identifier.</value> - public string ItemId { get; set; } - - /// <summary> - /// Gets or sets the index of the stream. - /// </summary> - /// <value>The index of the stream.</value> - public int StreamIndex { get; set; } - } } diff --git a/MediaBrowser.Model/Dto/SubtitleDownloadOptions.cs b/MediaBrowser.Model/Dto/SubtitleDownloadOptions.cs new file mode 100644 index 000000000..a0b49f42c --- /dev/null +++ b/MediaBrowser.Model/Dto/SubtitleDownloadOptions.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Dto +{ + public class SubtitleDownloadOptions + { + /// <summary> + /// Gets or sets the item identifier. + /// </summary> + /// <value>The item identifier.</value> + public string ItemId { get; set; } + + /// <summary> + /// Gets or sets the index of the stream. + /// </summary> + /// <value>The index of the stream.</value> + public int StreamIndex { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Dto/VideoStreamOptions.cs b/MediaBrowser.Model/Dto/VideoStreamOptions.cs new file mode 100644 index 000000000..73dc70018 --- /dev/null +++ b/MediaBrowser.Model/Dto/VideoStreamOptions.cs @@ -0,0 +1,99 @@ +namespace MediaBrowser.Model.Dto +{ + /// <summary> + /// Class VideoStreamOptions + /// </summary> + public class VideoStreamOptions : StreamOptions + { + /// <summary> + /// Gets or sets the video codec. + /// Omit to copy + /// </summary> + /// <value>The video codec.</value> + public string VideoCodec { get; set; } + + /// <summary> + /// Gets or sets the video bit rate. + /// </summary> + /// <value>The video bit rate.</value> + public int? VideoBitRate { get; set; } + + /// <summary> + /// Gets or sets the width. + /// </summary> + /// <value>The width.</value> + public int? Width { get; set; } + + /// <summary> + /// Gets or sets the height. + /// </summary> + /// <value>The height.</value> + public int? Height { get; set; } + + /// <summary> + /// Gets or sets the width of the max. + /// </summary> + /// <value>The width of the max.</value> + public int? MaxWidth { get; set; } + + /// <summary> + /// Gets or sets the height of the max. + /// </summary> + /// <value>The height of the max.</value> + public int? MaxHeight { get; set; } + + /// <summary> + /// Gets or sets the frame rate. + /// </summary> + /// <value>The frame rate.</value> + public double? FrameRate { get; set; } + + /// <summary> + /// Gets or sets the index of the audio stream. + /// </summary> + /// <value>The index of the audio stream.</value> + public int? AudioStreamIndex { get; set; } + + /// <summary> + /// Gets or sets the index of the video stream. + /// </summary> + /// <value>The index of the video stream.</value> + public int? VideoStreamIndex { get; set; } + + /// <summary> + /// Gets or sets the index of the subtitle stream. + /// </summary> + /// <value>The index of the subtitle stream.</value> + public int? SubtitleStreamIndex { get; set; } + + /// <summary> + /// Gets or sets the profile. + /// </summary> + /// <value>The profile.</value> + public string Profile { get; set; } + + /// <summary> + /// Gets or sets the level. + /// </summary> + /// <value>The level.</value> + public string Level { get; set; } + + /// <summary> + /// Gets or sets the baseline stream audio bit rate. + /// </summary> + /// <value>The baseline stream audio bit rate.</value> + public int? BaselineStreamAudioBitRate { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether [append baseline stream]. + /// </summary> + /// <value><c>true</c> if [append baseline stream]; otherwise, <c>false</c>.</value> + public bool AppendBaselineStream { get; set; } + + /// <summary> + /// Gets or sets the time stamp offset ms. Only used with HLS. + /// </summary> + /// <value>The time stamp offset ms.</value> + public int? TimeStampOffsetMs { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs index 62233ac27..2fdab9799 100644 --- a/MediaBrowser.Model/Entities/DisplayPreferences.cs +++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs @@ -122,34 +122,4 @@ namespace MediaBrowser.Model.Entities PrimaryImageHeight = Convert.ToInt32(size.Height); } } - - /// <summary> - /// Enum ScrollDirection - /// </summary> - public enum ScrollDirection - { - /// <summary> - /// The horizontal - /// </summary> - Horizontal, - /// <summary> - /// The vertical - /// </summary> - Vertical - } - - /// <summary> - /// Enum SortOrder - /// </summary> - public enum SortOrder - { - /// <summary> - /// The ascending - /// </summary> - Ascending, - /// <summary> - /// The descending - /// </summary> - Descending - } } diff --git a/MediaBrowser.Model/Entities/RequestResult.cs b/MediaBrowser.Model/Entities/EmptyRequestResult.cs index 5c9a725fd..5c9a725fd 100644 --- a/MediaBrowser.Model/Entities/RequestResult.cs +++ b/MediaBrowser.Model/Entities/EmptyRequestResult.cs diff --git a/MediaBrowser.Model/Entities/IHasProviderIds.cs b/MediaBrowser.Model/Entities/IHasProviderIds.cs index efb75412f..796850dbd 100644 --- a/MediaBrowser.Model/Entities/IHasProviderIds.cs +++ b/MediaBrowser.Model/Entities/IHasProviderIds.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace MediaBrowser.Model.Entities { @@ -14,102 +13,4 @@ namespace MediaBrowser.Model.Entities /// <value>The provider ids.</value> Dictionary<string, string> ProviderIds { get; set; } } - - /// <summary> - /// Class ProviderIdsExtensions - /// </summary> - public static class ProviderIdsExtensions - { - /// <summary> - /// Determines whether [has provider identifier] [the specified instance]. - /// </summary> - /// <param name="instance">The instance.</param> - /// <param name="provider">The provider.</param> - /// <returns><c>true</c> if [has provider identifier] [the specified instance]; otherwise, <c>false</c>.</returns> - public static bool HasProviderId(this IHasProviderIds instance, MetadataProviders provider) - { - return !string.IsNullOrEmpty(instance.GetProviderId(provider.ToString())); - } - - /// <summary> - /// Gets a provider id - /// </summary> - /// <param name="instance">The instance.</param> - /// <param name="provider">The provider.</param> - /// <returns>System.String.</returns> - public static string GetProviderId(this IHasProviderIds instance, MetadataProviders provider) - { - return instance.GetProviderId(provider.ToString()); - } - - /// <summary> - /// Gets a provider id - /// </summary> - /// <param name="instance">The instance.</param> - /// <param name="name">The name.</param> - /// <returns>System.String.</returns> - public static string GetProviderId(this IHasProviderIds instance, string name) - { - if (instance == null) - { - throw new ArgumentNullException("instance"); - } - - if (instance.ProviderIds == null) - { - return null; - } - - string id; - instance.ProviderIds.TryGetValue(name, out id); - return id; - } - - /// <summary> - /// Sets a provider id - /// </summary> - /// <param name="instance">The instance.</param> - /// <param name="name">The name.</param> - /// <param name="value">The value.</param> - public static void SetProviderId(this IHasProviderIds instance, string name, string value) - { - if (instance == null) - { - throw new ArgumentNullException("instance"); - } - - // If it's null remove the key from the dictionary - if (string.IsNullOrEmpty(value)) - { - if (instance.ProviderIds != null) - { - if (instance.ProviderIds.ContainsKey(name)) - { - instance.ProviderIds.Remove(name); - } - } - } - else - { - // Ensure it exists - if (instance.ProviderIds == null) - { - instance.ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); - } - - instance.ProviderIds[name] = value; - } - } - - /// <summary> - /// Sets a provider id - /// </summary> - /// <param name="instance">The instance.</param> - /// <param name="provider">The provider.</param> - /// <param name="value">The value.</param> - public static void SetProviderId(this IHasProviderIds instance, MetadataProviders provider, string value) - { - instance.SetProviderId(provider.ToString(), value); - } - } } diff --git a/MediaBrowser.Model/Entities/IsoType.cs b/MediaBrowser.Model/Entities/IsoType.cs new file mode 100644 index 000000000..567b98ab9 --- /dev/null +++ b/MediaBrowser.Model/Entities/IsoType.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Entities +{ + /// <summary> + /// Enum IsoType + /// </summary> + public enum IsoType + { + /// <summary> + /// The DVD + /// </summary> + Dvd, + /// <summary> + /// The blu ray + /// </summary> + BluRay + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/MediaInfo.cs b/MediaBrowser.Model/Entities/MediaInfo.cs new file mode 100644 index 000000000..ef26cfa14 --- /dev/null +++ b/MediaBrowser.Model/Entities/MediaInfo.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Model.Entities +{ + public class MediaInfo + { + /// <summary> + /// Gets or sets the media streams. + /// </summary> + /// <value>The media streams.</value> + public List<MediaStream> MediaStreams { get; set; } + + /// <summary> + /// Gets or sets the format. + /// </summary> + /// <value>The format.</value> + public string Format { get; set; } + + public int? TotalBitrate { get; set; } + + public MediaInfo() + { + MediaStreams = new List<MediaStream>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index d54e3c0ef..66163c1ef 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Diagnostics; +using System.Diagnostics; namespace MediaBrowser.Model.Entities { @@ -147,49 +146,4 @@ namespace MediaBrowser.Model.Entities /// <value>The level.</value> public double? Level { get; set; } } - - /// <summary> - /// Enum MediaStreamType - /// </summary> - public enum MediaStreamType - { - /// <summary> - /// The audio - /// </summary> - Audio, - /// <summary> - /// The video - /// </summary> - Video, - /// <summary> - /// The subtitle - /// </summary> - Subtitle, - /// <summary> - /// The embedded image - /// </summary> - EmbeddedImage - } - - public class MediaInfo - { - /// <summary> - /// Gets or sets the media streams. - /// </summary> - /// <value>The media streams.</value> - public List<MediaStream> MediaStreams { get; set; } - - /// <summary> - /// Gets or sets the format. - /// </summary> - /// <value>The format.</value> - public string Format { get; set; } - - public int? TotalBitrate { get; set; } - - public MediaInfo() - { - MediaStreams = new List<MediaStream>(); - } - } } diff --git a/MediaBrowser.Model/Entities/MediaStreamType.cs b/MediaBrowser.Model/Entities/MediaStreamType.cs new file mode 100644 index 000000000..084a411f9 --- /dev/null +++ b/MediaBrowser.Model/Entities/MediaStreamType.cs @@ -0,0 +1,25 @@ +namespace MediaBrowser.Model.Entities +{ + /// <summary> + /// Enum MediaStreamType + /// </summary> + public enum MediaStreamType + { + /// <summary> + /// The audio + /// </summary> + Audio, + /// <summary> + /// The video + /// </summary> + Video, + /// <summary> + /// The subtitle + /// </summary> + Subtitle, + /// <summary> + /// The embedded image + /// </summary> + EmbeddedImage + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/MediaUrl.cs b/MediaBrowser.Model/Entities/MediaUrl.cs index 857e91fec..9aa7207ed 100644 --- a/MediaBrowser.Model/Entities/MediaUrl.cs +++ b/MediaBrowser.Model/Entities/MediaUrl.cs @@ -8,10 +8,4 @@ namespace MediaBrowser.Model.Entities public VideoSize? VideoSize { get; set; } public bool IsDirectLink { get; set; } } - - public enum VideoSize - { - StandardDefinition, - HighDefinition - } } diff --git a/MediaBrowser.Model/Entities/PackageReviewInfo.cs b/MediaBrowser.Model/Entities/PackageReviewInfo.cs index c350935f4..52500a41e 100644 --- a/MediaBrowser.Model/Entities/PackageReviewInfo.cs +++ b/MediaBrowser.Model/Entities/PackageReviewInfo.cs @@ -1,8 +1,4 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace MediaBrowser.Model.Entities { diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs new file mode 100644 index 000000000..e10232baa --- /dev/null +++ b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; + +namespace MediaBrowser.Model.Entities +{ + /// <summary> + /// Class ProviderIdsExtensions + /// </summary> + public static class ProviderIdsExtensions + { + /// <summary> + /// Determines whether [has provider identifier] [the specified instance]. + /// </summary> + /// <param name="instance">The instance.</param> + /// <param name="provider">The provider.</param> + /// <returns><c>true</c> if [has provider identifier] [the specified instance]; otherwise, <c>false</c>.</returns> + public static bool HasProviderId(this IHasProviderIds instance, MetadataProviders provider) + { + return !string.IsNullOrEmpty(instance.GetProviderId(provider.ToString())); + } + + /// <summary> + /// Gets a provider id + /// </summary> + /// <param name="instance">The instance.</param> + /// <param name="provider">The provider.</param> + /// <returns>System.String.</returns> + public static string GetProviderId(this IHasProviderIds instance, MetadataProviders provider) + { + return instance.GetProviderId(provider.ToString()); + } + + /// <summary> + /// Gets a provider id + /// </summary> + /// <param name="instance">The instance.</param> + /// <param name="name">The name.</param> + /// <returns>System.String.</returns> + public static string GetProviderId(this IHasProviderIds instance, string name) + { + if (instance == null) + { + throw new ArgumentNullException("instance"); + } + + if (instance.ProviderIds == null) + { + return null; + } + + string id; + instance.ProviderIds.TryGetValue(name, out id); + return id; + } + + /// <summary> + /// Sets a provider id + /// </summary> + /// <param name="instance">The instance.</param> + /// <param name="name">The name.</param> + /// <param name="value">The value.</param> + public static void SetProviderId(this IHasProviderIds instance, string name, string value) + { + if (instance == null) + { + throw new ArgumentNullException("instance"); + } + + // If it's null remove the key from the dictionary + if (string.IsNullOrEmpty(value)) + { + if (instance.ProviderIds != null) + { + if (instance.ProviderIds.ContainsKey(name)) + { + instance.ProviderIds.Remove(name); + } + } + } + else + { + // Ensure it exists + if (instance.ProviderIds == null) + { + instance.ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); + } + + instance.ProviderIds[name] = value; + } + } + + /// <summary> + /// Sets a provider id + /// </summary> + /// <param name="instance">The instance.</param> + /// <param name="provider">The provider.</param> + /// <param name="value">The value.</param> + public static void SetProviderId(this IHasProviderIds instance, MetadataProviders provider, string value) + { + instance.SetProviderId(provider.ToString(), value); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/ScrollDirection.cs b/MediaBrowser.Model/Entities/ScrollDirection.cs new file mode 100644 index 000000000..ed2210300 --- /dev/null +++ b/MediaBrowser.Model/Entities/ScrollDirection.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Entities +{ + /// <summary> + /// Enum ScrollDirection + /// </summary> + public enum ScrollDirection + { + /// <summary> + /// The horizontal + /// </summary> + Horizontal, + /// <summary> + /// The vertical + /// </summary> + Vertical + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/SortOrder.cs b/MediaBrowser.Model/Entities/SortOrder.cs new file mode 100644 index 000000000..5130449ba --- /dev/null +++ b/MediaBrowser.Model/Entities/SortOrder.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Entities +{ + /// <summary> + /// Enum SortOrder + /// </summary> + public enum SortOrder + { + /// <summary> + /// The ascending + /// </summary> + Ascending, + /// <summary> + /// The descending + /// </summary> + Descending + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/VideoSize.cs b/MediaBrowser.Model/Entities/VideoSize.cs new file mode 100644 index 000000000..0100f3b90 --- /dev/null +++ b/MediaBrowser.Model/Entities/VideoSize.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Entities +{ + public enum VideoSize + { + StandardDefinition, + HighDefinition + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Entities/VideoType.cs b/MediaBrowser.Model/Entities/VideoType.cs index b2742add1..aa9a3c55f 100644 --- a/MediaBrowser.Model/Entities/VideoType.cs +++ b/MediaBrowser.Model/Entities/VideoType.cs @@ -27,19 +27,4 @@ namespace MediaBrowser.Model.Entities /// </summary> HdDvd } - - /// <summary> - /// Enum IsoType - /// </summary> - public enum IsoType - { - /// <summary> - /// The DVD - /// </summary> - Dvd, - /// <summary> - /// The blu ray - /// </summary> - BluRay - } } diff --git a/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs b/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs new file mode 100644 index 000000000..0b12ebc51 --- /dev/null +++ b/MediaBrowser.Model/FileOrganization/EpisodeFileOrganizationRequest.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.FileOrganization +{ + public class EpisodeFileOrganizationRequest + { + public string ResultId { get; set; } + + public string SeriesId { get; set; } + + public int SeasonNumber { get; set; } + + public int EpisodeNumber { get; set; } + + public int? EndingEpisodeNumber { get; set; } + + public bool RememberCorrection { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs b/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs index 4a3235a42..ef9d0ca2a 100644 --- a/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs +++ b/MediaBrowser.Model/FileOrganization/FileOrganizationResult.cs @@ -100,18 +100,4 @@ namespace MediaBrowser.Model.FileOrganization DuplicatePaths = new List<string>(); } } - - public enum FileSortingStatus - { - Success, - Failure, - SkippedExisting - } - - public enum FileOrganizerType - { - Movie, - Episode, - Song - } } diff --git a/MediaBrowser.Model/FileOrganization/FileOrganizationQuery.cs b/MediaBrowser.Model/FileOrganization/FileOrganizationResultQuery.cs index ce5750757..18287534e 100644 --- a/MediaBrowser.Model/FileOrganization/FileOrganizationQuery.cs +++ b/MediaBrowser.Model/FileOrganization/FileOrganizationResultQuery.cs @@ -15,19 +15,4 @@ namespace MediaBrowser.Model.FileOrganization /// <value>The limit.</value> public int? Limit { get; set; } } - - public class EpisodeFileOrganizationRequest - { - public string ResultId { get; set; } - - public string SeriesId { get; set; } - - public int SeasonNumber { get; set; } - - public int EpisodeNumber { get; set; } - - public int? EndingEpisodeNumber { get; set; } - - public bool RememberCorrection { get; set; } - } } diff --git a/MediaBrowser.Model/FileOrganization/FileOrganizerType.cs b/MediaBrowser.Model/FileOrganization/FileOrganizerType.cs new file mode 100644 index 000000000..cbbeb9ce2 --- /dev/null +++ b/MediaBrowser.Model/FileOrganization/FileOrganizerType.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.FileOrganization +{ + public enum FileOrganizerType + { + Movie, + Episode, + Song + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/FileOrganization/FileSortingStatus.cs b/MediaBrowser.Model/FileOrganization/FileSortingStatus.cs new file mode 100644 index 000000000..8a467c05f --- /dev/null +++ b/MediaBrowser.Model/FileOrganization/FileSortingStatus.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.FileOrganization +{ + public enum FileSortingStatus + { + Success, + Failure, + SkippedExisting + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Globalization/CountryInfo.cs b/MediaBrowser.Model/Globalization/CountryInfo.cs index 9f5f00d80..16aea8436 100644 --- a/MediaBrowser.Model/Globalization/CountryInfo.cs +++ b/MediaBrowser.Model/Globalization/CountryInfo.cs @@ -30,10 +30,4 @@ namespace MediaBrowser.Model.Globalization /// <value>The name of the three letter ISO region.</value> public string ThreeLetterISORegionName { get; set; } } - - public class LocalizatonOption - { - public string Name { get; set; } - public string Value { get; set; } - } } diff --git a/MediaBrowser.Model/Globalization/LocalizatonOption.cs b/MediaBrowser.Model/Globalization/LocalizatonOption.cs new file mode 100644 index 000000000..61749cbc3 --- /dev/null +++ b/MediaBrowser.Model/Globalization/LocalizatonOption.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Globalization +{ + public class LocalizatonOption + { + public string Name { get; set; } + public string Value { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs index dc4840456..f17e2e5c3 100644 --- a/MediaBrowser.Model/IO/FileSystemEntryInfo.cs +++ b/MediaBrowser.Model/IO/FileSystemEntryInfo.cs @@ -24,27 +24,4 @@ namespace MediaBrowser.Model.IO /// <value>The type.</value> public FileSystemEntryType Type { get; set; } } - - /// <summary> - /// Enum FileSystemEntryType - /// </summary> - public enum FileSystemEntryType - { - /// <summary> - /// The file - /// </summary> - File, - /// <summary> - /// The directory - /// </summary> - Directory, - /// <summary> - /// The network computer - /// </summary> - NetworkComputer, - /// <summary> - /// The network share - /// </summary> - NetworkShare - } } diff --git a/MediaBrowser.Model/IO/FileSystemEntryType.cs b/MediaBrowser.Model/IO/FileSystemEntryType.cs new file mode 100644 index 000000000..e7c67c606 --- /dev/null +++ b/MediaBrowser.Model/IO/FileSystemEntryType.cs @@ -0,0 +1,25 @@ +namespace MediaBrowser.Model.IO +{ + /// <summary> + /// Enum FileSystemEntryType + /// </summary> + public enum FileSystemEntryType + { + /// <summary> + /// The file + /// </summary> + File, + /// <summary> + /// The directory + /// </summary> + Directory, + /// <summary> + /// The network computer + /// </summary> + NetworkComputer, + /// <summary> + /// The network share + /// </summary> + NetworkShare + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs new file mode 100644 index 000000000..2d88215bb --- /dev/null +++ b/MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs @@ -0,0 +1,108 @@ +using System; +using System.ComponentModel; + +namespace MediaBrowser.Model.LiveTv +{ + public class BaseTimerInfoDto : INotifyPropertyChanged + { + /// <summary> + /// Occurs when a property value changes. + /// </summary> + public event PropertyChangedEventHandler PropertyChanged; + + /// <summary> + /// Id of the recording. + /// </summary> + public string Id { get; set; } + + /// <summary> + /// Gets or sets the external identifier. + /// </summary> + /// <value>The external identifier.</value> + public string ExternalId { get; set; } + + /// <summary> + /// ChannelId of the recording. + /// </summary> + public string ChannelId { get; set; } + + /// <summary> + /// Gets or sets the external channel identifier. + /// </summary> + /// <value>The external channel identifier.</value> + public string ExternalChannelId { get; set; } + + /// <summary> + /// ChannelName of the recording. + /// </summary> + public string ChannelName { get; set; } + + /// <summary> + /// Gets or sets the program identifier. + /// </summary> + /// <value>The program identifier.</value> + public string ProgramId { get; set; } + + /// <summary> + /// Gets or sets the external program identifier. + /// </summary> + /// <value>The external program identifier.</value> + public string ExternalProgramId { get; set; } + + /// <summary> + /// Name of the recording. + /// </summary> + public string Name { get; set; } + + /// <summary> + /// Description of the recording. + /// </summary> + public string Overview { get; set; } + + /// <summary> + /// The start date of the recording, in UTC. + /// </summary> + public DateTime StartDate { get; set; } + + /// <summary> + /// The end date of the recording, in UTC. + /// </summary> + public DateTime EndDate { get; set; } + + /// <summary> + /// Gets or sets the name of the service. + /// </summary> + /// <value>The name of the service.</value> + public string ServiceName { get; set; } + + /// <summary> + /// Gets or sets the priority. + /// </summary> + /// <value>The priority.</value> + public int Priority { get; set; } + + /// <summary> + /// Gets or sets the pre padding seconds. + /// </summary> + /// <value>The pre padding seconds.</value> + public int PrePaddingSeconds { get; set; } + + /// <summary> + /// Gets or sets the post padding seconds. + /// </summary> + /// <value>The post padding seconds.</value> + public int PostPaddingSeconds { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance is pre padding required. + /// </summary> + /// <value><c>true</c> if this instance is pre padding required; otherwise, <c>false</c>.</value> + public bool IsPrePaddingRequired { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance is post padding required. + /// </summary> + /// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value> + public bool IsPostPaddingRequired { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/DayPattern.cs b/MediaBrowser.Model/LiveTv/DayPattern.cs new file mode 100644 index 000000000..8251795dc --- /dev/null +++ b/MediaBrowser.Model/LiveTv/DayPattern.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.LiveTv +{ + public enum DayPattern + { + Daily, + Weekdays, + Weekends + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/GuideInfo.cs b/MediaBrowser.Model/LiveTv/GuideInfo.cs new file mode 100644 index 000000000..c21f6d871 --- /dev/null +++ b/MediaBrowser.Model/LiveTv/GuideInfo.cs @@ -0,0 +1,19 @@ +using System; + +namespace MediaBrowser.Model.LiveTv +{ + public class GuideInfo + { + /// <summary> + /// Gets or sets the start date. + /// </summary> + /// <value>The start date.</value> + public DateTime StartDate { get; set; } + + /// <summary> + /// Gets or sets the end date. + /// </summary> + /// <value>The end date.</value> + public DateTime EndDate { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/LiveTvInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs new file mode 100644 index 000000000..dd31c5a6b --- /dev/null +++ b/MediaBrowser.Model/LiveTv/LiveTvInfo.cs @@ -0,0 +1,49 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Model.LiveTv +{ + public class LiveTvInfo + { + /// <summary> + /// Gets or sets the services. + /// </summary> + /// <value>The services.</value> + public List<LiveTvServiceInfo> Services { get; set; } + + /// <summary> + /// Gets or sets the name of the active service. + /// </summary> + /// <value>The name of the active service.</value> + public string ActiveServiceName { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance is enabled. + /// </summary> + /// <value><c>true</c> if this instance is enabled; otherwise, <c>false</c>.</value> + public bool IsEnabled { get; set; } + + /// <summary> + /// Gets or sets the enabled users. + /// </summary> + /// <value>The enabled users.</value> + public List<string> EnabledUsers { get; set; } + + /// <summary> + /// Gets or sets the status. + /// </summary> + /// <value>The status.</value> + public LiveTvServiceStatus Status { get; set; } + + /// <summary> + /// Gets or sets the status message. + /// </summary> + /// <value>The status message.</value> + public string StatusMessage { get; set; } + + public LiveTvInfo() + { + Services = new List<LiveTvServiceInfo>(); + EnabledUsers = new List<string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs index 85f58be3b..264870ffb 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace MediaBrowser.Model.LiveTv { @@ -51,140 +50,4 @@ namespace MediaBrowser.Model.LiveTv Tuners = new List<LiveTvTunerInfoDto>(); } } - - public class GuideInfo - { - /// <summary> - /// Gets or sets the start date. - /// </summary> - /// <value>The start date.</value> - public DateTime StartDate { get; set; } - - /// <summary> - /// Gets or sets the end date. - /// </summary> - /// <value>The end date.</value> - public DateTime EndDate { get; set; } - } - - public class LiveTvInfo - { - /// <summary> - /// Gets or sets the services. - /// </summary> - /// <value>The services.</value> - public List<LiveTvServiceInfo> Services { get; set; } - - /// <summary> - /// Gets or sets the name of the active service. - /// </summary> - /// <value>The name of the active service.</value> - public string ActiveServiceName { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is enabled. - /// </summary> - /// <value><c>true</c> if this instance is enabled; otherwise, <c>false</c>.</value> - public bool IsEnabled { get; set; } - - /// <summary> - /// Gets or sets the enabled users. - /// </summary> - /// <value>The enabled users.</value> - public List<string> EnabledUsers { get; set; } - - /// <summary> - /// Gets or sets the status. - /// </summary> - /// <value>The status.</value> - public LiveTvServiceStatus Status { get; set; } - - /// <summary> - /// Gets or sets the status message. - /// </summary> - /// <value>The status message.</value> - public string StatusMessage { get; set; } - - public LiveTvInfo() - { - Services = new List<LiveTvServiceInfo>(); - EnabledUsers = new List<string>(); - } - } - - public class LiveTvTunerInfoDto - { - /// <summary> - /// Gets or sets the type of the source. - /// </summary> - /// <value>The type of the source.</value> - public string SourceType { get; set; } - - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the identifier. - /// </summary> - /// <value>The identifier.</value> - public string Id { get; set; } - - /// <summary> - /// Gets or sets the status. - /// </summary> - /// <value>The status.</value> - public LiveTvTunerStatus Status { get; set; } - - /// <summary> - /// Gets or sets the channel identifier. - /// </summary> - /// <value>The channel identifier.</value> - public string ChannelId { get; set; } - - /// <summary> - /// Gets or sets the name of the channel. - /// </summary> - /// <value>The name of the channel.</value> - public string ChannelName { get; set; } - - /// <summary> - /// Gets or sets the recording identifier. - /// </summary> - /// <value>The recording identifier.</value> - public string RecordingId { get; set; } - - /// <summary> - /// Gets or sets the name of the program. - /// </summary> - /// <value>The name of the program.</value> - public string ProgramName { get; set; } - - /// <summary> - /// Gets or sets the clients. - /// </summary> - /// <value>The clients.</value> - public List<string> Clients { get; set; } - - public LiveTvTunerInfoDto() - { - Clients = new List<string>(); - } - } - - public enum LiveTvServiceStatus - { - Ok = 0, - Unavailable = 1 - } - - public enum LiveTvTunerStatus - { - Available = 0, - Disabled = 1, - RecordingTv = 2, - LiveTv = 3 - } } diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs new file mode 100644 index 000000000..20fe84500 --- /dev/null +++ b/MediaBrowser.Model/LiveTv/LiveTvServiceStatus.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.LiveTv +{ + public enum LiveTvServiceStatus + { + Ok = 0, + Unavailable = 1 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs new file mode 100644 index 000000000..28e8c158a --- /dev/null +++ b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs @@ -0,0 +1,66 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Model.LiveTv +{ + public class LiveTvTunerInfoDto + { + /// <summary> + /// Gets or sets the type of the source. + /// </summary> + /// <value>The type of the source.</value> + public string SourceType { get; set; } + + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string Name { get; set; } + + /// <summary> + /// Gets or sets the identifier. + /// </summary> + /// <value>The identifier.</value> + public string Id { get; set; } + + /// <summary> + /// Gets or sets the status. + /// </summary> + /// <value>The status.</value> + public LiveTvTunerStatus Status { get; set; } + + /// <summary> + /// Gets or sets the channel identifier. + /// </summary> + /// <value>The channel identifier.</value> + public string ChannelId { get; set; } + + /// <summary> + /// Gets or sets the name of the channel. + /// </summary> + /// <value>The name of the channel.</value> + public string ChannelName { get; set; } + + /// <summary> + /// Gets or sets the recording identifier. + /// </summary> + /// <value>The recording identifier.</value> + public string RecordingId { get; set; } + + /// <summary> + /// Gets or sets the name of the program. + /// </summary> + /// <value>The name of the program.</value> + public string ProgramName { get; set; } + + /// <summary> + /// Gets or sets the clients. + /// </summary> + /// <value>The clients.</value> + public List<string> Clients { get; set; } + + public LiveTvTunerInfoDto() + { + Clients = new List<string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs new file mode 100644 index 000000000..055199fca --- /dev/null +++ b/MediaBrowser.Model/LiveTv/LiveTvTunerStatus.cs @@ -0,0 +1,10 @@ +namespace MediaBrowser.Model.LiveTv +{ + public enum LiveTvTunerStatus + { + Available = 0, + Disabled = 1, + RecordingTv = 2, + LiveTv = 3 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/ProgramAudio.cs b/MediaBrowser.Model/LiveTv/ProgramAudio.cs new file mode 100644 index 000000000..902079b9a --- /dev/null +++ b/MediaBrowser.Model/LiveTv/ProgramAudio.cs @@ -0,0 +1,11 @@ +namespace MediaBrowser.Model.LiveTv +{ + public enum ProgramAudio + { + Mono, + Stereo, + Dolby, + DolbyDigital, + Thx + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs index 4e7ab8224..fb931820e 100644 --- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs @@ -216,13 +216,4 @@ namespace MediaBrowser.Model.LiveTv public event PropertyChangedEventHandler PropertyChanged; } - - public enum ProgramAudio - { - Mono, - Stereo, - Dolby, - DolbyDigital, - Thx - } }
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs index a2a824994..36c06d4c0 100644 --- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs +++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs @@ -32,31 +32,4 @@ namespace MediaBrowser.Model.LiveTv ChannelIdList = new string[] { }; } } - - public class RecommendedProgramQuery - { - /// <summary> - /// Gets or sets the user identifier. - /// </summary> - /// <value>The user identifier.</value> - public string UserId { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is airing. - /// </summary> - /// <value><c>true</c> if this instance is airing; otherwise, <c>false</c>.</value> - public bool? IsAiring { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance has aired. - /// </summary> - /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value> - public bool? HasAired { get; set; } - - /// <summary> - /// The maximum number of items to return - /// </summary> - /// <value>The limit.</value> - public int? Limit { get; set; } - } } diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs new file mode 100644 index 000000000..907902123 --- /dev/null +++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs @@ -0,0 +1,29 @@ +namespace MediaBrowser.Model.LiveTv +{ + public class RecommendedProgramQuery + { + /// <summary> + /// Gets or sets the user identifier. + /// </summary> + /// <value>The user identifier.</value> + public string UserId { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance is airing. + /// </summary> + /// <value><c>true</c> if this instance is airing; otherwise, <c>false</c>.</value> + public bool? IsAiring { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance has aired. + /// </summary> + /// <value><c>null</c> if [has aired] contains no value, <c>true</c> if [has aired]; otherwise, <c>false</c>.</value> + public bool? HasAired { get; set; } + + /// <summary> + /// The maximum number of items to return + /// </summary> + /// <value>The limit.</value> + public int? Limit { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/RecordingGroupQuery.cs b/MediaBrowser.Model/LiveTv/RecordingGroupQuery.cs new file mode 100644 index 000000000..8c20e7f3f --- /dev/null +++ b/MediaBrowser.Model/LiveTv/RecordingGroupQuery.cs @@ -0,0 +1,11 @@ +namespace MediaBrowser.Model.LiveTv +{ + public class RecordingGroupQuery + { + /// <summary> + /// Gets or sets the user identifier. + /// </summary> + /// <value>The user identifier.</value> + public string UserId { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs index 1fa9af49b..daa137db6 100644 --- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs +++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs @@ -1,6 +1,4 @@ -using MediaBrowser.Model.Entities; - -namespace MediaBrowser.Model.LiveTv +namespace MediaBrowser.Model.LiveTv { /// <summary> /// Class RecordingQuery. @@ -61,43 +59,4 @@ namespace MediaBrowser.Model.LiveTv /// <value>The series timer identifier.</value> public string SeriesTimerId { get; set; } } - - public class RecordingGroupQuery - { - /// <summary> - /// Gets or sets the user identifier. - /// </summary> - /// <value>The user identifier.</value> - public string UserId { get; set; } - } - - public class TimerQuery - { - /// <summary> - /// Gets or sets the channel identifier. - /// </summary> - /// <value>The channel identifier.</value> - public string ChannelId { get; set; } - - /// <summary> - /// Gets or sets the series timer identifier. - /// </summary> - /// <value>The series timer identifier.</value> - public string SeriesTimerId { get; set; } - } - - public class SeriesTimerQuery - { - /// <summary> - /// Gets or sets the sort by - SortName, Priority - /// </summary> - /// <value>The sort by.</value> - public string SortBy { get; set; } - - /// <summary> - /// Gets or sets the sort order. - /// </summary> - /// <value>The sort order.</value> - public SortOrder SortOrder { get; set; } - } } diff --git a/MediaBrowser.Model/LiveTv/RecordingStatus.cs b/MediaBrowser.Model/LiveTv/RecordingStatus.cs index 95e9dcb01..7ab716c4d 100644 --- a/MediaBrowser.Model/LiveTv/RecordingStatus.cs +++ b/MediaBrowser.Model/LiveTv/RecordingStatus.cs @@ -13,11 +13,4 @@ namespace MediaBrowser.Model.LiveTv ConflictedNotOk, Error } - - public enum DayPattern - { - Daily, - Weekdays, - Weekends - } } diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs new file mode 100644 index 000000000..95260cc0e --- /dev/null +++ b/MediaBrowser.Model/LiveTv/SeriesTimerQuery.cs @@ -0,0 +1,19 @@ +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Model.LiveTv +{ + public class SeriesTimerQuery + { + /// <summary> + /// Gets or sets the sort by - SortName, Priority + /// </summary> + /// <value>The sort by.</value> + public string SortBy { get; set; } + + /// <summary> + /// Gets or sets the sort order. + /// </summary> + /// <value>The sort order.</value> + public SortOrder SortOrder { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs index 137c95719..16cac945f 100644 --- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs @@ -1,7 +1,4 @@ -using System; -using System.ComponentModel; - -namespace MediaBrowser.Model.LiveTv +namespace MediaBrowser.Model.LiveTv { public class TimerInfoDto : BaseTimerInfoDto { @@ -36,107 +33,4 @@ namespace MediaBrowser.Model.LiveTv public ProgramInfoDto ProgramInfo { get; set; } } - - public class BaseTimerInfoDto : INotifyPropertyChanged - { - /// <summary> - /// Occurs when a property value changes. - /// </summary> - public event PropertyChangedEventHandler PropertyChanged; - - /// <summary> - /// Id of the recording. - /// </summary> - public string Id { get; set; } - - /// <summary> - /// Gets or sets the external identifier. - /// </summary> - /// <value>The external identifier.</value> - public string ExternalId { get; set; } - - /// <summary> - /// ChannelId of the recording. - /// </summary> - public string ChannelId { get; set; } - - /// <summary> - /// Gets or sets the external channel identifier. - /// </summary> - /// <value>The external channel identifier.</value> - public string ExternalChannelId { get; set; } - - /// <summary> - /// ChannelName of the recording. - /// </summary> - public string ChannelName { get; set; } - - /// <summary> - /// Gets or sets the program identifier. - /// </summary> - /// <value>The program identifier.</value> - public string ProgramId { get; set; } - - /// <summary> - /// Gets or sets the external program identifier. - /// </summary> - /// <value>The external program identifier.</value> - public string ExternalProgramId { get; set; } - - /// <summary> - /// Name of the recording. - /// </summary> - public string Name { get; set; } - - /// <summary> - /// Description of the recording. - /// </summary> - public string Overview { get; set; } - - /// <summary> - /// The start date of the recording, in UTC. - /// </summary> - public DateTime StartDate { get; set; } - - /// <summary> - /// The end date of the recording, in UTC. - /// </summary> - public DateTime EndDate { get; set; } - - /// <summary> - /// Gets or sets the name of the service. - /// </summary> - /// <value>The name of the service.</value> - public string ServiceName { get; set; } - - /// <summary> - /// Gets or sets the priority. - /// </summary> - /// <value>The priority.</value> - public int Priority { get; set; } - - /// <summary> - /// Gets or sets the pre padding seconds. - /// </summary> - /// <value>The pre padding seconds.</value> - public int PrePaddingSeconds { get; set; } - - /// <summary> - /// Gets or sets the post padding seconds. - /// </summary> - /// <value>The post padding seconds.</value> - public int PostPaddingSeconds { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is pre padding required. - /// </summary> - /// <value><c>true</c> if this instance is pre padding required; otherwise, <c>false</c>.</value> - public bool IsPrePaddingRequired { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is post padding required. - /// </summary> - /// <value><c>true</c> if this instance is post padding required; otherwise, <c>false</c>.</value> - public bool IsPostPaddingRequired { get; set; } - } } diff --git a/MediaBrowser.Model/LiveTv/TimerQuery.cs b/MediaBrowser.Model/LiveTv/TimerQuery.cs new file mode 100644 index 000000000..e6ceff530 --- /dev/null +++ b/MediaBrowser.Model/LiveTv/TimerQuery.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.LiveTv +{ + public class TimerQuery + { + /// <summary> + /// Gets or sets the channel identifier. + /// </summary> + /// <value>The channel identifier.</value> + public string ChannelId { get; set; } + + /// <summary> + /// Gets or sets the series timer identifier. + /// </summary> + /// <value>The series timer identifier.</value> + public string SeriesTimerId { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 1f7284422..748e5f0a8 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -57,35 +57,64 @@ <Compile Include="ApiClient\IApiClient.cs" /> <Compile Include="ApiClient\ApiClientExtensions.cs" /> <Compile Include="ApiClient\IServerEvents.cs" /> - <Compile Include="ApiClient\ServerEventArgs.cs" /> + <Compile Include="ApiClient\GeneralCommandEventArgs.cs" /> + <Compile Include="ApiClient\SessionUpdatesEventArgs.cs" /> + <Compile Include="Channels\ChannelItemQuery.cs" /> <Compile Include="Channels\ChannelQuery.cs" /> - <Compile Include="Configuration\AutoOrganize.cs" /> + <Compile Include="Configuration\TvFileOrganizationOptions.cs" /> <Compile Include="Configuration\BaseApplicationConfiguration.cs" /> <Compile Include="Configuration\DlnaOptions.cs" /> + <Compile Include="Configuration\EncodingQuality.cs" /> + <Compile Include="Configuration\ImageOption.cs" /> + <Compile Include="Configuration\ImageSavingConvention.cs" /> + <Compile Include="Configuration\LiveTvOptions.cs" /> <Compile Include="Configuration\MetadataPlugin.cs" /> <Compile Include="Configuration\MetadataOptions.cs" /> + <Compile Include="Configuration\MetadataPluginSummary.cs" /> + <Compile Include="Configuration\MetadataPluginType.cs" /> + <Compile Include="Configuration\NotificationOption.cs" /> <Compile Include="Configuration\NotificationOptions.cs" /> + <Compile Include="Configuration\NotificationType.cs" /> + <Compile Include="Configuration\PathSubstitution.cs" /> + <Compile Include="Configuration\SendToUserType.cs" /> <Compile Include="Configuration\ServerConfiguration.cs" /> + <Compile Include="Configuration\SubtitleOptions.cs" /> + <Compile Include="Configuration\UnratedItem.cs" /> + <Compile Include="Dlna\AudioOptions.cs" /> <Compile Include="Dlna\CodecProfile.cs" /> + <Compile Include="Dlna\CodecType.cs" /> <Compile Include="Dlna\ConditionProcessor.cs" /> <Compile Include="Dlna\ContainerProfile.cs" /> <Compile Include="Dlna\ContentFeatureBuilder.cs" /> <Compile Include="Dlna\DeviceIdentification.cs" /> <Compile Include="Dlna\DeviceProfile.cs" /> <Compile Include="Dlna\DeviceProfileInfo.cs" /> + <Compile Include="Dlna\DeviceProfileType.cs" /> <Compile Include="Dlna\DirectPlayProfile.cs" /> + <Compile Include="Dlna\DlnaFlags.cs" /> <Compile Include="Dlna\DlnaMaps.cs" /> + <Compile Include="Dlna\DlnaProfileType.cs" /> <Compile Include="Dlna\EventSubscription.cs" /> <Compile Include="Dlna\Filter.cs" /> + <Compile Include="Dlna\HeaderMatchType.cs" /> + <Compile Include="Dlna\HttpHeaderInfo.cs" /> <Compile Include="Dlna\MediaFormatProfile.cs" /> <Compile Include="Dlna\MediaFormatProfileResolver.cs" /> + <Compile Include="Dlna\ProfileCondition.cs" /> + <Compile Include="Dlna\ProfileConditionType.cs" /> + <Compile Include="Dlna\ProfileConditionValue.cs" /> <Compile Include="Dlna\ResponseProfile.cs" /> <Compile Include="Dlna\SearchCriteria.cs" /> + <Compile Include="Dlna\SearchType.cs" /> <Compile Include="Dlna\SortCriteria.cs" /> <Compile Include="Dlna\StreamBuilder.cs" /> <Compile Include="Dlna\StreamInfo.cs" /> + <Compile Include="Dlna\TranscodeSeekInfo.cs" /> <Compile Include="Dlna\TranscodingProfile.cs" /> + <Compile Include="Dlna\VideoOptions.cs" /> + <Compile Include="Dlna\XmlAttribute.cs" /> <Compile Include="Drawing\ImageOutputFormat.cs" /> + <Compile Include="Drawing\ImageSize.cs" /> <Compile Include="Dto\BaseItemPerson.cs" /> <Compile Include="Dto\ChapterInfoDto.cs" /> <Compile Include="Dto\GameSystemSummary.cs" /> @@ -94,26 +123,64 @@ <Compile Include="Dto\ItemByNameCounts.cs" /> <Compile Include="Dto\ItemCounts.cs" /> <Compile Include="Dto\ItemIndex.cs" /> + <Compile Include="Dto\RatingType.cs" /> <Compile Include="Dto\RecommendationDto.cs" /> - <Compile Include="Dto\MediaVersionInfo.cs" /> + <Compile Include="Dto\MediaSourceInfo.cs" /> + <Compile Include="Dto\RecommendationType.cs" /> + <Compile Include="Dto\SubtitleDownloadOptions.cs" /> + <Compile Include="Dto\VideoStreamOptions.cs" /> + <Compile Include="Entities\IsoType.cs" /> + <Compile Include="Entities\MediaInfo.cs" /> + <Compile Include="Entities\MediaStreamType.cs" /> <Compile Include="Entities\PackageReviewInfo.cs" /> + <Compile Include="Entities\ProviderIdsExtensions.cs" /> + <Compile Include="Entities\ScrollDirection.cs" /> + <Compile Include="Entities\SortOrder.cs" /> + <Compile Include="Entities\VideoSize.cs" /> <Compile Include="Events\GenericEventArgs.cs" /> + <Compile Include="FileOrganization\EpisodeFileOrganizationRequest.cs" /> <Compile Include="FileOrganization\FileOrganizationResult.cs" /> - <Compile Include="FileOrganization\FileOrganizationQuery.cs" /> + <Compile Include="FileOrganization\FileOrganizationResultQuery.cs" /> + <Compile Include="FileOrganization\FileOrganizerType.cs" /> + <Compile Include="FileOrganization\FileSortingStatus.cs" /> + <Compile Include="Globalization\LocalizatonOption.cs" /> + <Compile Include="IO\FileSystemEntryType.cs" /> <Compile Include="Library\PlayAccess.cs" /> + <Compile Include="LiveTv\BaseTimerInfoDto.cs" /> <Compile Include="LiveTv\ChannelInfoDto.cs" /> <Compile Include="LiveTv\ChannelQuery.cs" /> + <Compile Include="LiveTv\DayPattern.cs" /> + <Compile Include="LiveTv\GuideInfo.cs" /> + <Compile Include="LiveTv\LiveTvInfo.cs" /> + <Compile Include="LiveTv\LiveTvServiceStatus.cs" /> + <Compile Include="LiveTv\LiveTvTunerInfoDto.cs" /> + <Compile Include="LiveTv\LiveTvTunerStatus.cs" /> + <Compile Include="LiveTv\ProgramAudio.cs" /> <Compile Include="LiveTv\ProgramInfoDto.cs" /> <Compile Include="LiveTv\ProgramQuery.cs" /> + <Compile Include="LiveTv\RecommendedProgramQuery.cs" /> <Compile Include="LiveTv\RecordingGroupDto.cs" /> + <Compile Include="LiveTv\RecordingGroupQuery.cs" /> <Compile Include="LiveTv\RecordingQuery.cs" /> <Compile Include="LiveTv\RecordingStatus.cs" /> <Compile Include="LiveTv\SeriesTimerInfoDto.cs" /> + <Compile Include="LiveTv\SeriesTimerQuery.cs" /> <Compile Include="LiveTv\TimerInfoDto.cs" /> + <Compile Include="LiveTv\TimerQuery.cs" /> <Compile Include="Logging\NullLogger.cs" /> - <Compile Include="MediaInfo\Constants.cs" /> + <Compile Include="MediaInfo\AudioCodec.cs" /> + <Compile Include="MediaInfo\Container.cs" /> + <Compile Include="MediaInfo\SubtitleFormat.cs" /> + <Compile Include="MediaInfo\TransportStreamTimestamp.cs" /> + <Compile Include="MediaInfo\VideoCodec.cs" /> + <Compile Include="News\NewsChannel.cs" /> <Compile Include="News\NewsItem.cs" /> + <Compile Include="News\NewsQuery.cs" /> + <Compile Include="Notifications\NotificationRequest.cs" /> + <Compile Include="Notifications\NotificationServiceInfo.cs" /> + <Compile Include="Notifications\NotificationTypeInfo.cs" /> <Compile Include="Providers\ExternalIdInfo.cs" /> + <Compile Include="Providers\ExternalUrl.cs" /> <Compile Include="Providers\ImageProviderInfo.cs" /> <Compile Include="Providers\RemoteImageInfo.cs" /> <Compile Include="Dto\StudioDto.cs" /> @@ -138,9 +205,11 @@ <Compile Include="Notifications\NotificationQuery.cs" /> <Compile Include="Notifications\NotificationResult.cs" /> <Compile Include="Notifications\NotificationsSummary.cs" /> + <Compile Include="Providers\RemoteImageQuery.cs" /> <Compile Include="Providers\RemoteImageResult.cs" /> <Compile Include="Providers\RemoteSearchResult.cs" /> <Compile Include="Providers\RemoteSubtitleInfo.cs" /> + <Compile Include="Querying\AllThemeMediaResult.cs" /> <Compile Include="Querying\ArtistsQuery.cs" /> <Compile Include="Querying\EpisodeQuery.cs" /> <Compile Include="Querying\ItemCountsQuery.cs" /> @@ -148,14 +217,24 @@ <Compile Include="Entities\BaseItemInfo.cs" /> <Compile Include="Querying\NextUpQuery.cs" /> <Compile Include="Querying\QueryResult.cs" /> + <Compile Include="Querying\SeasonQuery.cs" /> <Compile Include="Querying\SessionQuery.cs" /> + <Compile Include="Querying\SimilarItemsByNameQuery.cs" /> <Compile Include="Querying\SimilarItemsQuery.cs" /> + <Compile Include="Querying\UpcomingEpisodesQuery.cs" /> <Compile Include="Querying\UserQuery.cs" /> <Compile Include="Search\SearchQuery.cs" /> <Compile Include="Session\BrowseRequest.cs" /> + <Compile Include="Session\ClientCapabilities.cs" /> <Compile Include="Session\GeneralCommand.cs" /> + <Compile Include="Session\GeneralCommandType.cs" /> <Compile Include="Session\MessageCommand.cs" /> - <Compile Include="Session\PlaybackReports.cs" /> + <Compile Include="Session\PlaybackProgressInfo.cs" /> + <Compile Include="Session\PlaybackStartInfo.cs" /> + <Compile Include="Session\PlaybackStopInfo.cs" /> + <Compile Include="Session\PlayCommand.cs" /> + <Compile Include="Session\PlayerStateInfo.cs" /> + <Compile Include="Session\PlayMethod.cs" /> <Compile Include="Session\PlayRequest.cs" /> <Compile Include="Session\PlaystateCommand.cs" /> <Compile Include="Logging\ILogManager.cs" /> @@ -184,22 +263,25 @@ <Compile Include="Net\NetworkShare.cs" /> <Compile Include="Net\NetworkShareType.cs" /> <Compile Include="Querying\PersonsQuery.cs" /> - <Compile Include="Querying\ThemeSongsResult.cs" /> + <Compile Include="Querying\ThemeMediaResult.cs" /> <Compile Include="Search\SearchHint.cs" /> <Compile Include="Search\SearchHintResult.cs" /> <Compile Include="Serialization\IJsonSerializer.cs" /> <Compile Include="Serialization\IXmlSerializer.cs" /> + <Compile Include="Session\PlaystateRequest.cs" /> <Compile Include="Session\SessionCapabilities.cs" /> <Compile Include="Session\SessionInfoDto.cs" /> + <Compile Include="Session\SessionUserInfo.cs" /> <Compile Include="Session\UserDataChangeInfo.cs" /> <Compile Include="Themes\AppTheme.cs" /> + <Compile Include="Themes\AppThemeInfo.cs" /> <Compile Include="Themes\ThemeImage.cs" /> <Compile Include="Updates\CheckForUpdateResult.cs" /> <Compile Include="Updates\PackageTargetSystem.cs" /> <Compile Include="Updates\InstallationInfo.cs" /> <Compile Include="Updates\PackageType.cs" /> <Compile Include="Updates\PackageVersionClass.cs" /> - <Compile Include="Entities\RequestResult.cs" /> + <Compile Include="Entities\EmptyRequestResult.cs" /> <Compile Include="Configuration\UserConfiguration.cs" /> <Compile Include="Drawing\DrawingUtils.cs" /> <Compile Include="Dto\UserItemDataDto.cs" /> diff --git a/MediaBrowser.Model/MediaInfo/AudioCodec.cs b/MediaBrowser.Model/MediaInfo/AudioCodec.cs new file mode 100644 index 000000000..a76c0e742 --- /dev/null +++ b/MediaBrowser.Model/MediaInfo/AudioCodec.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.MediaInfo +{ + public class AudioCodec + { + public const string AAC = "AAC"; + public const string MP3 = "MP3"; + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs index 01e75e6f8..963e8dd95 100644 --- a/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs +++ b/MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs @@ -34,11 +34,4 @@ namespace MediaBrowser.Model.MediaInfo /// <value>The chapters.</value> public List<double> Chapters { get; set; } } - - public enum TransportStreamTimestamp - { - None, - Zero, - Valid - } } diff --git a/MediaBrowser.Model/MediaInfo/Constants.cs b/MediaBrowser.Model/MediaInfo/Constants.cs deleted file mode 100644 index 8f2e36b39..000000000 --- a/MediaBrowser.Model/MediaInfo/Constants.cs +++ /dev/null @@ -1,29 +0,0 @@ - -namespace MediaBrowser.Model.MediaInfo -{ - public class Container - { - public const string MP4 = "MP4"; - } - - public class AudioCodec - { - public const string AAC = "AAC"; - public const string MP3 = "MP3"; - } - - public class VideoCodec - { - public const string H263 = "H263"; - public const string H264 = "H264"; - public const string H265 = "H265"; - public const string MPEG4 = "MPEG4"; - public const string MSMPEG4 = "MSMPEG4"; - public const string VC1 = "VC1"; - } - - public class SubtitleFormat - { - public const string SRT = "SRT"; - } -} diff --git a/MediaBrowser.Model/MediaInfo/Container.cs b/MediaBrowser.Model/MediaInfo/Container.cs new file mode 100644 index 000000000..0305b9cfa --- /dev/null +++ b/MediaBrowser.Model/MediaInfo/Container.cs @@ -0,0 +1,8 @@ + +namespace MediaBrowser.Model.MediaInfo +{ + public class Container + { + public const string MP4 = "MP4"; + } +} diff --git a/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs new file mode 100644 index 000000000..51a0dbc9e --- /dev/null +++ b/MediaBrowser.Model/MediaInfo/SubtitleFormat.cs @@ -0,0 +1,7 @@ +namespace MediaBrowser.Model.MediaInfo +{ + public class SubtitleFormat + { + public const string SRT = "SRT"; + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs new file mode 100644 index 000000000..4c808a8dc --- /dev/null +++ b/MediaBrowser.Model/MediaInfo/TransportStreamTimestamp.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.MediaInfo +{ + public enum TransportStreamTimestamp + { + None, + Zero, + Valid + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/MediaInfo/VideoCodec.cs b/MediaBrowser.Model/MediaInfo/VideoCodec.cs new file mode 100644 index 000000000..7405eb13e --- /dev/null +++ b/MediaBrowser.Model/MediaInfo/VideoCodec.cs @@ -0,0 +1,12 @@ +namespace MediaBrowser.Model.MediaInfo +{ + public class VideoCodec + { + public const string H263 = "H263"; + public const string H264 = "H264"; + public const string H265 = "H265"; + public const string MPEG4 = "MPEG4"; + public const string MSMPEG4 = "MSMPEG4"; + public const string VC1 = "VC1"; + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/News/NewsChannel.cs b/MediaBrowser.Model/News/NewsChannel.cs new file mode 100644 index 000000000..c3955b0a0 --- /dev/null +++ b/MediaBrowser.Model/News/NewsChannel.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Model.News +{ + public class NewsChannel + { + public string Title { get; set; } + public string Link { get; set; } + public string Description { get; set; } + public List<NewsItem> Items { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/News/NewsItem.cs b/MediaBrowser.Model/News/NewsItem.cs index 181f43db7..2a05c420a 100644 --- a/MediaBrowser.Model/News/NewsItem.cs +++ b/MediaBrowser.Model/News/NewsItem.cs @@ -1,16 +1,7 @@ using System; -using System.Collections.Generic; namespace MediaBrowser.Model.News { - public class NewsChannel - { - public string Title { get; set; } - public string Link { get; set; } - public string Description { get; set; } - public List<NewsItem> Items { get; set; } - } - public class NewsItem { public string Title { get; set; } @@ -20,11 +11,4 @@ namespace MediaBrowser.Model.News public string Guid { get; set; } public DateTime Date { get; set; } } - - public class NewsQuery - { - public int? StartIndex { get; set; } - - public int? Limit { get; set; } - } } diff --git a/MediaBrowser.Model/News/NewsQuery.cs b/MediaBrowser.Model/News/NewsQuery.cs new file mode 100644 index 000000000..567888921 --- /dev/null +++ b/MediaBrowser.Model/News/NewsQuery.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.News +{ + public class NewsQuery + { + public int? StartIndex { get; set; } + + public int? Limit { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Notifications/Notification.cs b/MediaBrowser.Model/Notifications/Notification.cs index d894911e7..731c3d303 100644 --- a/MediaBrowser.Model/Notifications/Notification.cs +++ b/MediaBrowser.Model/Notifications/Notification.cs @@ -1,6 +1,4 @@ -using MediaBrowser.Model.Configuration; -using System; -using System.Collections.Generic; +using System; namespace MediaBrowser.Model.Notifications { @@ -27,70 +25,4 @@ namespace MediaBrowser.Model.Notifications Date = DateTime.UtcNow; } } - - public class NotificationRequest - { - public string Name { get; set; } - - public string Description { get; set; } - - public string Url { get; set; } - - public NotificationLevel Level { get; set; } - - public List<string> UserIds { get; set; } - - public DateTime Date { get; set; } - - /// <summary> - /// The corresponding type name used in configuration. Not for display. - /// </summary> - public string NotificationType { get; set; } - - public Dictionary<string, string> Variables { get; set; } - - public SendToUserType? SendToUserMode { get; set; } - - public List<string> ExcludeUserIds { get; set; } - - public NotificationRequest() - { - UserIds = new List<string>(); - Date = DateTime.UtcNow; - - Variables = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); - - ExcludeUserIds = new List<string>(); - } - } - - public class NotificationTypeInfo - { - public string Type { get; set; } - - public string Name { get; set; } - - public bool Enabled { get; set; } - - public string Category { get; set; } - - public bool IsBasedOnUserEvent { get; set; } - - public string DefaultTitle { get; set; } - - public string DefaultDescription { get; set; } - - public List<string> Variables { get; set; } - - public NotificationTypeInfo() - { - Variables = new List<string>(); - } - } - - public class NotificationServiceInfo - { - public string Name { get; set; } - public string Id { get; set; } - } } diff --git a/MediaBrowser.Model/Notifications/NotificationRequest.cs b/MediaBrowser.Model/Notifications/NotificationRequest.cs new file mode 100644 index 000000000..d47e9c4f2 --- /dev/null +++ b/MediaBrowser.Model/Notifications/NotificationRequest.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using MediaBrowser.Model.Configuration; + +namespace MediaBrowser.Model.Notifications +{ + public class NotificationRequest + { + public string Name { get; set; } + + public string Description { get; set; } + + public string Url { get; set; } + + public NotificationLevel Level { get; set; } + + public List<string> UserIds { get; set; } + + public DateTime Date { get; set; } + + /// <summary> + /// The corresponding type name used in configuration. Not for display. + /// </summary> + public string NotificationType { get; set; } + + public Dictionary<string, string> Variables { get; set; } + + public SendToUserType? SendToUserMode { get; set; } + + public List<string> ExcludeUserIds { get; set; } + + public NotificationRequest() + { + UserIds = new List<string>(); + Date = DateTime.UtcNow; + + Variables = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); + + ExcludeUserIds = new List<string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs b/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs new file mode 100644 index 000000000..0ffe7d4ae --- /dev/null +++ b/MediaBrowser.Model/Notifications/NotificationServiceInfo.cs @@ -0,0 +1,8 @@ +namespace MediaBrowser.Model.Notifications +{ + public class NotificationServiceInfo + { + public string Name { get; set; } + public string Id { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs new file mode 100644 index 000000000..59b39fbc7 --- /dev/null +++ b/MediaBrowser.Model/Notifications/NotificationTypeInfo.cs @@ -0,0 +1,28 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Model.Notifications +{ + public class NotificationTypeInfo + { + public string Type { get; set; } + + public string Name { get; set; } + + public bool Enabled { get; set; } + + public string Category { get; set; } + + public bool IsBasedOnUserEvent { get; set; } + + public string DefaultTitle { get; set; } + + public string DefaultDescription { get; set; } + + public List<string> Variables { get; set; } + + public NotificationTypeInfo() + { + Variables = new List<string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Providers/ExternalIdInfo.cs b/MediaBrowser.Model/Providers/ExternalIdInfo.cs index e041f06af..2c5cfe91b 100644 --- a/MediaBrowser.Model/Providers/ExternalIdInfo.cs +++ b/MediaBrowser.Model/Providers/ExternalIdInfo.cs @@ -21,19 +21,4 @@ namespace MediaBrowser.Model.Providers /// <value>The URL format string.</value> public string UrlFormatString { get; set; } } - - public class ExternalUrl - { - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string Name { get; set; } - - /// <summary> - /// Gets or sets the type of the item. - /// </summary> - /// <value>The type of the item.</value> - public string Url { get; set; } - } } diff --git a/MediaBrowser.Model/Providers/ExternalUrl.cs b/MediaBrowser.Model/Providers/ExternalUrl.cs new file mode 100644 index 000000000..fb744f446 --- /dev/null +++ b/MediaBrowser.Model/Providers/ExternalUrl.cs @@ -0,0 +1,17 @@ +namespace MediaBrowser.Model.Providers +{ + public class ExternalUrl + { + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string Name { get; set; } + + /// <summary> + /// Gets or sets the type of the item. + /// </summary> + /// <value>The type of the item.</value> + public string Url { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Providers/RemoteImageQuery.cs b/MediaBrowser.Model/Providers/RemoteImageQuery.cs new file mode 100644 index 000000000..8d5231a25 --- /dev/null +++ b/MediaBrowser.Model/Providers/RemoteImageQuery.cs @@ -0,0 +1,15 @@ +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Model.Providers +{ + public class RemoteImageQuery + { + public string ProviderName { get; set; } + + public ImageType? ImageType { get; set; } + + public bool IncludeDisabledProviders { get; set; } + + public bool IncludeAllLanguages { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Providers/RemoteImageResult.cs b/MediaBrowser.Model/Providers/RemoteImageResult.cs index ed2788c0b..1c60db6ae 100644 --- a/MediaBrowser.Model/Providers/RemoteImageResult.cs +++ b/MediaBrowser.Model/Providers/RemoteImageResult.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using MediaBrowser.Model.Entities; namespace MediaBrowser.Model.Providers { @@ -26,15 +25,4 @@ namespace MediaBrowser.Model.Providers /// <value>The providers.</value> public List<string> Providers { get; set; } } - - public class RemoteImageQuery - { - public string ProviderName { get; set; } - - public ImageType? ImageType { get; set; } - - public bool IncludeDisabledProviders { get; set; } - - public bool IncludeAllLanguages { get; set; } - } } diff --git a/MediaBrowser.Model/Querying/ThemeSongsResult.cs b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs index 9b0a1c61b..89640eb65 100644 --- a/MediaBrowser.Model/Querying/ThemeSongsResult.cs +++ b/MediaBrowser.Model/Querying/AllThemeMediaResult.cs @@ -1,18 +1,5 @@ - -namespace MediaBrowser.Model.Querying +namespace MediaBrowser.Model.Querying { - /// <summary> - /// Class ThemeMediaResult - /// </summary> - public class ThemeMediaResult : ItemsResult - { - /// <summary> - /// Gets or sets the owner id. - /// </summary> - /// <value>The owner id.</value> - public string OwnerId { get; set; } - } - public class AllThemeMediaResult { public ThemeMediaResult ThemeVideosResult { get; set; } @@ -30,4 +17,4 @@ namespace MediaBrowser.Model.Querying SoundtrackSongsResult = new ThemeMediaResult(); } } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Querying/EpisodeQuery.cs b/MediaBrowser.Model/Querying/EpisodeQuery.cs index 589b46433..e2fc3220a 100644 --- a/MediaBrowser.Model/Querying/EpisodeQuery.cs +++ b/MediaBrowser.Model/Querying/EpisodeQuery.cs @@ -22,24 +22,4 @@ namespace MediaBrowser.Model.Querying Fields = new ItemFields[] { }; } } - - public class SeasonQuery - { - public string UserId { get; set; } - - public string SeriesId { get; set; } - - public bool? IsMissing { get; set; } - - public bool? IsVirtualUnaired { get; set; } - - public ItemFields[] Fields { get; set; } - - public bool? IsSpecialSeason { get; set; } - - public SeasonQuery() - { - Fields = new ItemFields[] { }; - } - } } diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs index 913fae4d9..0e9c9882f 100644 --- a/MediaBrowser.Model/Querying/NextUpQuery.cs +++ b/MediaBrowser.Model/Querying/NextUpQuery.cs @@ -39,38 +39,4 @@ namespace MediaBrowser.Model.Querying /// <value>The fields.</value> public ItemFields[] Fields { get; set; } } - - public class UpcomingEpisodesQuery - { - /// <summary> - /// Gets or sets the user id. - /// </summary> - /// <value>The user id.</value> - public string UserId { get; set; } - - /// <summary> - /// Gets or sets the parent identifier. - /// </summary> - /// <value>The parent identifier.</value> - public string ParentId { get; set; } - - /// <summary> - /// Skips over a given number of items within the results. Use for paging. - /// </summary> - /// <value>The start index.</value> - public int? StartIndex { get; set; } - - /// <summary> - /// The maximum number of items to return - /// </summary> - /// <value>The limit.</value> - public int? Limit { get; set; } - - /// <summary> - /// Fields to return within the items, in addition to basic information - /// </summary> - /// <value>The fields.</value> - public ItemFields[] Fields { get; set; } - } - } diff --git a/MediaBrowser.Model/Querying/SeasonQuery.cs b/MediaBrowser.Model/Querying/SeasonQuery.cs new file mode 100644 index 000000000..b1fe635bb --- /dev/null +++ b/MediaBrowser.Model/Querying/SeasonQuery.cs @@ -0,0 +1,22 @@ +namespace MediaBrowser.Model.Querying +{ + public class SeasonQuery + { + public string UserId { get; set; } + + public string SeriesId { get; set; } + + public bool? IsMissing { get; set; } + + public bool? IsVirtualUnaired { get; set; } + + public ItemFields[] Fields { get; set; } + + public bool? IsSpecialSeason { get; set; } + + public SeasonQuery() + { + Fields = new ItemFields[] { }; + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Querying/SimilarItemsByNameQuery.cs b/MediaBrowser.Model/Querying/SimilarItemsByNameQuery.cs new file mode 100644 index 000000000..7d0d4da31 --- /dev/null +++ b/MediaBrowser.Model/Querying/SimilarItemsByNameQuery.cs @@ -0,0 +1,29 @@ +namespace MediaBrowser.Model.Querying +{ + public class SimilarItemsByNameQuery + { + /// <summary> + /// The user to localize search results for + /// </summary> + /// <value>The user id.</value> + public string UserId { get; set; } + + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string Name { get; set; } + + /// <summary> + /// The maximum number of items to return + /// </summary> + /// <value>The limit.</value> + public int? Limit { get; set; } + + /// <summary> + /// Fields to return within the items, in addition to basic information + /// </summary> + /// <value>The fields.</value> + public ItemFields[] Fields { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs index d792aa76d..0dd491550 100644 --- a/MediaBrowser.Model/Querying/SimilarItemsQuery.cs +++ b/MediaBrowser.Model/Querying/SimilarItemsQuery.cs @@ -26,31 +26,4 @@ /// <value>The fields.</value> public ItemFields[] Fields { get; set; } } - - public class SimilarItemsByNameQuery - { - /// <summary> - /// The user to localize search results for - /// </summary> - /// <value>The user id.</value> - public string UserId { get; set; } - - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string Name { get; set; } - - /// <summary> - /// The maximum number of items to return - /// </summary> - /// <value>The limit.</value> - public int? Limit { get; set; } - - /// <summary> - /// Fields to return within the items, in addition to basic information - /// </summary> - /// <value>The fields.</value> - public ItemFields[] Fields { get; set; } - } } diff --git a/MediaBrowser.Model/Querying/ThemeMediaResult.cs b/MediaBrowser.Model/Querying/ThemeMediaResult.cs new file mode 100644 index 000000000..80478a910 --- /dev/null +++ b/MediaBrowser.Model/Querying/ThemeMediaResult.cs @@ -0,0 +1,15 @@ + +namespace MediaBrowser.Model.Querying +{ + /// <summary> + /// Class ThemeMediaResult + /// </summary> + public class ThemeMediaResult : ItemsResult + { + /// <summary> + /// Gets or sets the owner id. + /// </summary> + /// <value>The owner id.</value> + public string OwnerId { get; set; } + } +} diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs new file mode 100644 index 000000000..e5a875e88 --- /dev/null +++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs @@ -0,0 +1,35 @@ +namespace MediaBrowser.Model.Querying +{ + public class UpcomingEpisodesQuery + { + /// <summary> + /// Gets or sets the user id. + /// </summary> + /// <value>The user id.</value> + public string UserId { get; set; } + + /// <summary> + /// Gets or sets the parent identifier. + /// </summary> + /// <value>The parent identifier.</value> + public string ParentId { get; set; } + + /// <summary> + /// Skips over a given number of items within the results. Use for paging. + /// </summary> + /// <value>The start index.</value> + public int? StartIndex { get; set; } + + /// <summary> + /// The maximum number of items to return + /// </summary> + /// <value>The limit.</value> + public int? Limit { get; set; } + + /// <summary> + /// Fields to return within the items, in addition to basic information + /// </summary> + /// <value>The fields.</value> + public ItemFields[] Fields { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs new file mode 100644 index 000000000..5bee06087 --- /dev/null +++ b/MediaBrowser.Model/Session/ClientCapabilities.cs @@ -0,0 +1,16 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Model.Session +{ + public class ClientCapabilities + { + public List<string> PlayableMediaTypes { get; set; } + public List<string> SupportedCommands { get; set; } + + public ClientCapabilities() + { + PlayableMediaTypes = new List<string>(); + SupportedCommands = new List<string>(); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs index 98b3c50b3..7e818245d 100644 --- a/MediaBrowser.Model/Session/GeneralCommand.cs +++ b/MediaBrowser.Model/Session/GeneralCommand.cs @@ -16,40 +16,4 @@ namespace MediaBrowser.Model.Session Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); } } - - /// <summary> - /// This exists simply to identify a set of known commands. - /// </summary> - public enum GeneralCommandType - { - MoveUp = 0, - MoveDown = 1, - MoveLeft = 2, - MoveRight = 3, - PageUp = 4, - PageDown = 5, - PreviousLetter = 6, - NextLetter = 7, - ToggleOsd = 8, - ToggleContextMenu = 9, - Select = 10, - Back = 11, - TakeScreenshot = 12, - SendKey = 13, - SendString = 14, - GoHome = 15, - GoToSettings = 16, - VolumeUp = 17, - VolumeDown = 18, - Mute = 19, - Unmute = 20, - ToggleMute = 21, - SetVolume = 22, - SetAudioStreamIndex = 23, - SetSubtitleStreamIndex = 24, - ToggleFullscreen = 25, - DisplayContent = 26, - GoToSearch = 27, - DisplayMessage = 28 - } } diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs new file mode 100644 index 000000000..f8773a246 --- /dev/null +++ b/MediaBrowser.Model/Session/GeneralCommandType.cs @@ -0,0 +1,38 @@ +namespace MediaBrowser.Model.Session +{ + /// <summary> + /// This exists simply to identify a set of known commands. + /// </summary> + public enum GeneralCommandType + { + MoveUp = 0, + MoveDown = 1, + MoveLeft = 2, + MoveRight = 3, + PageUp = 4, + PageDown = 5, + PreviousLetter = 6, + NextLetter = 7, + ToggleOsd = 8, + ToggleContextMenu = 9, + Select = 10, + Back = 11, + TakeScreenshot = 12, + SendKey = 13, + SendString = 14, + GoHome = 15, + GoToSettings = 16, + VolumeUp = 17, + VolumeDown = 18, + Mute = 19, + Unmute = 20, + ToggleMute = 21, + SetVolume = 22, + SetAudioStreamIndex = 23, + SetSubtitleStreamIndex = 24, + ToggleFullscreen = 25, + DisplayContent = 26, + GoToSearch = 27, + DisplayMessage = 28 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlayCommand.cs b/MediaBrowser.Model/Session/PlayCommand.cs new file mode 100644 index 000000000..3a5a951d7 --- /dev/null +++ b/MediaBrowser.Model/Session/PlayCommand.cs @@ -0,0 +1,29 @@ +namespace MediaBrowser.Model.Session +{ + /// <summary> + /// Enum PlayCommand + /// </summary> + public enum PlayCommand + { + /// <summary> + /// The play now + /// </summary> + PlayNow = 0, + /// <summary> + /// The play next + /// </summary> + PlayNext = 1, + /// <summary> + /// The play last + /// </summary> + PlayLast = 2, + /// <summary> + /// The play instant mix + /// </summary> + PlayInstantMix = 3, + /// <summary> + /// The play shuffle + /// </summary> + PlayShuffle = 4 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlayMethod.cs b/MediaBrowser.Model/Session/PlayMethod.cs new file mode 100644 index 000000000..87b728627 --- /dev/null +++ b/MediaBrowser.Model/Session/PlayMethod.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.Session +{ + public enum PlayMethod + { + Transcode = 0, + DirectStream = 1, + DirectPlay = 2 + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs index 74d7a70a3..5db5e90cb 100644 --- a/MediaBrowser.Model/Session/PlayRequest.cs +++ b/MediaBrowser.Model/Session/PlayRequest.cs @@ -30,31 +30,4 @@ namespace MediaBrowser.Model.Session /// <value>The controlling user identifier.</value> public string ControllingUserId { get; set; } } - - /// <summary> - /// Enum PlayCommand - /// </summary> - public enum PlayCommand - { - /// <summary> - /// The play now - /// </summary> - PlayNow = 0, - /// <summary> - /// The play next - /// </summary> - PlayNext = 1, - /// <summary> - /// The play last - /// </summary> - PlayLast = 2, - /// <summary> - /// The play instant mix - /// </summary> - PlayInstantMix = 3, - /// <summary> - /// The play shuffle - /// </summary> - PlayShuffle = 4 - } }
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlaybackReports.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs index 93960076e..f04dea1ea 100644 --- a/MediaBrowser.Model/Session/PlaybackReports.cs +++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs @@ -1,26 +1,8 @@ using MediaBrowser.Model.Entities; -using System.Collections.Generic; namespace MediaBrowser.Model.Session { /// <summary> - /// Class PlaybackStartInfo. - /// </summary> - public class PlaybackStartInfo : PlaybackProgressInfo - { - public PlaybackStartInfo() - { - QueueableMediaTypes = new List<string>(); - } - - /// <summary> - /// Gets or sets the queueable media types. - /// </summary> - /// <value>The queueable media types.</value> - public List<string> QueueableMediaTypes { get; set; } - } - - /// <summary> /// Class PlaybackProgressInfo. /// </summary> public class PlaybackProgressInfo @@ -97,47 +79,4 @@ namespace MediaBrowser.Model.Session /// <value>The play method.</value> public PlayMethod PlayMethod { get; set; } } - - public enum PlayMethod - { - Transcode = 0, - DirectStream = 1, - DirectPlay = 2 - } - - /// <summary> - /// Class PlaybackStopInfo. - /// </summary> - public class PlaybackStopInfo - { - /// <summary> - /// Gets or sets the item. - /// </summary> - /// <value>The item.</value> - public BaseItemInfo Item { get; set; } - - /// <summary> - /// Gets or sets the item identifier. - /// </summary> - /// <value>The item identifier.</value> - public string ItemId { get; set; } - - /// <summary> - /// Gets or sets the session id. - /// </summary> - /// <value>The session id.</value> - public string SessionId { get; set; } - - /// <summary> - /// Gets or sets the media version identifier. - /// </summary> - /// <value>The media version identifier.</value> - public string MediaSourceId { get; set; } - - /// <summary> - /// Gets or sets the position ticks. - /// </summary> - /// <value>The position ticks.</value> - public long? PositionTicks { get; set; } - } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlaybackStartInfo.cs b/MediaBrowser.Model/Session/PlaybackStartInfo.cs new file mode 100644 index 000000000..d1ea2841e --- /dev/null +++ b/MediaBrowser.Model/Session/PlaybackStartInfo.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; + +namespace MediaBrowser.Model.Session +{ + /// <summary> + /// Class PlaybackStartInfo. + /// </summary> + public class PlaybackStartInfo : PlaybackProgressInfo + { + public PlaybackStartInfo() + { + QueueableMediaTypes = new List<string>(); + } + + /// <summary> + /// Gets or sets the queueable media types. + /// </summary> + /// <value>The queueable media types.</value> + public List<string> QueueableMediaTypes { get; set; } + } +} diff --git a/MediaBrowser.Model/Session/PlaybackStopInfo.cs b/MediaBrowser.Model/Session/PlaybackStopInfo.cs new file mode 100644 index 000000000..38025f183 --- /dev/null +++ b/MediaBrowser.Model/Session/PlaybackStopInfo.cs @@ -0,0 +1,40 @@ +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Model.Session +{ + /// <summary> + /// Class PlaybackStopInfo. + /// </summary> + public class PlaybackStopInfo + { + /// <summary> + /// Gets or sets the item. + /// </summary> + /// <value>The item.</value> + public BaseItemInfo Item { get; set; } + + /// <summary> + /// Gets or sets the item identifier. + /// </summary> + /// <value>The item identifier.</value> + public string ItemId { get; set; } + + /// <summary> + /// Gets or sets the session id. + /// </summary> + /// <value>The session id.</value> + public string SessionId { get; set; } + + /// <summary> + /// Gets or sets the media version identifier. + /// </summary> + /// <value>The media version identifier.</value> + public string MediaSourceId { get; set; } + + /// <summary> + /// Gets or sets the position ticks. + /// </summary> + /// <value>The position ticks.</value> + public long? PositionTicks { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlayerStateInfo.cs b/MediaBrowser.Model/Session/PlayerStateInfo.cs new file mode 100644 index 000000000..c9afef8e0 --- /dev/null +++ b/MediaBrowser.Model/Session/PlayerStateInfo.cs @@ -0,0 +1,59 @@ +namespace MediaBrowser.Model.Session +{ + public class PlayerStateInfo + { + /// <summary> + /// Gets or sets the now playing position ticks. + /// </summary> + /// <value>The now playing position ticks.</value> + public long? PositionTicks { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance can seek. + /// </summary> + /// <value><c>true</c> if this instance can seek; otherwise, <c>false</c>.</value> + public bool CanSeek { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance is paused. + /// </summary> + /// <value><c>true</c> if this instance is paused; otherwise, <c>false</c>.</value> + public bool IsPaused { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether this instance is muted. + /// </summary> + /// <value><c>true</c> if this instance is muted; otherwise, <c>false</c>.</value> + public bool IsMuted { get; set; } + + /// <summary> + /// Gets or sets the volume level. + /// </summary> + /// <value>The volume level.</value> + public int? VolumeLevel { get; set; } + + /// <summary> + /// Gets or sets the index of the now playing audio stream. + /// </summary> + /// <value>The index of the now playing audio stream.</value> + public int? AudioStreamIndex { get; set; } + + /// <summary> + /// Gets or sets the index of the now playing subtitle stream. + /// </summary> + /// <value>The index of the now playing subtitle stream.</value> + public int? SubtitleStreamIndex { get; set; } + + /// <summary> + /// Gets or sets the now playing media version identifier. + /// </summary> + /// <value>The now playing media version identifier.</value> + public string MediaSourceId { get; set; } + + /// <summary> + /// Gets or sets the play method. + /// </summary> + /// <value>The play method.</value> + public PlayMethod? PlayMethod { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs index 6466c6485..2af4f26e3 100644 --- a/MediaBrowser.Model/Session/PlaystateCommand.cs +++ b/MediaBrowser.Model/Session/PlaystateCommand.cs @@ -39,17 +39,4 @@ namespace MediaBrowser.Model.Session /// </summary> FastForward } - - public class PlaystateRequest - { - public PlaystateCommand Command { get; set; } - - public long? SeekPositionTicks { get; set; } - - /// <summary> - /// Gets or sets the controlling user identifier. - /// </summary> - /// <value>The controlling user identifier.</value> - public string ControllingUserId { get; set; } - } }
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlaystateRequest.cs b/MediaBrowser.Model/Session/PlaystateRequest.cs new file mode 100644 index 000000000..8a046b503 --- /dev/null +++ b/MediaBrowser.Model/Session/PlaystateRequest.cs @@ -0,0 +1,15 @@ +namespace MediaBrowser.Model.Session +{ + public class PlaystateRequest + { + public PlaystateCommand Command { get; set; } + + public long? SeekPositionTicks { get; set; } + + /// <summary> + /// Gets or sets the controlling user identifier. + /// </summary> + /// <value>The controlling user identifier.</value> + public string ControllingUserId { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs index 0dc119500..46e214d24 100644 --- a/MediaBrowser.Model/Session/SessionInfoDto.cs +++ b/MediaBrowser.Model/Session/SessionInfoDto.cs @@ -148,90 +148,4 @@ namespace MediaBrowser.Model.Session SupportedCommands = new List<string>(); } } - - /// <summary> - /// Class SessionUserInfo. - /// </summary> - public class SessionUserInfo - { - /// <summary> - /// Gets or sets the user identifier. - /// </summary> - /// <value>The user identifier.</value> - public string UserId { get; set; } - /// <summary> - /// Gets or sets the name of the user. - /// </summary> - /// <value>The name of the user.</value> - public string UserName { get; set; } - } - - public class ClientCapabilities - { - public List<string> PlayableMediaTypes { get; set; } - public List<string> SupportedCommands { get; set; } - - public ClientCapabilities() - { - PlayableMediaTypes = new List<string>(); - SupportedCommands = new List<string>(); - } - } - - public class PlayerStateInfo - { - /// <summary> - /// Gets or sets the now playing position ticks. - /// </summary> - /// <value>The now playing position ticks.</value> - public long? PositionTicks { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance can seek. - /// </summary> - /// <value><c>true</c> if this instance can seek; otherwise, <c>false</c>.</value> - public bool CanSeek { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is paused. - /// </summary> - /// <value><c>true</c> if this instance is paused; otherwise, <c>false</c>.</value> - public bool IsPaused { get; set; } - - /// <summary> - /// Gets or sets a value indicating whether this instance is muted. - /// </summary> - /// <value><c>true</c> if this instance is muted; otherwise, <c>false</c>.</value> - public bool IsMuted { get; set; } - - /// <summary> - /// Gets or sets the volume level. - /// </summary> - /// <value>The volume level.</value> - public int? VolumeLevel { get; set; } - - /// <summary> - /// Gets or sets the index of the now playing audio stream. - /// </summary> - /// <value>The index of the now playing audio stream.</value> - public int? AudioStreamIndex { get; set; } - - /// <summary> - /// Gets or sets the index of the now playing subtitle stream. - /// </summary> - /// <value>The index of the now playing subtitle stream.</value> - public int? SubtitleStreamIndex { get; set; } - - /// <summary> - /// Gets or sets the now playing media version identifier. - /// </summary> - /// <value>The now playing media version identifier.</value> - public string MediaSourceId { get; set; } - - /// <summary> - /// Gets or sets the play method. - /// </summary> - /// <value>The play method.</value> - public PlayMethod? PlayMethod { get; set; } - } } diff --git a/MediaBrowser.Model/Session/SessionUserInfo.cs b/MediaBrowser.Model/Session/SessionUserInfo.cs new file mode 100644 index 000000000..39b96931a --- /dev/null +++ b/MediaBrowser.Model/Session/SessionUserInfo.cs @@ -0,0 +1,19 @@ +namespace MediaBrowser.Model.Session +{ + /// <summary> + /// Class SessionUserInfo. + /// </summary> + public class SessionUserInfo + { + /// <summary> + /// Gets or sets the user identifier. + /// </summary> + /// <value>The user identifier.</value> + public string UserId { get; set; } + /// <summary> + /// Gets or sets the name of the user. + /// </summary> + /// <value>The name of the user.</value> + public string UserName { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Themes/AppTheme.cs b/MediaBrowser.Model/Themes/AppTheme.cs index a814fec33..40a729963 100644 --- a/MediaBrowser.Model/Themes/AppTheme.cs +++ b/MediaBrowser.Model/Themes/AppTheme.cs @@ -20,11 +20,4 @@ namespace MediaBrowser.Model.Themes Images = new List<ThemeImage>(); } } - - public class AppThemeInfo - { - public string AppName { get; set; } - - public string Name { get; set; } - } } diff --git a/MediaBrowser.Model/Themes/AppThemeInfo.cs b/MediaBrowser.Model/Themes/AppThemeInfo.cs new file mode 100644 index 000000000..bc359530a --- /dev/null +++ b/MediaBrowser.Model/Themes/AppThemeInfo.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.Themes +{ + public class AppThemeInfo + { + public string AppName { get; set; } + + public string Name { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs b/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs index 834fbcd31..915a27c11 100644 --- a/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs +++ b/MediaBrowser.Server.Implementations/Collections/CollectionsDynamicFolder.cs @@ -1,7 +1,6 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Controller.Entities; using System.IO; -using System.Linq; namespace MediaBrowser.Server.Implementations.Collections { @@ -26,30 +25,4 @@ namespace MediaBrowser.Server.Implementations.Collections }; } } - - public class ManualCollectionsFolder : BasePluginFolder - { - public ManualCollectionsFolder() - { - Name = "Collections"; - } - - public override bool IsVisible(User user) - { - if (!GetChildren(user, true).Any()) - { - return false; - } - - return base.IsVisible(user); - } - - public override bool IsHidden - { - get - { - return !ActualChildren.Any() || base.IsHidden; - } - } - } } diff --git a/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs new file mode 100644 index 000000000..e36c63b1c --- /dev/null +++ b/MediaBrowser.Server.Implementations/Collections/ManualCollectionsFolder.cs @@ -0,0 +1,31 @@ +using System.Linq; +using MediaBrowser.Controller.Entities; + +namespace MediaBrowser.Server.Implementations.Collections +{ + public class ManualCollectionsFolder : BasePluginFolder + { + public ManualCollectionsFolder() + { + Name = "Collections"; + } + + public override bool IsVisible(User user) + { + if (!GetChildren(user, true).Any()) + { + return false; + } + + return base.IsVisible(user); + } + + public override bool IsHidden + { + get + { + return !ActualChildren.Any() || base.IsHidden; + } + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs index 9d2de0f6d..9d2de0f6d 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs diff --git a/MediaBrowser.Server.Implementations/HttpServer/DelReceiveWebRequest.cs b/MediaBrowser.Server.Implementations/HttpServer/DelReceiveWebRequest.cs new file mode 100644 index 000000000..235910fed --- /dev/null +++ b/MediaBrowser.Server.Implementations/HttpServer/DelReceiveWebRequest.cs @@ -0,0 +1,6 @@ +using System.Net; + +namespace MediaBrowser.Server.Implementations.HttpServer +{ + public delegate void DelReceiveWebRequest(HttpListenerContext context); +}
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs b/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs new file mode 100644 index 000000000..36a257f63 --- /dev/null +++ b/MediaBrowser.Server.Implementations/HttpServer/GetSwaggerResource.cs @@ -0,0 +1,17 @@ +using ServiceStack; + +namespace MediaBrowser.Server.Implementations.HttpServer +{ + /// <summary> + /// Class GetDashboardResource + /// </summary> + [Route("/swagger-ui/{ResourceName*}", "GET")] + public class GetSwaggerResource + { + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string ResourceName { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs index cfe5ef4f0..0fc9265f6 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -25,8 +25,6 @@ using System.Threading.Tasks; namespace MediaBrowser.Server.Implementations.HttpServer { - public delegate void DelReceiveWebRequest(HttpListenerContext context); - public class HttpListenerHost : ServiceStackHost, IHttpServer { private string ServerName { get; set; } diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs new file mode 100644 index 000000000..40af3f3b0 --- /dev/null +++ b/MediaBrowser.Server.Implementations/HttpServer/ServerLogFactory.cs @@ -0,0 +1,46 @@ +using System; +using MediaBrowser.Model.Logging; +using ServiceStack.Logging; + +namespace MediaBrowser.Server.Implementations.HttpServer +{ + /// <summary> + /// Class ServerLogFactory + /// </summary> + public class ServerLogFactory : ILogFactory + { + /// <summary> + /// The _log manager + /// </summary> + private readonly ILogManager _logManager; + + /// <summary> + /// Initializes a new instance of the <see cref="ServerLogFactory"/> class. + /// </summary> + /// <param name="logManager">The log manager.</param> + public ServerLogFactory(ILogManager logManager) + { + _logManager = logManager; + } + + /// <summary> + /// Gets the logger. + /// </summary> + /// <param name="typeName">Name of the type.</param> + /// <returns>ILog.</returns> + public ILog GetLogger(string typeName) + { + return new ServerLogger(_logManager.GetLogger(typeName)); + } + + /// <summary> + /// Gets the logger. + /// </summary> + /// <param name="type">The type.</param> + /// <returns>ILog.</returns> + public ILog GetLogger(Type type) + { + return GetLogger(type.Name); + } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs index 7a4f922ed..bf7924784 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/ServerLogger.cs @@ -5,46 +5,6 @@ using System; namespace MediaBrowser.Server.Implementations.HttpServer { /// <summary> - /// Class ServerLogFactory - /// </summary> - public class ServerLogFactory : ILogFactory - { - /// <summary> - /// The _log manager - /// </summary> - private readonly ILogManager _logManager; - - /// <summary> - /// Initializes a new instance of the <see cref="ServerLogFactory"/> class. - /// </summary> - /// <param name="logManager">The log manager.</param> - public ServerLogFactory(ILogManager logManager) - { - _logManager = logManager; - } - - /// <summary> - /// Gets the logger. - /// </summary> - /// <param name="typeName">Name of the type.</param> - /// <returns>ILog.</returns> - public ILog GetLogger(string typeName) - { - return new ServerLogger(_logManager.GetLogger(typeName)); - } - - /// <summary> - /// Gets the logger. - /// </summary> - /// <param name="type">The type.</param> - /// <returns>ILog.</returns> - public ILog GetLogger(Type type) - { - return GetLogger(type.Name); - } - } - - /// <summary> /// Class ServerLogger /// </summary> public class ServerLogger : ILog diff --git a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs index 8f8505933..3764697f1 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/SwaggerService.cs @@ -1,24 +1,10 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Controller.Net; -using ServiceStack; using ServiceStack.Web; using System.IO; namespace MediaBrowser.Server.Implementations.HttpServer { - /// <summary> - /// Class GetDashboardResource - /// </summary> - [Route("/swagger-ui/{ResourceName*}", "GET")] - public class GetSwaggerResource - { - /// <summary> - /// Gets or sets the name. - /// </summary> - /// <value>The name.</value> - public string ResourceName { get; set; } - } - public class SwaggerService : IHasResultFactory, IRestfulService { private readonly IApplicationPaths _appPaths; diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseItemResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/ItemResolver.cs index a03eda263..a03eda263 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseItemResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/ItemResolver.cs diff --git a/MediaBrowser.Server.Implementations/Library/Validators/CountHelpers.cs b/MediaBrowser.Server.Implementations/Library/Validators/CountHelpers.cs deleted file mode 100644 index edb4e7382..000000000 --- a/MediaBrowser.Server.Implementations/Library/Validators/CountHelpers.cs +++ /dev/null @@ -1,171 +0,0 @@ -using MediaBrowser.Controller.Entities; -using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Controller.Entities.Movies; -using MediaBrowser.Controller.Entities.TV; -using MediaBrowser.Model.Dto; -using System; -using System.Collections.Generic; - -namespace MediaBrowser.Server.Implementations.Library.Validators -{ - /// <summary> - /// Class CountHelpers - /// </summary> - internal static class CountHelpers - { - private static CountType? GetCountType(BaseItem item) - { - if (item is Movie) - { - return CountType.Movie; - } - if (item is Episode) - { - return CountType.Episode; - } - if (item is Game) - { - return CountType.Game; - } - if (item is Audio) - { - return CountType.Song; - } - if (item is Trailer) - { - return CountType.Trailer; - } - if (item is Series) - { - return CountType.Series; - } - if (item is MusicAlbum) - { - return CountType.MusicAlbum; - } - if (item is MusicVideo) - { - return CountType.MusicVideo; - } - if (item is AdultVideo) - { - return CountType.AdultVideo; - } - - return null; - } - - /// <summary> - /// Increments the count. - /// </summary> - /// <param name="counts">The counts.</param> - /// <param name="key">The key.</param> - internal static void IncrementCount(Dictionary<CountType, int> counts, CountType key) - { - int count; - - if (counts.TryGetValue(key, out count)) - { - count++; - counts[key] = count; - } - else - { - counts.Add(key, 1); - } - } - - /// <summary> - /// Gets the counts. - /// </summary> - /// <param name="counts">The counts.</param> - /// <returns>ItemByNameCounts.</returns> - internal static ItemByNameCounts GetCounts(Dictionary<CountType, int> counts) - { - return new ItemByNameCounts - { - AdultVideoCount = GetCount(counts, CountType.AdultVideo), - AlbumCount = GetCount(counts, CountType.MusicAlbum), - EpisodeCount = GetCount(counts, CountType.Episode), - GameCount = GetCount(counts, CountType.Game), - MovieCount = GetCount(counts, CountType.Movie), - MusicVideoCount = GetCount(counts, CountType.MusicVideo), - SeriesCount = GetCount(counts, CountType.Series), - SongCount = GetCount(counts, CountType.Song), - TrailerCount = GetCount(counts, CountType.Trailer), - TotalCount = GetCount(counts, CountType.Total) - }; - } - - /// <summary> - /// Gets the count. - /// </summary> - /// <param name="counts">The counts.</param> - /// <param name="key">The key.</param> - /// <returns>System.Int32.</returns> - internal static int GetCount(Dictionary<CountType, int> counts, CountType key) - { - int count; - - if (counts.TryGetValue(key, out count)) - { - return count; - } - - return 0; - } - - /// <summary> - /// Sets the item counts. - /// </summary> - /// <param name="userId">The user id.</param> - /// <param name="media">The media.</param> - /// <param name="names">The names.</param> - /// <param name="masterDictionary">The master dictionary.</param> - internal static void SetItemCounts(Guid userId, BaseItem media, IEnumerable<string> names, Dictionary<string, Dictionary<Guid, Dictionary<CountType, int>>> masterDictionary) - { - var countType = GetCountType(media); - - foreach (var name in names) - { - Dictionary<Guid, Dictionary<CountType, int>> libraryCounts; - - if (!masterDictionary.TryGetValue(name, out libraryCounts)) - { - libraryCounts = new Dictionary<Guid, Dictionary<CountType, int>>(); - masterDictionary.Add(name, libraryCounts); - } - - var userLibId = userId/* ?? Guid.Empty*/; - Dictionary<CountType, int> userDictionary; - - if (!libraryCounts.TryGetValue(userLibId, out userDictionary)) - { - userDictionary = new Dictionary<CountType, int>(); - libraryCounts.Add(userLibId, userDictionary); - } - - if (countType.HasValue) - { - IncrementCount(userDictionary, countType.Value); - } - - IncrementCount(userDictionary, CountType.Total); - } - } - } - - internal enum CountType - { - AdultVideo, - MusicAlbum, - Episode, - Game, - Movie, - MusicVideo, - Series, - Song, - Trailer, - Total - } -} diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 74b8bf269..21fcd736f 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -104,6 +104,7 @@ <Compile Include="Channels\RefreshChannelsScheduledTask.cs" /> <Compile Include="Collections\CollectionManager.cs" /> <Compile Include="Collections\CollectionsDynamicFolder.cs" /> + <Compile Include="Collections\ManualCollectionsFolder.cs" /> <Compile Include="Configuration\ServerConfigurationManager.cs" /> <Compile Include="Drawing\ImageHeader.cs" /> <Compile Include="Drawing\PercentPlayedDrawer.cs" /> @@ -114,7 +115,7 @@ <Compile Include="EntryPoints\ExternalPortForwarding.cs" /> <Compile Include="EntryPoints\LibraryChangedNotifier.cs" /> <Compile Include="EntryPoints\LoadRegistrations.cs" /> - <Compile Include="EntryPoints\Notifications\Notifier.cs" /> + <Compile Include="EntryPoints\Notifications\Notifications.cs" /> <Compile Include="EntryPoints\Notifications\RemoteNotifications.cs" /> <Compile Include="EntryPoints\Notifications\WebSocketNotifier.cs" /> <Compile Include="EntryPoints\RefreshUsersMetadata.cs" /> @@ -128,6 +129,8 @@ <Compile Include="EntryPoints\UserDataChangeNotifier.cs" /> <Compile Include="FileOrganization\OrganizerScheduledTask.cs" /> <Compile Include="HttpServer\ContainerAdapter.cs" /> + <Compile Include="HttpServer\DelReceiveWebRequest.cs" /> + <Compile Include="HttpServer\GetSwaggerResource.cs" /> <Compile Include="HttpServer\HttpListenerHost.cs" /> <Compile Include="HttpServer\HttpResultFactory.cs" /> <Compile Include="HttpServer\LoggerUtils.cs" /> @@ -135,6 +138,7 @@ <Compile Include="HttpServer\RangeRequestWriter.cs" /> <Compile Include="HttpServer\ResponseFilter.cs" /> <Compile Include="HttpServer\ServerFactory.cs" /> + <Compile Include="HttpServer\ServerLogFactory.cs" /> <Compile Include="HttpServer\ServerLogger.cs" /> <Compile Include="HttpServer\StreamWriter.cs" /> <Compile Include="HttpServer\SwaggerService.cs" /> @@ -149,7 +153,7 @@ <Compile Include="Library\Resolvers\Audio\AudioResolver.cs" /> <Compile Include="Library\Resolvers\Audio\MusicAlbumResolver.cs" /> <Compile Include="Library\Resolvers\Audio\MusicArtistResolver.cs" /> - <Compile Include="Library\Resolvers\BaseItemResolver.cs" /> + <Compile Include="Library\Resolvers\ItemResolver.cs" /> <Compile Include="Library\Resolvers\FolderResolver.cs" /> <Compile Include="Library\Resolvers\LocalTrailerResolver.cs" /> <Compile Include="Library\Resolvers\Movies\BoxSetResolver.cs" /> @@ -163,7 +167,6 @@ <Compile Include="Library\Validators\ArtistsPostScanTask.cs" /> <Compile Include="Library\Validators\ArtistsValidator.cs" /> <Compile Include="Library\Validators\BoxSetPostScanTask.cs" /> - <Compile Include="Library\Validators\CountHelpers.cs" /> <Compile Include="Library\Validators\GameGenresPostScanTask.cs" /> <Compile Include="Library\Validators\GameGenresValidator.cs" /> <Compile Include="Library\Validators\GenresPostScanTask.cs" /> @@ -225,6 +228,7 @@ <Compile Include="Sorting\DatePlayedComparer.cs" /> <Compile Include="Sorting\GameSystemComparer.cs" /> <Compile Include="Sorting\IsFolderComparer.cs" /> + <Compile Include="Sorting\IsPlayedComparer.cs" /> <Compile Include="Sorting\IsUnplayedComparer.cs" /> <Compile Include="Sorting\MetascoreComparer.cs" /> <Compile Include="Sorting\NameComparer.cs" /> diff --git a/MediaBrowser.Server.Implementations/Sorting/IsPlayedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/IsPlayedComparer.cs new file mode 100644 index 000000000..aebfbdb1c --- /dev/null +++ b/MediaBrowser.Server.Implementations/Sorting/IsPlayedComparer.cs @@ -0,0 +1,58 @@ +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Sorting; +using MediaBrowser.Model.Querying; + +namespace MediaBrowser.Server.Implementations.Sorting +{ + public class IsPlayedComparer : IUserBaseItemComparer + { + /// <summary> + /// Gets or sets the user. + /// </summary> + /// <value>The user.</value> + public User User { get; set; } + + /// <summary> + /// Compares the specified x. + /// </summary> + /// <param name="x">The x.</param> + /// <param name="y">The y.</param> + /// <returns>System.Int32.</returns> + public int Compare(BaseItem x, BaseItem y) + { + return GetValue(x).CompareTo(GetValue(y)); + } + + /// <summary> + /// Gets the date. + /// </summary> + /// <param name="x">The x.</param> + /// <returns>DateTime.</returns> + private int GetValue(BaseItem x) + { + return x.IsPlayed(User) ? 0 : 1; + } + + /// <summary> + /// Gets the name. + /// </summary> + /// <value>The name.</value> + public string Name + { + get { return ItemSortBy.IsUnplayed; } + } + + /// <summary> + /// Gets or sets the user data repository. + /// </summary> + /// <value>The user data repository.</value> + public IUserDataManager UserDataRepository { get; set; } + + /// <summary> + /// Gets or sets the user manager. + /// </summary> + /// <value>The user manager.</value> + public IUserManager UserManager { get; set; } + } +}
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs index e3053155f..f1c6a5a4e 100644 --- a/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs +++ b/MediaBrowser.Server.Implementations/Sorting/IsUnplayedComparer.cs @@ -55,55 +55,4 @@ namespace MediaBrowser.Server.Implementations.Sorting /// <value>The user manager.</value> public IUserManager UserManager { get; set; } } - - public class IsPlayedComparer : IUserBaseItemComparer - { - /// <summary> - /// Gets or sets the user. - /// </summary> - /// <value>The user.</value> - public User User { get; set; } - - /// <summary> - /// Compares the specified x. - /// </summary> - /// <param name="x">The x.</param> - /// <param name="y">The y.</param> - /// <returns>System.Int32.</returns> - public int Compare(BaseItem x, BaseItem y) - { - return GetValue(x).CompareTo(GetValue(y)); - } - - /// <summary> - /// Gets the date. - /// </summary> - /// <param name="x">The x.</param> - /// <returns>DateTime.</returns> - private int GetValue(BaseItem x) - { - return x.IsPlayed(User) ? 0 : 1; - } - - /// <summary> - /// Gets the name. - /// </summary> - /// <value>The name.</value> - public string Name - { - get { return ItemSortBy.IsUnplayed; } - } - - /// <summary> - /// Gets or sets the user data repository. - /// </summary> - /// <value>The user data repository.</value> - public IUserDataManager UserDataRepository { get; set; } - - /// <summary> - /// Gets or sets the user manager. - /// </summary> - /// <value>The user manager.</value> - public IUserManager UserManager { get; set; } - } } |