sync updates

This commit is contained in:
Luke Pulverenti 2015-02-10 22:28:34 -05:00
parent f1a715b836
commit 5d4fec778c
11 changed files with 47 additions and 35 deletions

View File

@ -44,6 +44,11 @@ namespace MediaBrowser.Controller.Channels
/// </summary> /// </summary>
/// <value>The daily download limit.</value> /// <value>The daily download limit.</value>
public int? DailyDownloadLimit { get; set; } public int? DailyDownloadLimit { get; set; }
/// <summary>
/// Gets or sets a value indicating whether [supports downloading].
/// </summary>
/// <value><c>true</c> if [supports downloading]; otherwise, <c>false</c>.</value>
public bool SupportsContentDownloading { get; set; }
public InternalChannelFeatures() public InternalChannelFeatures()
{ {

View File

@ -170,23 +170,29 @@ namespace MediaBrowser.Server.Implementations.Channels
foreach (var item in result.Items) foreach (var item in result.Items)
{ {
var channelItem = (IChannelItem)item; var channelItem = (IChannelItem)item;
if (options.DownloadingChannels.Contains(channelItem.ChannelId))
var channelFeatures = _manager.GetChannelFeatures(channelItem.ChannelId);
if (channelFeatures.SupportsContentDownloading)
{ {
try if (options.DownloadingChannels.Contains(channelItem.ChannelId))
{ {
await DownloadChannelItem(item, options, cancellationToken, path); try
} {
catch (OperationCanceledException) await DownloadChannelItem(item, options, cancellationToken, path);
{ }
break; catch (OperationCanceledException)
} {
catch (ChannelDownloadException) break;
{ }
// Logged at lower levels catch (ChannelDownloadException)
} {
catch (Exception ex) // Logged at lower levels
{ }
_logger.ErrorException("Error downloading channel content for {0}", ex, item.Name); catch (Exception ex)
{
_logger.ErrorException("Error downloading channel content for {0}", ex, item.Name);
}
} }
} }

View File

@ -508,7 +508,7 @@ namespace MediaBrowser.Server.Implementations.Channels
SupportsLatestMedia = supportsLatest, SupportsLatestMedia = supportsLatest,
Name = channel.Name, Name = channel.Name,
Id = channel.Id.ToString("N"), Id = channel.Id.ToString("N"),
SupportsContentDownloading = isIndexable || supportsLatest, SupportsContentDownloading = features.SupportsContentDownloading && (isIndexable || supportsLatest),
AutoRefreshLevels = features.AutoRefreshLevels AutoRefreshLevels = features.AutoRefreshLevels
}; };
} }

View File

@ -956,6 +956,10 @@ namespace MediaBrowser.Server.Implementations.Connect
_data.LastAuthorizationsRefresh = DateTime.UtcNow; _data.LastAuthorizationsRefresh = DateTime.UtcNow;
CacheData(); CacheData();
} }
catch (Exception ex)
{
_logger.ErrorException("Error refreshing authorization", ex);
}
finally finally
{ {
_operationLock.Release(); _operationLock.Release();

View File

@ -669,11 +669,6 @@ namespace MediaBrowser.Server.Implementations.Library
throw new ArgumentNullException("newPasswordSha1"); throw new ArgumentNullException("newPasswordSha1");
} }
if (user.ConnectLinkType.HasValue && user.ConnectLinkType.Value == UserLinkType.Guest)
{
throw new ArgumentException("Passwords for guests cannot be changed.");
}
user.EasyPassword = newPasswordSha1; user.EasyPassword = newPasswordSha1;
await UpdateUser(user).ConfigureAwait(false); await UpdateUser(user).ConfigureAwait(false);

View File

