Skip to content

Commit 04f1931

Browse files
LukePulverentiLukePulverenti
committed
improve m3u stream loop support
1 parent 5254e54 commit 04f1931

File tree

211 files changed

+105846
-3305
lines changed

Some content is hidden

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

211 files changed

+105846
-3305
lines changed

Diff for: ‎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.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
37+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
40+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4141
</Reference>
4242
<Reference Include="System" />
4343
<Reference Include="System.Configuration" />

Diff for: ‎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.59-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.60-beta" targetFramework="net47" />
44
</packages>

Diff for: ‎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.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
52+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
55+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.Configuration" />

Diff for: ‎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.59-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.60-beta" targetFramework="net47" />
44
</packages>

Diff for: ‎Emby.Dlna/Emby.Dlna.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@
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.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
177+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
180+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
183+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
184184
</Reference>
185185
<Reference Include="System" />
186186
<Reference Include="System.Configuration" />

Diff for: ‎Emby.Dlna/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.59-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.60-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.60-beta" targetFramework="net47" />
55
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net47" />
66
</packages>

Diff for: ‎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.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
38+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
41+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.Core" />

Diff for: ‎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.59-beta" targetFramework="net47" />
5-
<package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Common" version="3.3.60-beta" targetFramework="net47" />
5+
<package id="MediaBrowser.Server.Core" version="3.3.60-beta" targetFramework="net47" />
66
</packages>

Diff for: ‎Emby.Drawing.Skia/Emby.Drawing.Skia.csproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<FileAlignment>512</FileAlignment>
1515
<TargetFrameworkProfile />
1616
<TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
17+
<NuGetPackageImportStamp>
18+
</NuGetPackageImportStamp>
1719
</PropertyGroup>
1820
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1921
<DebugSymbols>true</DebugSymbols>
@@ -43,13 +45,16 @@
4345
<Compile Include="StripCollageBuilder.cs" />
4446
<Compile Include="UnplayedCountIndicator.cs" />
4547
<Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
48+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
4749
</Reference>
4850
<Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
51+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
5052
</Reference>
5153
<Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
54+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
55+
</Reference>
56+
<Reference Include="SkiaSharp, Version=1.60.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
57+
<HintPath>..\packages\SkiaSharp.1.60.0\lib\net45\SkiaSharp.dll</HintPath>
5358
</Reference>
5459
<Reference Include="System" />
5560
<Reference Include="System.Configuration" />
@@ -61,11 +66,6 @@
6166
<Reference Include="System.Data" />
6267
<Reference Include="System.Xml" />
6368
</ItemGroup>
64-
<ItemGroup>
65-
<Reference Include="SkiaSharp, Version=1.58.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
66-
<HintPath>..\packages\SkiaSharp.1.58.1\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll</HintPath>
67-
</Reference>
68-
</ItemGroup>
6969
<ItemGroup>
7070
<None Include="packages.config" />
7171
</ItemGroup>

Diff for: ‎Emby.Drawing.Skia/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.59-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
5-
<package id="SkiaSharp" version="1.58.1" targetFramework="portable45-net45+win8" requireReinstallation="true" />
3+
<package id="MediaBrowser.Common" version="3.3.60-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.60-beta" targetFramework="net47" />
5+
<package id="SkiaSharp" version="1.60.0" targetFramework="net47" />
66
</packages>

Diff for: ‎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.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
44+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
47+
<HintPath>..\packages\MediaBrowser.Server.Core.3.3.60-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.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
50+
<HintPath>..\packages\MediaBrowser.Common.3.3.60-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
5151
</Reference>
5252
<Reference Include="System" />
5353
<Reference Include="System.Configuration" />

Diff for: ‎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.59-beta" targetFramework="net47" />
4-
<package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
3+
<package id="MediaBrowser.Common" version="3.3.60-beta" targetFramework="net47" />
4+
<package id="MediaBrowser.Server.Core" version="3.3.60-beta" targetFramework="net47" />
55
</packages>

Diff for: ‎MediaBrowser.Api/NotificationsService.cs renamed to ‎Emby.Notifications/Api/NotificationsService.cs

+35-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using MediaBrowser.Model.Services;
11+
using MediaBrowser.Model.Dto;
1112

12-
namespace MediaBrowser.Api
13+
namespace Emby.Notifications.Api
1314
{
1415
[Route("/Notifications/{UserId}", "GET", Summary = "Gets notifications")]
1516
public class GetNotifications : IReturn<NotificationResult>
@@ -27,6 +28,37 @@ public class GetNotifications : IReturn<NotificationResult>
2728
public int? Limit { get; set; }
2829
}
2930

