Skip to content

Commit ec9180c

Browse files
LukePulverentiLukePulverenti
authored
Merge pull request #3332 from MediaBrowser/dev
rework storage of extras
2 parents f356a6a + 774efe6 commit ec9180c

File tree

168 files changed

+2674
-4746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+2674
-4746
lines changed

‎BDInfo/BDInfo.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
37+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3838
</Reference>
3939
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
40-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
40+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Configuration" />

‎BDInfo/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.53-beta" targetFramework="net47" />
44
</packages>

‎DvdLib/DvdLib.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
<Compile Include="Ifo\VideoAttributes.cs" />
5050
<Compile Include="Properties\AssemblyInfo.cs" />
5151
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
5353
</Reference>
5454
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
55+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.Configuration" />

‎DvdLib/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.53-beta" targetFramework="net47" />
44
</packages>

‎Emby.Dlna/Emby.Dlna.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,19 @@
174174
</ItemGroup>
175175
<ItemGroup>
176176
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
177-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
177+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
178178
</Reference>
179179
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
180-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
180+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
181181
</Reference>
182182
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
183-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
183+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
184184
</Reference>
185185
<Reference Include="System" />
186186
<Reference Include="System.Configuration" />
187187
<Reference Include="System.Core" />
188188
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
189-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
189+
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
190190
</Reference>
191191
<Reference Include="System.Runtime.Serialization" />
192192
<Reference Include="System.Xml.Linq" />

‎Emby.Dlna/packages.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
5-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.53-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.53-beta" targetFramework="net47" />
5+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net47" />
66
</packages>

‎Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
<HintPath>..\packages\ImageMagickSharp.1.0.0.19\lib\net45\ImageMagickSharp.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4242
</Reference>
4343
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Core" />

‎Emby.Drawing.ImageMagick/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="ImageMagickSharp" version="1.0.0.19" targetFramework="net452" />
4-
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
5-
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Common" version="3.3.53-beta" targetFramework="net47" />
5+
<package id="MediaBrowser.Server.Core" version="3.3.53-beta" targetFramework="net47" />
66
</packages>

‎Emby.Drawing.Skia/Emby.Drawing.Skia.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
<Compile Include="StripCollageBuilder.cs" />
4444
<Compile Include="UnplayedCountIndicator.cs" />
4545
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
46+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4747
</Reference>
4848
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
49+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
5050
</Reference>
5151
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System" />
5555
<Reference Include="System.Configuration" />

‎Emby.Drawing.Skia/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.53-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.53-beta" targetFramework="net47" />
55
<package id="SkiaSharp" version="1.58.1" targetFramework="portable45-net45+win8" requireReinstallation="true" />
66
</packages>

‎Emby.Drawing/Emby.Drawing.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4545
</Reference>
4646
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
47+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
4848
</Reference>
4949
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
50+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Configuration" />

‎Emby.Drawing/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.53-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.53-beta" targetFramework="net47" />
55
</packages>

‎Emby.Photos/Emby.Photos.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
35+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
3636
</Reference>
3737
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
3939
</Reference>
4040
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\MediaBrowser.Common.3.3.50-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Common.3.3.53-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4242
</Reference>
4343
<Reference Include="TagLib.Portable">
4444
<HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>

‎Emby.Photos/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MediaBrowser.Common" version="3.3.50-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.50-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.53-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.53-beta" targetFramework="net47" />
55
</packages>

‎Emby.Server.Implementations/ApplicationHost.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ protected void RegisterResources()
10081008

10091009
var deviceRepo = new SqliteDeviceRepository(LogManager.GetLogger("DeviceManager"), ServerConfigurationManager, FileSystemManager, JsonSerializer);
10101010
deviceRepo.Initialize();
1011-
DeviceManager = new DeviceManager(deviceRepo, LibraryManager, LocalizationManager, UserManager, FileSystemManager, LibraryMonitor, ServerConfigurationManager, LogManager.GetLogger("DeviceManager"), NetworkManager);
1011+
DeviceManager = new DeviceManager(AuthenticationRepository, deviceRepo, LibraryManager, LocalizationManager, UserManager, FileSystemManager, LibraryMonitor, ServerConfigurationManager, LogManager.GetLogger("DeviceManager"), NetworkManager);
10121012
RegisterSingleInstance<IDeviceRepository>(deviceRepo);
10131013
RegisterSingleInstance(DeviceManager);
10141014

@@ -1065,7 +1065,7 @@ protected void RegisterResources()
10651065
RegisterSingleInstance(activityLogRepo);
10661066
RegisterSingleInstance<IActivityManager>(new ActivityManager(LogManager.GetLogger("ActivityManager"), activityLogRepo, UserManager));
10671067

1068-
var authContext = new AuthorizationContext(AuthenticationRepository, ConnectManager);
1068+
var authContext = new AuthorizationContext(AuthenticationRepository, ConnectManager, UserManager);
10691069
RegisterSingleInstance<IAuthorizationContext>(authContext);
10701070
RegisterSingleInstance<ISessionContext>(new SessionContext(UserManager, authContext, SessionManager));
10711071

@@ -1930,6 +1930,7 @@ private bool EnablePlugin(string path)
19301930
"mbintros.dll",
19311931
"embytv.dll",
19321932
"Messenger.dll",
1933+
"Messages.dll",
19331934
"MediaBrowser.Plugins.TvMazeProvider.dll",
19341935
"MBBookshelf.dll",
19351936
"MediaBrowser.Channels.Adult.YouJizz.dll",

0 commit comments

Comments
 (0)