@ -70,6 +70,7 @@
"HeaderSelectCertificatePath": "Select Certificate Path", "HeaderSelectCertificatePath": "Select Certificate Path",
"ConfirmMessageScheduledTaskButton": "This operation normally runs automatically as a scheduled task. It can also be run manually here. To configure the scheduled task, see:", "ConfirmMessageScheduledTaskButton": "This operation normally runs automatically as a scheduled task. It can also be run manually here. To configure the scheduled task, see:",
"HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to premium plugins, internet channel content, and more. {0}Learn more{1}.", "HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to premium plugins, internet channel content, and more. {0}Learn more{1}.",
"LabelSyncNoTargetsHelp": "It looks like you don't currently have any apps that support sync.",
"HeaderWelcomeToMediaBrowserServerDashboard": "Welcome to the Media Browser Dashboard", "HeaderWelcomeToMediaBrowserServerDashboard": "Welcome to the Media Browser Dashboard",
"HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client", "HeaderWelcomeToMediaBrowserWebClient": "Welcome to the Media Browser Web Client",
"ButtonTakeTheTour": "Take the tour", "ButtonTakeTheTour": "Take the tour",
@ -83,6 +84,7 @@
"ButtonCancelItem": "Cancel item", "ButtonCancelItem": "Cancel item",
"ButtonQueueForRetry": "Queue for retry", "ButtonQueueForRetry": "Queue for retry",
"ButtonReenable": "Re-enable", "ButtonReenable": "Re-enable",
"ButtonLearnMore": "Learn more",
"SyncJobItemStatusSyncedMarkForRemoval": "Marked for removal", "SyncJobItemStatusSyncedMarkForRemoval": "Marked for removal",
"LabelAbortedByServerShutdown": "(Aborted by server shutdown)", "LabelAbortedByServerShutdown": "(Aborted by server shutdown)",
"LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.", "LabelScheduledTaskLastRan": "Last ran {0}, taking {1}.",

View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common.Internal</id> <id>MediaBrowser.Common.Internal</id>
<version>3.0.566</version> <version>3.0.567</version>
<title>MediaBrowser.Common.Internal</title> <title>MediaBrowser.Common.Internal</title>
<authors>Luke</authors> <authors>Luke</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description> <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
<copyright>Copyright © Media Browser 2013</copyright> <copyright>Copyright © Media Browser 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.566" /> <dependency id="MediaBrowser.Common" version="3.0.567" />
<dependency id="NLog" version="3.1.0.0" /> <dependency id="NLog" version="3.1.0.0" />
<dependency id="SimpleInjector" version="2.6.1" /> <dependency id="SimpleInjector" version="2.6.1" />
</dependencies> </dependencies>

View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Common</id> <id>MediaBrowser.Common</id>
<version>3.0.566</version> <version>3.0.567</version>
<title>MediaBrowser.Common</title> <title>MediaBrowser.Common</title>
<authors>Media Browser Team</authors> <authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Model.Signed</id> <id>MediaBrowser.Model.Signed</id>
<version>3.0.566</version> <version>3.0.567</version>
<title>MediaBrowser.Model - Signed Edition</title> <title>MediaBrowser.Model - Signed Edition</title>
<authors>Media Browser Team</authors> <authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>

View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>MediaBrowser.Server.Core</id> <id>MediaBrowser.Server.Core</id>
<version>3.0.566</version> <version>3.0.567</version>
<title>Media Browser.Server.Core</title> <title>Media Browser.Server.Core</title>
<authors>Media Browser Team</authors> <authors>Media Browser Team</authors>
<owners>ebr,Luke,scottisafool</owners> <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
<description>Contains core components required to build plugins for Media Browser Server.</description> <description>Contains core components required to build plugins for Media Browser Server.</description>
<copyright>Copyright © Media Browser 2013</copyright> <copyright>Copyright © Media Browser 2013</copyright>
<dependencies> <dependencies>
<dependency id="MediaBrowser.Common" version="3.0.566" /> <dependency id="MediaBrowser.Common" version="3.0.567" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>

View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] [assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5518.1")] //[assembly: AssemblyVersion("3.0.5518.1")]