31+
public class Notification
32+
{
33+
public string Id { get; set; }
34+
35+
public string UserId { get; set; }
36+
37+
public DateTime Date { get; set; }
38+
39+
public bool IsRead { get; set; }
40+
41+
public string Name { get; set; }
42+
43+
public string Description { get; set; }
44+
45+
public string Url { get; set; }
46+
47+
public NotificationLevel Level { get; set; }
48+
}
49+
50+
public class NotificationResult
51+
{
52+
public Notification[] Notifications { get; set; }
53+
public int TotalRecordCount { get; set; }
54+
}
55+
56+
public class NotificationsSummary
57+
{
58+
public int UnreadCount { get; set; }
59+
public NotificationLevel MaxUnreadNotificationLevel { get; set; }
60+
}
61+
3062
[Route("/Notifications/{UserId}/Summary", "GET", Summary = "Gets a notification summary for a user")]
3163
public class GetNotificationsSummary : IReturn<NotificationsSummary>
3264
{
@@ -40,7 +72,7 @@ public class GetNotificationTypes : IReturn<List<NotificationTypeInfo>>
4072
}
4173

4274
[Route("/Notifications/Services", "GET", Summary = "Gets notification types")]
43-
public class GetNotificationServices : IReturn<List<NotificationServiceInfo>>
75+
public class GetNotificationServices : IReturn<List<NameIdPair>>
4476
{
4577
}
4678

@@ -84,7 +116,7 @@ public class MarkUnread : IReturnVoid
84116
}
85117

