lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse Source 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js
This commit is contained in:
Luke Pulverenti 2015-06-07 17:23:05 -04:00
commit cfb42b48a9
8 changed files with 88 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Api/BrandingService.cs
View File

@ -34,7 +34,8 @@ namespace MediaBrowser.Api
{ {
var result = _config.GetConfiguration<BrandingOptions>("branding"); var result = _config.GetConfiguration<BrandingOptions>("branding");
return ResultFactory.GetResult(result.CustomCss, "text/css"); // When null this throws a 405 error under Mono OSX, so default to empty string
return ResultFactory.GetResult(result.CustomCss ?? string.Empty, "text/css");
} }
} }
} }

10
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -129,7 +129,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
_connection.RunQueries(queries, _logger); _connection.RunQueries(queries, _logger);
_connection.AddColumn(_logger, "TypedBaseItems", "StartDate", "DATETIME"); _connection.AddColumn(_logger, "TypedBaseItems", "Path", "Text");
_connection.AddColumn(_logger, "TypedBaseItems", "StartDate", "DATETIME");
_connection.AddColumn(_logger, "TypedBaseItems", "EndDate", "DATETIME"); _connection.AddColumn(_logger, "TypedBaseItems", "EndDate", "DATETIME");
_connection.AddColumn(_logger, "TypedBaseItems", "ChannelId", "Text"); _connection.AddColumn(_logger, "TypedBaseItems", "ChannelId", "Text");
_connection.AddColumn(_logger, "TypedBaseItems", "IsMovie", "BIT"); _connection.AddColumn(_logger, "TypedBaseItems", "IsMovie", "BIT");
@ -163,6 +164,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
"guid", "guid",
"type", "type",
"data", "data",
"Path",
"StartDate", "StartDate",
"EndDate", "EndDate",
"ChannelId", "ChannelId",
@ -177,7 +179,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
"OfficialRating" "OfficialRating"
}; };
_saveItemCommand = _connection.CreateCommand(); _saveItemCommand = _connection.CreateCommand();
_saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (@1, @2, @3, @4, @5, @6, @7, @8, @9, @10, @11, @12, @13, @14, @15)"; _saveItemCommand.CommandText = "replace into TypedBaseItems (" + string.Join(",", saveColumns.ToArray()) + ") values (@1, @2, @3, @4, @5, @6, @7, @8, @9, @10, @11, @12, @13, @14, @15, @16)";
for (var i = 1; i <= saveColumns.Count; i++) for (var i = 1; i <= saveColumns.Count; i++)
{ {
_saveItemCommand.Parameters.Add(_saveItemCommand, "@" + i.ToString(CultureInfo.InvariantCulture)); _saveItemCommand.Parameters.Add(_saveItemCommand, "@" + i.ToString(CultureInfo.InvariantCulture));
@ -254,7 +256,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
_saveItemCommand.GetParameter(index++).Value = item.GetType().FullName; _saveItemCommand.GetParameter(index++).Value = item.GetType().FullName;
_saveItemCommand.GetParameter(index++).Value = _jsonSerializer.SerializeToBytes(item); _saveItemCommand.GetParameter(index++).Value = _jsonSerializer.SerializeToBytes(item);
var hasStartDate = item as IHasStartDate; _saveItemCommand.GetParameter(index++).Value = item.Path;
var hasStartDate = item as IHasStartDate;
if (hasStartDate != null) if (hasStartDate != null)
{ {
_saveItemCommand.GetParameter(index++).Value = hasStartDate.StartDate; _saveItemCommand.GetParameter(index++).Value = hasStartDate.StartDate;

11
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
View File

@ -32,6 +32,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Common.ScheduledTasks;
namespace MediaBrowser.Server.Implementations.Sync namespace MediaBrowser.Server.Implementations.Sync
{ {
@ -51,7 +52,8 @@ namespace MediaBrowser.Server.Implementations.Sync
private readonly IConfigurationManager _config; private readonly IConfigurationManager _config;
private readonly IUserDataManager _userDataManager; private readonly IUserDataManager _userDataManager;
private readonly Func<IMediaSourceManager> _mediaSourceManager; private readonly Func<IMediaSourceManager> _mediaSourceManager;
private readonly IJsonSerializer _json; private readonly IJsonSerializer _json;
private readonly ITaskManager _taskManager;
private ISyncProvider[] _providers = { }; private ISyncProvider[] _providers = { };
@ -61,7 +63,7 @@ namespace MediaBrowser.Server.Implementations.Sync
public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemUpdated; public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemUpdated;
public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemCreated; public event EventHandler<GenericEventArgs<SyncJobItem>> SyncJobItemCreated;
public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger, IUserManager userManager, Func<IDtoService> dtoService, IServerApplicationHost appHost, ITVSeriesManager tvSeriesManager, Func<IMediaEncoder> mediaEncoder, IFileSystem fileSystem, Func<ISubtitleEncoder> subtitleEncoder, IConfigurationManager config, IUserDataManager userDataManager, Func<IMediaSourceManager> mediaSourceManager, IJsonSerializer json) public SyncManager(ILibraryManager libraryManager, ISyncRepository repo, IImageProcessor imageProcessor, ILogger logger, IUserManager userManager, Func<IDtoService> dtoService, IServerApplicationHost appHost, ITVSeriesManager tvSeriesManager, Func<IMediaEncoder> mediaEncoder, IFileSystem fileSystem, Func<ISubtitleEncoder> subtitleEncoder, IConfigurationManager config, IUserDataManager userDataManager, Func<IMediaSourceManager> mediaSourceManager, IJsonSerializer json, ITaskManager taskManager)
{ {
_libraryManager = libraryManager; _libraryManager = libraryManager;
_repo = repo; _repo = repo;
@ -78,6 +80,7 @@ namespace MediaBrowser.Server.Implementations.Sync
_userDataManager = userDataManager; _userDataManager = userDataManager;
_mediaSourceManager = mediaSourceManager; _mediaSourceManager = mediaSourceManager;
_json = json; _json = json;
_taskManager = taskManager;
} }
public void AddParts(IEnumerable<ISyncProvider> providers) public void AddParts(IEnumerable<ISyncProvider> providers)
@ -214,6 +217,10 @@ namespace MediaBrowser.Server.Implementations.Sync
}, _logger); }, _logger);
} }
if (returnResult.JobItems.Any (i => i.Status == SyncJobItemStatus.Queued || i.Status == SyncJobItemStatus.Converting)) {
_taskManager.QueueScheduledTask<SyncConvertScheduledTask> ();
}
return returnResult; return returnResult;
} }

