From b7a6a1d5740e81e7c3da68c3cc8bbe7d112396b0 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Mon, 4 Mar 2013 11:09:15 -0500 Subject: Refactor art download options (still need config changes) --- .../Configuration/ServerConfiguration.cs | 84 +++++----------------- 1 file changed, 17 insertions(+), 67 deletions(-) (limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs') diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 71f368397..5930920fb 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Model.Updates; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Updates; using MediaBrowser.Model.Weather; using ProtoBuf; using System; @@ -96,88 +97,34 @@ namespace MediaBrowser.Model.Configuration public int MaxBackdrops { get; set; } /// - /// Gets or sets a value indicating whether [download movie art]. + /// Options for specific art to download for movies. /// - /// true if [download movie art]; otherwise, false. [ProtoMember(40)] - public bool DownloadMovieArt { get; set; } + public ImageDownloadOptions DownloadMovieImages { get; set; } /// - /// Gets or sets a value indicating whether [download movie logo]. + /// Options for specific art to download for Series. /// - /// true if [download movie logo]; otherwise, false. [ProtoMember(41)] - public bool DownloadMovieLogo { get; set; } + public ImageDownloadOptions DownloadSeriesImages { get; set; } /// - /// Gets or sets a value indicating whether [download movie disc]. + /// Options for specific art to download for Seasons. /// - /// true if [download movie disc]; otherwise, false. [ProtoMember(42)] - public bool DownloadMovieDisc { get; set; } + public ImageDownloadOptions DownloadSeasonImages { get; set; } /// - /// Gets or sets a value indicating whether [download TV art]. + /// Options for specific art to download for MusicArtists. /// - /// true if [download TV art]; otherwise, false. [ProtoMember(43)] - public bool DownloadTVArt { get; set; } + public ImageDownloadOptions DownloadMusicArtistImages { get; set; } /// - /// Gets or sets a value indicating whether [download TV logo]. + /// Options for specific art to download for MusicAlbums. /// - /// true if [download TV logo]; otherwise, false. [ProtoMember(44)] - public bool DownloadTVLogo { get; set; } - - /// - /// Gets or sets a value indicating whether [download TV thumb]. - /// - /// true if [download TV thumb]; otherwise, false. - [ProtoMember(45)] - public bool DownloadTVThumb { get; set; } - - /// - /// Gets or sets a value indicating whether [download movie banner]. - /// - /// true if [download movie banner]; otherwise, false. - [ProtoMember(46)] - public bool DownloadMovieBanner { get; set; } - - /// - /// Gets or sets a value indicating whether [download movie thumb]. - /// - /// true if [download movie thumb]; otherwise, false. - [ProtoMember(47)] - public bool DownloadMovieThumb { get; set; } - - /// - /// Gets or sets a value indicating whether [download TV banner]. - /// - /// true if [download TV banner]; otherwise, false. - [ProtoMember(48)] - public bool DownloadTVBanner { get; set; } - - /// - /// Gets or sets a value indicating whether [download TV season banner]. - /// - /// true if [download TV season banner]; otherwise, false. - [ProtoMember(49)] - public bool DownloadTVSeasonBanner { get; set; } - - /// - /// Gets or sets a value indicating whether [download TV season thumb]. - /// - /// true if [download TV season thumb]; otherwise, false. - [ProtoMember(50)] - public bool DownloadTVSeasonThumb { get; set; } - - /// - /// Gets or sets a value indicating whether [download TV season backdrops]. - /// - /// true if [download TV season banner]; otherwise, false. - [ProtoMember(51)] - public bool DownloadTVSeasonBackdrops { get; set; } + public ImageDownloadOptions DownloadMusicAlbumImages { get; set; } /// /// Gets or sets a value indicating whether [download TV season backdrops]. @@ -330,8 +277,11 @@ namespace MediaBrowser.Model.Configuration TmdbFetchedProfileSize = "w185"; //w185 w45 h632 or original TmdbFetchedPosterSize = "w500"; //w500, w342, w185 or original TmdbFetchedBackdropSize = "w1280"; //w1280, w780 or original - DownloadTVSeasonBanner = true; - DownloadTVBanner = true; + DownloadMovieImages = new ImageDownloadOptions {Backdrops = true, Primary = true}; + DownloadSeriesImages = new ImageDownloadOptions {Backdrops = true, Primary = true, Banner = true, Logo = true}; + DownloadSeasonImages = new ImageDownloadOptions {Backdrops = false, Primary = true, Banner = true}; + DownloadMusicArtistImages = new ImageDownloadOptions {Backdrops = true, Primary = true, Banner = true}; + DownloadMusicAlbumImages = new ImageDownloadOptions {Backdrops = true, Primary = false}; DownloadHDFanArt = true; MaxBackdrops = 4; -- cgit v1.2.3 From 62448129a66f50b6ac2874c6da514399f974340e Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Mon, 4 Mar 2013 11:59:35 -0500 Subject: Config page changes for image options --- .../Configuration/ServerConfiguration.cs | 2 +- MediaBrowser.WebDashboard/Html/metadataImages.html | 100 +++++++++++++++------ .../Html/scripts/MetadataImagesPage.js | 60 ++++++++----- 3 files changed, 111 insertions(+), 51 deletions(-) (limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs') diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 5930920fb..ff7f5221b 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -280,7 +280,7 @@ namespace MediaBrowser.Model.Configuration DownloadMovieImages = new ImageDownloadOptions {Backdrops = true, Primary = true}; DownloadSeriesImages = new ImageDownloadOptions {Backdrops = true, Primary = true, Banner = true, Logo = true}; DownloadSeasonImages = new ImageDownloadOptions {Backdrops = false, Primary = true, Banner = true}; - DownloadMusicArtistImages = new ImageDownloadOptions {Backdrops = true, Primary = true, Banner = true}; + DownloadMusicArtistImages = new ImageDownloadOptions {Backdrops = true, Primary = true, Banner = true, Thumb = true}; DownloadMusicAlbumImages = new ImageDownloadOptions {Backdrops = true, Primary = false}; DownloadHDFanArt = true; MaxBackdrops = 4; diff --git a/MediaBrowser.WebDashboard/Html/metadataImages.html b/MediaBrowser.WebDashboard/Html/metadataImages.html index 5c9e7e02d..b06a3205b 100644 --- a/MediaBrowser.WebDashboard/Html/metadataImages.html +++ b/MediaBrowser.WebDashboard/Html/metadataImages.html @@ -30,44 +30,92 @@
  • -
    + +
    +

    Movies

    +
    + + - - + + - - + + - - + + - - + + - - + +
    +
    - - +
    +

    TV Series

    +
    + + - - + + - - + + - - + + +
    +
    - - - - +
    +

    TV Seasons

    +
    + + + + + + + + +
    + +
    + +
    +

    Music Artists

    +
    + + + + + + + + + + + +
    + +
    + +
    +

    Music Albums

    +
    + + + + + +
    + +
    - - -
  • diff --git a/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js b/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js index c9f2523f7..0dff46c39 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js @@ -20,18 +20,24 @@ $('#chkRefreshItemImages', page).checked(config.RefreshItemImages).checkboxradio("refresh"); $('#txtNumbackdrops', page).val(config.MaxBackdrops); - $('#chkDownloadMovieArt', page).checked(config.DownloadMovieArt).checkboxradio("refresh"); - $('#chkDownloadMovieBanner', page).checked(config.DownloadMovieBanner).checkboxradio("refresh"); - $('#chkDownloadMovieDisc', page).checked(config.DownloadMovieDisc).checkboxradio("refresh"); - $('#chkDownloadMovieLogo', page).checked(config.DownloadMovieLogo).checkboxradio("refresh"); - $('#chkDownloadMovieThumb', page).checked(config.DownloadMovieThumb).checkboxradio("refresh"); - $('#chKDownloadTVArt', page).checked(config.DownloadTVArt).checkboxradio("refresh"); - $('#chkDownloadTVBanner', page).checked(config.DownloadTVBanner).checkboxradio("refresh"); - $('#chkDownloadTVLogo', page).checked(config.DownloadTVLogo).checkboxradio("refresh"); - $('#chkDownloadTVThumb', page).checked(config.DownloadTVThumb).checkboxradio("refresh"); - $('#chkDownloadSeasonBanner', page).checked(config.DownloadTVSeasonBanner).checkboxradio("refresh"); - $('#chkDownloadSeasonThumb', page).checked(config.DownloadTVSeasonThumb).checkboxradio("refresh"); - $('#chkDownloadSeasonBackdrops', page).checked(config.DownloadTVSeasonBackdrops).checkboxradio("refresh"); + $('#chkDownloadMovieArt', page).checked(config.DownloadMovieImages.Art).checkboxradio("refresh"); + $('#chkDownloadMovieBanner', page).checked(config.DownloadMovieImages.Banner).checkboxradio("refresh"); + $('#chkDownloadMovieDisc', page).checked(config.DownloadMovieImages.Disc).checkboxradio("refresh"); + $('#chkDownloadMovieLogo', page).checked(config.DownloadMovieImages.Logo).checkboxradio("refresh"); + $('#chkDownloadMovieThumb', page).checked(config.DownloadMovieImages.Thumb).checkboxradio("refresh"); + $('#chKDownloadTVArt', page).checked(config.DownloadSeriesImages.Art).checkboxradio("refresh"); + $('#chkDownloadTVBanner', page).checked(config.DownloadSeriesImages.Banner).checkboxradio("refresh"); + $('#chkDownloadTVLogo', page).checked(config.DownloadSeriesImages.Logo).checkboxradio("refresh"); + $('#chkDownloadTVThumb', page).checked(config.DownloadSeriesImages.Thumb).checkboxradio("refresh"); + $('#chkDownloadSeasonBanner', page).checked(config.DownloadSeasonImages.Banner).checkboxradio("refresh"); + $('#chkDownloadSeasonThumb', page).checked(config.DownloadSeasonImages.Thumb).checkboxradio("refresh"); + $('#chkDownloadSeasonBackdrops', page).checked(config.DownloadSeasonImages.Backdrops).checkboxradio("refresh"); + $('#chkDownloadArtistThumb', page).checked(config.DownloadMusicArtistImages.Thumb).checkboxradio("refresh"); + $('#chkDownloadArtistBackdrops', page).checked(config.DownloadMusicArtistImages.Backdrops).checkboxradio("refresh"); + $('#chkDownloadArtistLogo', page).checked(config.DownloadMusicArtistImages.Logo).checkboxradio("refresh"); + $('#chkDownloadArtistBanner', page).checked(config.DownloadMusicArtistImages.Banner).checkboxradio("refresh"); + $('#chkDownloadAlbumPrimary', page).checked(config.DownloadMusicAlbumImages.Primary).checkboxradio("refresh"); + $('#chkDownloadAlbumBackdrops', page).checked(config.DownloadMusicAlbumImages.Backdrops).checkboxradio("refresh"); Dashboard.hideLoadingMsg(); }, @@ -50,18 +56,24 @@ config.RefreshItemImages = $('#chkRefreshItemImages', form).checked(); config.MaxBackdrops = $('#txtNumbackdrops', form).val(); - config.DownloadMovieArt = $('#chkDownloadMovieArt', form).checked(); - config.DownloadMovieBanner = $('#chkDownloadMovieBanner', form).checked(); - config.DownloadMovieDisc = $('#chkDownloadMovieDisc', form).checked(); - config.DownloadMovieLogo = $('#chkDownloadMovieLogo', form).checked(); - config.DownloadMovieThumb = $('#chkDownloadMovieThumb', form).checked(); - config.DownloadTVArt = $('#chKDownloadTVArt', form).checked(); - config.DownloadTVBanner = $('#chkDownloadTVBanner', form).checked(); - config.DownloadTVLogo = $('#chkDownloadTVLogo', form).checked(); - config.DownloadTVThumb = $('#chkDownloadTVThumb', form).checked(); - config.DownloadTVSeasonBanner = $('#chkDownloadSeasonBanner', form).checked(); - config.DownloadTVSeasonThumb = $('#chkDownloadSeasonThumb', form).checked(); - config.DownloadTVSeasonBackdrops = $('#chkDownloadSeasonBackdrops', form).checked(); + config.DownloadMovieImages.Art = $('#chkDownloadMovieArt', form).checked(); + config.DownloadMovieImages.Banner = $('#chkDownloadMovieBanner', form).checked(); + config.DownloadMovieImages.Disc = $('#chkDownloadMovieDisc', form).checked(); + config.DownloadMovieImages.Logo = $('#chkDownloadMovieLogo', form).checked(); + config.DownloadMovieImages.Thumb = $('#chkDownloadMovieThumb', form).checked(); + config.DownloadSeriesImages.Art = $('#chKDownloadTVArt', form).checked(); + config.DownloadSeriesImages.Banner = $('#chkDownloadTVBanner', form).checked(); + config.DownloadSeriesImages.Logo = $('#chkDownloadTVLogo', form).checked(); + config.DownloadSeriesImages.Thumb = $('#chkDownloadTVThumb', form).checked(); + config.DownloadSeasonImages.Banner = $('#chkDownloadSeasonBanner', form).checked(); + config.DownloadSeasonImages.Thumb = $('#chkDownloadSeasonThumb', form).checked(); + config.DownloadSeasonImages.Backdrops = $('#chkDownloadSeasonBackdrops', form).checked(); + config.DownloadMusicArtistImages.Backdrops = $('#chkDownloadArtistBackdrops', form).checked(); + config.DownloadMusicArtistImages.Logo = $('#chkDownloadArtistLogo', form).checked(); + config.DownloadMusicArtistImages.Thumb = $('#chkDownloadArtistThumb', form).checked(); + config.DownloadMusicArtistImages.Banner = $('#chkDownloadArtistBanner', form).checked(); + config.DownloadMusicAlbumImages.Primary = $('#chkDownloadAlbumPrimary', form).checked(); + config.DownloadMusicAlbumImages.Backdrops = $('#chkDownloadAlbumBackdrops', form).checked(); ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); -- cgit v1.2.3