86118
[Authenticated]
87-
public class NotificationsService : BaseApiService
119+
public class NotificationsService : IService
88120
{
89121
private readonly INotificationManager _notificationManager;
90122
private readonly IUserManager _userManager;

Diff for: ‎Emby.Server.Implementations/Notifications/CoreNotificationTypes.cs renamed to ‎Emby.Notifications/CoreNotificationTypes.cs

+19-57
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Linq;
77
using MediaBrowser.Model.Globalization;
88

9-
namespace Emby.Server.Implementations.Notifications
9+
namespace Emby.Notifications
1010
{
1111
public class CoreNotificationTypes : INotificationTypeFactory
1212
{
@@ -25,133 +25,95 @@ public IEnumerable<NotificationTypeInfo> GetNotificationTypes()
2525
{
2626
new NotificationTypeInfo
2727
{
28-
Type = NotificationType.ApplicationUpdateInstalled.ToString(),
29-
DefaultDescription = "{ReleaseNotes}",
30-
DefaultTitle = "A new version of Emby Server has been installed.",
31-
Variables = new string[]{"Version"}
28+
Type = NotificationType.ApplicationUpdateInstalled.ToString()
3229
},
3330

3431
new NotificationTypeInfo
3532
{
36-
Type = NotificationType.InstallationFailed.ToString(),
37-
DefaultTitle = "{Name} installation failed.",
38-
Variables = new string[]{"Name", "Version"}
33+
Type = NotificationType.InstallationFailed.ToString()
3934
},
4035

4136
new NotificationTypeInfo
4237
{
43-
Type = NotificationType.PluginInstalled.ToString(),
44-
DefaultTitle = "{Name} was installed.",
45-
Variables = new string[]{"Name", "Version"}
38+
Type = NotificationType.PluginInstalled.ToString()
4639
},
4740

4841
new NotificationTypeInfo
4942
{
50-
Type = NotificationType.PluginError.ToString(),
51-
DefaultTitle = "{Name} has encountered an error.",
52-
DefaultDescription = "{ErrorMessage}",
53-
Variables = new string[]{"Name", "ErrorMessage"}
43+
Type = NotificationType.PluginError.ToString()
5444
},
5545

5646
new NotificationTypeInfo
5747
{
58-
Type = NotificationType.PluginUninstalled.ToString(),
59-
DefaultTitle = "{Name} was uninstalled.",
60-
Variables = new string[]{"Name", "Version"}
48+
Type = NotificationType.PluginUninstalled.ToString()
6149
},
6250

6351
new NotificationTypeInfo
6452
{
65-
Type = NotificationType.PluginUpdateInstalled.ToString(),
66-
DefaultTitle = "{Name} was updated.",
67-
DefaultDescription = "{ReleaseNotes}",
68-
Variables = new string[]{"Name", "ReleaseNotes", "Version"}
53+
Type = NotificationType.PluginUpdateInstalled.ToString()
6954
},
7055

7156
new NotificationTypeInfo
7257
{
73-
Type = NotificationType.ServerRestartRequired.ToString(),
74-
DefaultTitle = "Please restart Emby Server to finish updating."
58+
Type = NotificationType.ServerRestartRequired.ToString()
7559
},
7660

7761
new NotificationTypeInfo
7862
{
79-
Type = NotificationType.TaskFailed.ToString(),
80-
DefaultTitle = "{Name} failed.",
81-
DefaultDescription = "{ErrorMessage}",
82-
Variables = new string[]{"Name", "ErrorMessage"}
63+
Type = NotificationType.TaskFailed.ToString()
8364
},
8465

8566
new NotificationTypeInfo
8667
{
87-
Type = NotificationType.NewLibraryContent.ToString(),
88-
DefaultTitle = "{Name} has been added to your media library.",
89-
Variables = new string[]{"Name"}
68+
Type = NotificationType.NewLibraryContent.ToString()
9069
},
9170

9271
new NotificationTypeInfo
9372
{
94-
Type = NotificationType.AudioPlayback.ToString(),
95-
DefaultTitle = "{UserName} is playing {ItemName} on {DeviceName}.",
96-
Variables = new string[]{"UserName", "ItemName", "DeviceName", "AppName"}
73+
Type = NotificationType.AudioPlayback.ToString()
9774
},
9875

9976
new NotificationTypeInfo
10077
{
101-
Type = NotificationType.GamePlayback.ToString(),
102-
DefaultTitle = "{UserName} is playing {ItemName} on {DeviceName}.",
103-
Variables = new string[]{"UserName", "ItemName", "DeviceName", "AppName"}
78+
Type = NotificationType.GamePlayback.ToString()
10479
},
10580

10681
new NotificationTypeInfo
10782
{
108-
Type = NotificationType.VideoPlayback.ToString(),
109-
DefaultTitle = "{UserName} is playing {ItemName} on {DeviceName}.",
110-
Variables = new string[]{"UserName", "ItemName", "DeviceName", "AppName"}
83+
Type = NotificationType.VideoPlayback.ToString()
11184
},
11285

11386
new NotificationTypeInfo
11487
{
115-
Type = NotificationType.AudioPlaybackStopped.ToString(),
116-
DefaultTitle = "{UserName} has finished playing {ItemName} on {DeviceName}.",
117-
Variables = new string[]{"UserName", "ItemName", "DeviceName", "AppName"}
88+
Type = NotificationType.AudioPlaybackStopped.ToString()
11889
},
11990

12091
new NotificationTypeInfo
12192
{
122-
Type = NotificationType.GamePlaybackStopped.ToString(),
123-
DefaultTitle = "{UserName} has finished playing {ItemName} on {DeviceName}.",
124-
Variables = new string[]{"UserName", "ItemName", "DeviceName", "AppName"}
93+
Type = NotificationType.GamePlaybackStopped.ToString()
12594
},
12695

12796
new NotificationTypeInfo
12897
{
129-
Type = NotificationType.VideoPlaybackStopped.ToString(),
130-
DefaultTitle = "{UserName} has finished playing {ItemName} on {DeviceName}.",
131-
Variables = new string[]{"UserName", "ItemName", "DeviceName", "AppName"}
98+
Type = NotificationType.VideoPlaybackStopped.ToString()
13299
},
133100

134101
new NotificationTypeInfo
135102
{
136-
Type = NotificationType.CameraImageUploaded.ToString(),
137-
DefaultTitle = "A new camera image has been uploaded from {DeviceName}.",
138-
Variables = new string[]{"DeviceName"}
103+
Type = NotificationType.CameraImageUploaded.ToString()
139104
},
140105

141106
new NotificationTypeInfo
142107
{
143-
Type = NotificationType.UserLockedOut.ToString(),
144-
DefaultTitle = "{UserName} has been locked out.",
145-
Variables = new string[]{"UserName"}
108+
Type = NotificationType.UserLockedOut.ToString()
146109
}
147110
};
148111

149112
if (!_appHost.CanSelfUpdate)
150113
{
151114
knownTypes.Add(new NotificationTypeInfo
152115
{
153-
Type = NotificationType.ApplicationUpdateAvailable.ToString(),
154-
DefaultTitle = "A new version of Emby Server is available for download."
116+
Type = NotificationType.ApplicationUpdateAvailable.ToString()
155117
});
156118
}
157119

0 commit comments

Comments
 (0)