111
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

@ -259,9 +259,6 @@
</BundleResource> </BundleResource>
<BundleResource Include="Resources\appicon.icns" /> <BundleResource Include="Resources\appicon.icns" />
<BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" /> <BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\.DS_Store">
<Link>Resources\dashboard-ui\.DS_Store</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html">
<Link>Resources\dashboard-ui\about.html</Link> <Link>Resources\dashboard-ui\about.html</Link>
</BundleResource> </BundleResource>
@ -655,9 +652,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizarduser.html"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizarduser.html">
<Link>Resources\dashboard-ui\wizarduser.html</Link> <Link>Resources\dashboard-ui\wizarduser.html</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\.DS_Store">
<Link>Resources\dashboard-ui\css\.DS_Store</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\card.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\card.css">
<Link>Resources\dashboard-ui\css\card.css</Link> <Link>Resources\dashboard-ui\css\card.css</Link>
</BundleResource> </BundleResource>
@ -787,45 +781,6 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\userflyoutdefault.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\userflyoutdefault.png">
<Link>Resources\dashboard-ui\css\images\userflyoutdefault.png</Link> <Link>Resources\dashboard-ui\css\images\userflyoutdefault.png</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_dark.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_dark.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_light.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_light.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_dark.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_dark.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_light.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_light.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_dark.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_dark.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_light.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_light.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_dark.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_dark.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_light.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_light.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_dark.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_dark.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_light.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_light.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_dark.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_dark.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_light.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_light.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_notification_media_route.png">
<Link>Resources\dashboard-ui\css\images\chromecast\ic_notification_media_route.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\amazon.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\amazon.png">
<Link>Resources\dashboard-ui\css\images\clients\amazon.png</Link> <Link>Resources\dashboard-ui\css\images\clients\amazon.png</Link>
</BundleResource> </BundleResource>
@ -841,6 +796,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\chrome_companion.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\chrome_companion.png">
<Link>Resources\dashboard-ui\css\images\clients\chrome_companion.png</Link> <Link>Resources\dashboard-ui\css\images\clients\chrome_companion.png</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\chromecast.png">
<Link>Resources\dashboard-ui\css\images\clients\chromecast.png</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\dlna.png"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\dlna.png">
<Link>Resources\dashboard-ui\css\images\clients\dlna.png</Link> <Link>Resources\dashboard-ui\css\images\clients\dlna.png</Link>
</BundleResource> </BundleResource>
@ -1150,6 +1108,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appservices.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appservices.js">
<Link>Resources\dashboard-ui\scripts\appservices.js</Link> <Link>Resources\dashboard-ui\scripts\appservices.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appsettings.js">
<Link>Resources\dashboard-ui\scripts\appsettings.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\autoorganizelog.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\autoorganizelog.js">
<Link>Resources\dashboard-ui\scripts\autoorganizelog.js</Link> <Link>Resources\dashboard-ui\scripts\autoorganizelog.js</Link>
</BundleResource> </BundleResource>
@ -1420,6 +1381,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicvideos.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicvideos.js">
<Link>Resources\dashboard-ui\scripts\musicvideos.js</Link> <Link>Resources\dashboard-ui\scripts\musicvideos.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\mypreferencescommon.js">
<Link>Resources\dashboard-ui\scripts\mypreferencescommon.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\mypreferencesdisplay.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\mypreferencesdisplay.js">
<Link>Resources\dashboard-ui\scripts\mypreferencesdisplay.js</Link> <Link>Resources\dashboard-ui\scripts\mypreferencesdisplay.js</Link>
</BundleResource> </BundleResource>
@ -1600,6 +1564,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fastclick.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fastclick.js">
<Link>Resources\dashboard-ui\thirdparty\fastclick.js</Link> <Link>Resources\dashboard-ui\thirdparty\fastclick.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\filesystem.js">
<Link>Resources\dashboard-ui\thirdparty\filesystem.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\headroom.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\headroom.js">
<Link>Resources\dashboard-ui\thirdparty\headroom.js</Link> <Link>Resources\dashboard-ui\thirdparty\headroom.js</Link>
</BundleResource> </BundleResource>
@ -1618,6 +1585,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\requirecss.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\requirecss.js">
<Link>Resources\dashboard-ui\thirdparty\requirecss.js</Link> <Link>Resources\dashboard-ui\thirdparty\requirecss.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\velocity.min.js">
<Link>Resources\dashboard-ui\thirdparty\velocity.min.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\ajax.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\ajax.js">
<Link>Resources\dashboard-ui\thirdparty\apiclient\ajax.js</Link> <Link>Resources\dashboard-ui\thirdparty\apiclient\ajax.js</Link>
</BundleResource> </BundleResource>
@ -1642,6 +1612,9 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\events.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\events.js">
<Link>Resources\dashboard-ui\thirdparty\apiclient\events.js</Link> <Link>Resources\dashboard-ui\thirdparty\apiclient\events.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\localassetmanager.js">
<Link>Resources\dashboard-ui\thirdparty\apiclient\localassetmanager.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\logger.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\logger.js">
<Link>Resources\dashboard-ui\thirdparty\apiclient\logger.js</Link> <Link>Resources\dashboard-ui\thirdparty\apiclient\logger.js</Link>
</BundleResource> </BundleResource>
@ -1681,9 +1654,15 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\externalplayer.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\externalplayer.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\externalplayer.js</Link> <Link>Resources\dashboard-ui\thirdparty\cordova\externalplayer.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\filesystem.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\filesystem.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\generaldevice.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\generaldevice.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\generaldevice.js</Link> <Link>Resources\dashboard-ui\thirdparty\cordova\generaldevice.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\iap.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\iap.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\imagestore.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\imagestore.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\imagestore.js</Link> <Link>Resources\dashboard-ui\thirdparty\cordova\imagestore.js</Link>
</BundleResource> </BundleResource>
@ -1696,9 +1675,27 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\serverdiscovery.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\serverdiscovery.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\serverdiscovery.js</Link> <Link>Resources\dashboard-ui\thirdparty\cordova\serverdiscovery.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\androidcredentials.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\android\androidcredentials.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\filesystem.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\android\filesystem.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\iap.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\android\iap.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\imagestore.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\android\imagestore.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\immersive.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\immersive.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\android\immersive.js</Link> <Link>Resources\dashboard-ui\thirdparty\cordova\android\immersive.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\localassetmanager.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\android\localassetmanager.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\ios\orientation.js">
<Link>Resources\dashboard-ui\thirdparty\cordova\ios\orientation.js</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css">
<Link>Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css</Link> <Link>Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css</Link>
</BundleResource> </BundleResource>
@ -2374,6 +2371,24 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\throbber.gif"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\throbber.gif">
<Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\throbber.gif</Link> <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\throbber.gif</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.eot">
<Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.eot</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.ttf">
<Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.ttf</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff">
<Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff2">
<Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff2</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\codepoints.txt">
<Link>Resources\dashboard-ui\thirdparty\materialicons\codepoints.txt</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\style.css">
<Link>Resources\dashboard-ui\thirdparty\materialicons\style.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\css\swipebox.css"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\css\swipebox.css">
<Link>Resources\dashboard-ui\thirdparty\swipebox-master\css\swipebox.css</Link> <Link>Resources\dashboard-ui\thirdparty\swipebox-master\css\swipebox.css</Link>
</BundleResource> </BundleResource>
@ -2395,5 +2410,11 @@
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js"> <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js">
<Link>Resources\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js</Link> <Link>Resources\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\voice\voice.css">
<Link>Resources\dashboard-ui\voice\voice.css</Link>
</BundleResource>
<BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\voice\voice.js">
<Link>Resources\dashboard-ui\voice\voice.js</Link>
</BundleResource>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
View File

