Commit Graph

794 Commits

Author SHA1 Message Date
Shadowghost
656a0bff6f Merge remote-tracking branch 'upstream/master' into network-rewrite 2023-01-19 10:09:32 +01:00
Bond-009
875359d457
Merge pull request #9108 from barronpm/efcore-cleanup 2023-01-17 21:11:42 +01:00
Patrick Barron
c59f2a3c46 Mark CanSelfRestart as Obsolete 2023-01-17 14:49:05 -05:00
Patrick Barron
8479f0f90c Rename JellyfinDb to JellyfinDbContext 2023-01-16 12:14:44 -05:00
Patrick Barron
dc85d86ea1 Enable in-process restarting 2023-01-15 15:56:18 -05:00
Patrick Barron
b5da0d1b17
Rename Emby.Drawing and move to src (#9054)
* Move Emby.Drawing to src

* Rename Emby.Drawing -> Jellyfin.Drawing
2023-01-10 05:51:46 -07:00
Shadowghost
b725fbe51a Apply review suggestions 2022-12-13 10:39:37 +01:00
Shadowghost
3f6354cdb8 Fix .NET 7 compatibility 2022-12-07 17:41:32 +01:00
Shadowghost
2c86bd1875 Merge branch 'master' into network-rewrite 2022-12-07 17:40:24 +01:00
Bond_009
52194f56b5 Replace != null with is not null 2022-12-05 15:01:13 +01:00
Shadowghost
dd5f90802e Apply review suggestions 2022-12-03 14:32:20 +01:00
Shadowghost
bcd992fb06 Merge remote-tracking branch 'upstream/master' into network-rewrite 2022-12-03 12:44:45 +01:00
Bond_009
b92880a18b Fix integration tests
Author: cvium
2022-11-13 15:20:36 +01:00
Shadowghost
b7882db9c7 Prevent host lookup on GetSmartUrl for HTTP requests 2022-10-21 17:42:45 +02:00
Shadowghost
26d79a5ce3 Properly name some bind address functions, cleanup logging 2022-10-16 10:22:11 +02:00
adrez99
3736e360e7
Merge branch 'jellyfin:master' into gzip 2022-10-11 18:18:21 +02:00
Claus Vium
05c20001c8
Merge pull request #8381 from 1hitsong/lyric-lrc-file-support 2022-10-07 15:21:42 +02:00
Shadowghost
7b90fcd053 Merge branch 'master' into network-rewrite 2022-10-07 09:16:02 +02:00
cvium
5dc30c6a6d fix: use HttpContext and ClaimsPrincipal instead of IAuthorizationContext 2022-10-06 13:57:47 +02:00
Shadowghost
4fc52a840c Merge branch 'master' into network-rewrite 2022-10-01 19:59:00 +02:00
1hitsong
6f0d33b1ca Use Directory GetFiles to find lyric files 2022-09-20 08:36:54 -04:00
1hitsong
29932466a9 Remove commented out code 2022-09-17 10:55:04 -04:00
1hitsong
f740d1b9f0 Remove use of AddParts. Cleanup use of Lyric vs Lyrics. 2022-09-16 20:52:40 -04:00
1hitsong
f4fd908f8d Create ILyricManager 2022-09-15 20:49:25 -04:00
1hitsong
d9be3874ba Auto stash before merge of "lyric-lrc-file-support" and "origin/lyric-lrc-file-support" 2022-09-15 19:45:26 -04:00
Jamie Introcaso
c0dae0fef5 Adds lyric providers to DI pipeline
This is adding those lyric providers to the DI pipeline along with a super simple implementation of how to use them in the controller method. Probably should be refactored into a lyric service of some sort that would have the providers injected into it.
2022-09-14 20:39:35 -04:00
adrez99
b8afdd892a
Merge branch 'master' into gzip 2022-08-04 17:22:35 +02:00
Joshua Boniface
38eefbbafa Backport pull request #8087 from jellyfin/release-10.8.z
feat: make subtitleeditparser generic

Authored-by: Claus Vium <cvium@users.noreply.github.com>

Merged-by: Bond-009 <bond.009@outlook.com>

Original-merge: 7323ccfc23
2022-08-01 14:25:42 -04:00
Joshua Boniface
410871e148 Backport pull request #7732 from jellyfin/release-10.8.z
Fix to make web sockets close gracefully on server shutdown

Authored-by: luke brown <luke92brown@gmail.com>

Merged-by: Cody Robibero <cody@robibe.ro>

Original-merge: ee22feb89a
2022-07-24 12:35:46 -04:00
Shadowghost
daf33143f6 Handle forwarded requests not having port set in GetSmartApiUrl 2022-07-20 09:44:15 +02:00
Shadowghost
066db8ac7f Migrate NetworkManager and Tests to native .NET IP objects 2022-07-19 21:28:04 +02:00
adrez99
aadd8ee971
Merge branch 'master' into gzip 2022-06-30 17:24:40 +02:00
Cody Robibero
a99e87a00c Merge pull request #7954 from cvium/fix_7953_dlna_url
(cherry picked from commit 2c0c3eb3ee)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-06-29 01:26:15 -04:00
adrez99
72893da4d8
Use System.IO.Compression instead of SharpCompress for gzips 2022-06-19 00:06:40 +02:00
Bond_009
5732e6188c Fix some warnings 2022-02-15 18:59:46 +01:00
Bond_009
3cb49d6df0 Fix option to disable server discovery 2022-02-14 14:39:33 +01:00
Cody Robibero
34ee6d82fb
Merge pull request #6600 from cvium/keyframe_extraction_v1 2022-01-20 08:54:40 -07:00
cvium
6ffa9539bb Refactor and add scheduled task 2022-01-11 23:30:30 +01:00
Joe Rogers
1dfbeae045
Embed ProviderUtils into MetadataService 2022-01-04 00:44:03 +01:00
Bond_009
cbfa355e31 Update StyleCop 2021-12-24 18:28:27 +01:00
cvium
69df004b9f Migrate network configuration safely 2021-11-24 13:00:12 +01:00
cvium
a263f3978b Only force scheme and port when HTTPS is disallowed 2021-11-19 16:57:48 +01:00
cvium
4f45c52674 Remove ILibraryManager as a dependency in resolvers etc. 2021-11-15 15:56:02 +01:00
cvium
5a65bc1e69 Very light cleanup in applicationhost 2021-11-13 14:37:26 +01:00
Claus Vium
c3523e7cf7
Merge pull request #5905 from BaronGreenback/TVFix
Fix for Livetv and DLNA when bind interfaces specified.
2021-11-09 19:53:21 +01:00
cvium
82e6a21f3b Use the new method in DLNA 2021-11-08 10:58:04 +01:00
cvium
f03e77a4d5 Merge branch 'master' into TVFix 2021-11-08 10:38:08 +01:00
Cody Robibero
3398f7f953
Merge branch 'master' into client-logger 2021-11-03 07:52:06 -06:00
Bond_009
104e36f2f9 Streamline startup code 2021-11-02 16:02:52 +01:00
Cody Robibero
f78f1e834c Merge remote-tracking branch 'upstream/master' into client-logger 2021-10-26 17:43:36 -06:00
Claus Vium
5eda5eb636
Merge pull request #6486 from fredriklindberg/support-forwarded-headers-for-api-url 2021-10-25 22:41:32 +02:00
Bond_009
03f933aaa0 Fix the last few warnings
Enables TreatWarningsAsErrors for all projects
2021-10-06 11:30:45 +02:00
Fredrik Lindberg
90174f68e2 Dynamically populate LocalAddress based on HTTP request
Support populating the LocalAddress field in the system info
endpoint based on the x-forwarded-host and x-forwarded-proto header.

The x-forwarded-host header must contain both the host and port for
the url to be properly constructed.

Behind network configuration option that is disabled by default.
2021-09-14 21:38:11 +02:00
cvium
153e920239 Ignore published server url for local access 2021-09-07 11:48:06 +02:00
cvium
be9663ae89 Use GetSmartApiUrl instead (hopefully it works) 2021-09-07 10:27:55 +02:00
cvium
ffe5ae8056 Merge branch 'master' into TVFix 2021-09-05 10:11:17 +02:00
Bond_009
637e86478f Fix some warnings 2021-09-03 19:32:11 +02:00
Cody Robibero
ff9d14c811 Merge remote-tracking branch 'upstream/master' into authenticationdb-efcore 2021-09-03 11:01:55 -06:00
Cody Robibero
ec13412155 Merge remote-tracking branch 'upstream/master' into warn-259810 2021-09-03 06:56:45 -06:00
Bond_009
963ab2dab6 Simplify the way we choose our ffmpeg
* no longer search $PATH
* no longer require a full path
* don't fall back
2021-08-30 15:40:52 +02:00
Cody Robibero
cba07b1ca6 Remove more and more warnings 2021-08-28 16:32:50 -06:00
Patrick Barron
45f478f63e Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Security/IAuthenticationRepository.cs
#	MediaBrowser.Controller/Session/ISessionManager.cs
2021-08-13 21:08:24 -04:00
Claus Vium
5a9bd712b3
Merge pull request #6296 from Bond-009/oscheck
Improve platform checks
2021-07-23 20:54:13 +02:00
Bond-009
b20977dc25
Merge pull request #6289 from Bond-009/warn33
Fix some warnings
2021-07-12 23:53:52 +02:00
Bond_009
8528e9bddb Improve platform checks 2021-07-12 20:21:51 +02:00
Bond_009
915141f196 Fix some warnings 2021-07-11 22:51:36 +02:00
Bond_009
b91c4be74c Remove old "has update available" code
This is the job of a package manager (or maybe the tray app for windows)
2021-07-11 22:42:02 +02:00
Patrick Barron
be88efce3c Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
#	Emby.Server.Implementations/Security/AuthenticationRepository.cs
#	Emby.Server.Implementations/Session/SessionManager.cs
#	Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
#	MediaBrowser.Controller/Net/ISessionContext.cs
2021-06-18 18:56:10 -04:00
Patrick Barron
a0c6f72762 Migrate authentication db to EF Core 2021-05-20 23:56:59 -04:00
Bond_009
7e8428e588 Enable nullable reference types for Emby.Server.Implementations 2021-05-20 22:48:53 +02:00
Patrick Barron
a225f34796 Merge branch 'master' into authenticationdb-efcore
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
2021-05-18 18:09:46 -04:00
BaronGreenback
2e98de9062
Code Clean up: Convert to null-coalescing operator ?? (#5845)
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2021-05-05 13:51:14 +02:00
BaronGreenback
417a7011c7 changed to first 2021-05-04 16:32:17 +01:00
BaronGreenback
7ff52bf755 Renamed 2021-05-03 19:30:56 +01:00
BaronGreenback
7936ea59eb Changed selection method 2021-05-03 17:27:23 +01:00
BaronGreenback
a5aabbb885
Update ApplicationHost.cs
Renamed method
2021-05-01 17:14:37 +01:00
BaronGreenback
2182640519
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-04-30 09:08:56 +01:00
BaronGreenback
78e97dbaa9 updated comment 2021-04-26 19:56:15 +01:00
BaronGreenback
5741fa7dfa Fix url for LiveTV 2021-04-26 17:13:45 +01:00
crobibero
1d6224c9c6 Add endpoint to log client events 2021-04-26 07:02:26 -06:00
Bond_009
b0914f9f2c Remove unused/duplicate services 2021-04-22 01:20:55 +02:00
Bond_009
499bac5185 EncodingHelper: Fix circular dependency 2021-04-20 23:03:36 +02:00
Bond_009
a4ffc7a813 Fix random failing of tests
Fully initialize the configuration manager at the init stage

```
Failed Jellyfin.Server.Integration.Tests.Controllers.ActivityLogControllerTests.ActivityLog_GetEntries_Ok [2 s]
  Error Message:
   MediaBrowser.Common.Extensions.ResourceNotFoundException : Configuration with key metadata not found.
  Stack Trace:
     at Emby.Server.Implementations.AppBase.BaseConfigurationManager.<>c__DisplayClass43_0.<GetConfiguration>b__0(String k) in D:\a\1\s\Emby.Server.Implementations\AppBase\BaseConfigurationManager.cs:line 309
   at System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd(TKey key, Func`2 valueFactory)
   at Emby.Server.Implementations.AppBase.BaseConfigurationManager.GetConfiguration(String key) in D:\a\1\s\Emby.Server.Implementations\AppBase\BaseConfigurationManager.cs:line 300
   at MediaBrowser.Common.Configuration.ConfigurationManagerExtensions.GetConfiguration[T](IConfigurationManager manager, String key) in D:\a\1\s\MediaBrowser.Common\Configuration\IConfigurationManager.cs:line 88
   at MediaBrowser.Controller.Library.MetadataConfigurationExtensions.GetMetadataConfiguration(IConfigurationManager config) in D:\a\1\s\MediaBrowser.Controller\Library\MetadataConfigurationStore.cs:line 28
   at Emby.Server.Implementations.Library.ResolverHelper.SetDateCreated(BaseItem item, IFileSystem fileSystem, FileSystemMetadata info) in D:\a\1\s\Emby.Server.Implementations\Library\ResolverHelper.cs:line 159
   at Emby.Server.Implementations.Library.ResolverHelper.EnsureDates(IFileSystem fileSystem, BaseItem item, ItemResolveArgs args) in D:\a\1\s\Emby.Server.Implementations\Library\ResolverHelper.cs:line 153
   at Emby.Server.Implementations.Library.ResolverHelper.SetInitialItemValues(BaseItem item, ItemResolveArgs args, IFileSystem fileSystem, ILibraryManager libraryManager) in D:\a\1\s\Emby.Server.Implementations\Library\ResolverHelper.cs:line 81
   at Emby.Server.Implementations.Library.LibraryManager.ResolveItem(ItemResolveArgs args, IItemResolver[] resolvers) in D:\a\1\s\Emby.Server.Implementations\Library\LibraryManager.cs:line 480
   at Emby.Server.Implementations.Library.LibraryManager.ResolvePath(FileSystemMetadata fileInfo, IDirectoryService directoryService, IItemResolver[] resolvers, Folder parent, String collectionType, LibraryOptions libraryOptions) in D:\a\1\s\Emby.Server.Implementations\Library\LibraryManager.cs:line 618
   at Emby.Server.Implementations.Library.LibraryManager.ResolvePath(FileSystemMetadata fileInfo, Folder parent) in D:\a\1\s\Emby.Server.Implementations\Library\LibraryManager.cs:line 536
   at Emby.Server.Implementations.Library.LibraryManager.CreateRootFolder() in D:\a\1\s\Emby.Server.Implementations\Library\LibraryManager.cs:line 732
   at Emby.Server.Implementations.Library.LibraryManager.get_RootFolder() in D:\a\1\s\Emby.Server.Implementations\Library\LibraryManager.cs:line 180
   at Emby.Server.Implementations.IO.LibraryMonitor.Start() in D:\a\1\s\Emby.Server.Implementations\IO\LibraryMonitor.cs:line 135
   at Emby.Server.Implementations.IO.LibraryMonitorStartup.RunAsync() in D:\a\1\s\Emby.Server.Implementations\IO\LibraryMonitorStartup.cs:line 26
   at Emby.Server.Implementations.ApplicationHost.StartEntryPoints(IEnumerable`1 entryPoints, Boolean isBeforeStartup)+MoveNext() in D:\a\1\s\Emby.Server.Implementations\ApplicationHost.cs:line 541
   at System.Threading.Tasks.Task.WhenAll(IEnumerable`1 tasks)
   at Emby.Server.Implementations.ApplicationHost.RunStartupTasksAsync(CancellationToken cancellationToken) in D:\a\1\s\Emby.Server.Implementations\ApplicationHost.cs:line 525
   at Jellyfin.Server.Integration.Tests.JellyfinApplicationFactory.CreateServer(IWebHostBuilder builder) in D:\a\1\s\tests\Jellyfin.Server.Integration.Tests\JellyfinApplicationFactory.cs:line 101
   at Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory`1.EnsureServer()
   at Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory`1.CreateDefaultClient(DelegatingHandler[] handlers)
   at Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory`1.CreateDefaultClient(Uri baseAddress, DelegatingHandler[] handlers)
   at Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory`1.CreateClient(WebApplicationFactoryClientOptions options)
   at Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory`1.CreateClient()
   at Jellyfin.Server.Integration.Tests.Controllers.ActivityLogControllerTests.ActivityLog_GetEntries_Ok() in D:\a\1\s\tests\Jellyfin.Server.Integration.Tests\Controllers\ActivityLogControllerTests.cs:line 21
--- End of stack trace from previous location ---

```
2021-04-12 00:28:17 +02:00
Patrick Barron
44e71774b1 Rewrite device manager using EF Core 2021-04-10 16:17:36 -04:00
Bond-009
16011d96a0
Merge pull request #5321 from Ullmie02/nfo-thumb 2021-03-25 01:10:37 +01:00
Bond_009
a8ed753f6c FxCop -> Net Analyzers (part 2) 2021-03-13 22:33:28 +01:00
Joshua M. Boniface
3c46f10e3d
Merge pull request #5315 from BaronGreenback/FixFor5280Part2 2021-03-08 18:06:40 -05:00
BaronGreenback
d3390302f9
Update ApplicationHost.cs 2021-03-08 11:43:59 +00:00
Bond-009
c2af32d035
Merge pull request #5299 from Bond-009/tests13 2021-03-01 18:51:09 +01:00
David
16694b0cfc Add nfo thumb tag support 2021-02-28 15:00:17 +01:00
BaronGreenback
159ecb882f Fixed bad sync 2021-02-28 10:14:05 +00:00
BaronGreenback
80ca3da55c Merge remote-tracking branch 'upstream/master' into FixFor5280Part2 2021-02-28 10:12:14 +00:00
BaronGreenback
1d6f489f17 comment change 2021-02-28 10:11:37 +00:00
BaronGreenback
f666b7e102 fix 2021-02-27 23:32:22 +00:00
Claus Vium
9e77fdc70d
Merge pull request #5312 from BaronGreenback/FixFor5280 2021-02-27 20:01:51 +01:00
BaronGreenback
73ca367bf9
Update Emby.Server.Implementations/ApplicationHost.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-02-27 17:34:48 +00:00
BaronGreenback
d95ca20fc7 removed bad merge code 2021-02-27 14:05:13 +00:00
BaronGreenback
a25e3c0256 fix for override ports contained in PublishedServerUrl 2021-02-27 13:56:21 +00:00
Bond_009
2bc1eef4dd Clean up code 2021-02-24 22:18:59 +01:00
Bond_009
032d72a8a7 Pls fix race condition 2021-02-23 17:30:24 +01:00