@ -19,7 +19,7 @@ namespace MediaBrowser.Server.Mac
/// <summary> /// <summary>
/// Restarts this instance. /// Restarts this instance.
/// </summary> /// </summary>
public virtual void Restart() public virtual void Restart(StartupOptions options)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

3
MediaBrowser.Server.Mac/Native/NativeApp.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using MediaBrowser.Server.Startup.Common;
namespace MediaBrowser.Server.Mac namespace MediaBrowser.Server.Mac
{ {
@ -30,7 +31,7 @@ namespace MediaBrowser.Server.Mac
/// <summary> /// <summary>
/// Restarts this instance. /// Restarts this instance.
/// </summary> /// </summary>
public override void Restart() public override void Restart(StartupOptions options)
{ {
MainClass.Restart(); MainClass.Restart();
} }

2
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -447,7 +447,7 @@ namespace MediaBrowser.Server.Startup.Common
TVSeriesManager = new TVSeriesManager(UserManager, UserDataManager, LibraryManager); TVSeriesManager = new TVSeriesManager(UserManager, UserDataManager, LibraryManager);
RegisterSingleInstance(TVSeriesManager); RegisterSingleInstance(TVSeriesManager);
SyncManager = new SyncManager(LibraryManager, SyncRepository, ImageProcessor, LogManager.GetLogger("SyncManager"), UserManager, () => DtoService, this, TVSeriesManager, () => MediaEncoder, FileSystemManager, () => SubtitleEncoder, ServerConfigurationManager, UserDataManager, () => MediaSourceManager, JsonSerializer); SyncManager = new SyncManager(LibraryManager, SyncRepository, ImageProcessor, LogManager.GetLogger("SyncManager"), UserManager, () => DtoService, this, TVSeriesManager, () => MediaEncoder, FileSystemManager, () => SubtitleEncoder, ServerConfigurationManager, UserDataManager, () => MediaSourceManager, JsonSerializer, TaskManager);
RegisterSingleInstance(SyncManager); RegisterSingleInstance(SyncManager);
DtoService = new DtoService(LogManager.GetLogger("DtoService"), LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager, this, () => DeviceManager, () => MediaSourceManager, () => LiveTvManager); DtoService = new DtoService(LogManager.GetLogger("DtoService"), LibraryManager, UserDataManager, ItemRepository, ImageProcessor, ServerConfigurationManager, FileSystemManager, ProviderManager, () => ChannelManager, SyncManager, this, () => DeviceManager, () => MediaSourceManager, () => LiveTvManager);

4
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -590,7 +590,6 @@ namespace MediaBrowser.WebDashboard.Api
"livetvrecording.js", "livetvrecording.js",
"livetvtimer.js", "livetvtimer.js",
"livetvseriestimer.js", "livetvseriestimer.js",
"livetvsettings.js",
"medialibrarypage.js", "medialibrarypage.js",
"metadataconfigurationpage.js", "metadataconfigurationpage.js",
@ -618,9 +617,6 @@ namespace MediaBrowser.WebDashboard.Api
"userprofilespage.js", "userprofilespage.js",
"userparentalcontrol.js", "userparentalcontrol.js",
"userlibraryaccess.js", "userlibraryaccess.js",
"wizardagreement.js",
"wizardfinishpage.js",
"wizardservice.js",
"wizardstartpage.js" "wizardstartpage.js"
}; };
} }