lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,637 Commits 2 Branches 0 Tags 64 MiB
477e7f7898
Commit Graph

565 Commits

Author SHA1 Message Date
ConfusedPolarBear
5d281adedd Merge remote-tracking branch 'upstream/master' into quickconnect 2020-05-29 17:42:42 -05:00
Patrick Barron
01ce56016a Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
#	MediaBrowser.Api/UserService.cs
#	MediaBrowser.Controller/Library/IUserManager.cs
 2020-05-26 20:29:11 -04:00
gion
e4838b0faa Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-26 10:23:09 +02:00
Patrick Barron
3eeb6576d8 Migrate User DB to EF Core 2020-05-20 10:04:00 -04:00
Patrick Barron
aca7e221d8 Merge branch 'master' into userdb-efcore 
# Conflicts:
#	Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/Devices/DeviceManager.cs
#	Jellyfin.Server/Jellyfin.Server.csproj
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Controller/Devices/IDeviceManager.cs
 2020-05-15 17:20:07 -04:00
gion
029bb80910 Merge remote-tracking branch 'upstream/master' into syncplay 2020-05-15 18:59:35 +02:00
Patrick Barron
953777f1ba Removed unnecessary usings 2020-05-14 18:12:51 -04:00
Patrick Barron
87c63e668c
Merge branch 'master' into activitydb-efcore 2020-05-14 21:16:43 +00:00
Patrick Barron
b94afc597c Address review comments 2020-05-14 17:13:45 -04:00
Mark Monteiro
2e09311a93
Merge branch 'master' into websocket 2020-05-14 11:08:08 -04:00
Patrick Barron
a8f0d0aa0d
Merge branch 'master' into activitydb-efcore 2020-05-13 19:06:04 +00:00
Vasily
f08830ea00
Merge pull request #2774 from mark-monteiro/simplify-https-config 
Simplify HTTPS Properties
 2020-05-13 20:36:54 +03:00
Patrick Barron
b7621d762c 2nd half of changes 2020-05-13 00:00:57 -04:00
Patrick Barron
9ad839c776 Initial migration code 2020-05-12 22:10:35 -04:00
Patrick Barron
62420a6eb1 Remove support for injecting ILogger directly 2020-05-12 16:03:15 -04:00
Mark Monteiro
3abf870c1e Do not include a double slash in URLs when a base URL is not set 2020-05-10 18:07:56 -04:00
Mark Monteiro
dc5165b97f Merge branch 'master' into simplify-https-config 2020-05-10 14:43:57 -04:00
Mark Monteiro
43c22a5822 Add GetLoopbackHttpApiUrl() helper method to replace forceHttps functionality 
Also refactor to use return a Uri instead of a string and use UriBuilder under the hood
 2020-05-10 14:36:11 -04:00
gion
8a6ec2fb71 Rename Syncplay to SyncPlay 2020-05-09 12:37:39 +02:00
Patrick Barron
032de931b1 Migrate activity db to EF Core 2020-05-02 18:32:22 -04:00
Bond_009
3623aafcb6 Make SonarCloud happy 2020-05-02 01:30:04 +02:00
Bond_009
04f826e50c Fix merge errors 2020-05-02 01:09:35 +02:00
Bond_009
15634a1913 Merge branch 'master' into websocket 2020-05-02 00:54:04 +02:00
Bond-009
690fb65cd8
Merge pull request #2985 from sparky8251/prometheus 
Add Prometheus exporters
 2020-04-29 11:36:05 +02:00
BaronGreenback
ebd589aa86 Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored. 
Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
 2020-04-28 21:57:39 +01:00
BaronGreenback
a3140f83c6 Revert "Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored." 
This reverts commit 2aaecb8e14.
 2020-04-28 21:51:49 +01:00
BaronGreenback
2aaecb8e14 Whilst fixing issues with SSDP on devices with multiple interfaces, i came across a design issue in the current code - namely interfaces without a gateway were ignored. 
Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
 2020-04-28 21:45:46 +01:00
gion
10c2c62f07 Implement syncplay backend 2020-04-27 22:07:33 +02:00
sparky8251
e3a42a8fe9 Address reviews 2020-04-27 08:42:46 -04:00
Mark Monteiro
15fd4812f0 Remove unnecessary foreach loop 2020-04-26 18:04:34 -04:00
Joshua M. Boniface
f502c89331
Merge pull request #2798 from JustAMan/fix-livetv-again 
Make localhost LiveTV restreams always use plain HTTP port
 2020-04-26 15:13:27 -04:00
Joshua M. Boniface
23c8ecff37
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:58:24 -04:00
Joshua M. Boniface
d92a3552b7
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:57:45 -04:00
Joshua M. Boniface
7a550d2c4e
Apply style change 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2020-04-26 14:57:31 -04:00
Mark Monteiro
57b5ec1d51 Remove unnecessary properties from SystemInfo response object 
These properties do not provide any useful information to the client. The client would already have to have all this information in order to connect to the endpoint to retrieve it
 2020-04-26 12:07:54 -04:00
Mark Monteiro
93649ad77b Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-26 11:44:42 -04:00
sparky8251
68c7a914c3 Added option to disable metrics collection and defaulted it to off 2020-04-26 11:28:17 -04:00
Mark Monteiro
bc4e72b29b Create ApplicationHost logger correctly 2020-04-20 20:48:39 -04:00
Mark Monteiro
f815059698 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-20 20:11:33 -04:00
Vasily
07143bcb68
Merge pull request #2466 from dkanada/plugin 
Update plugin classes for nightly builds
 2020-04-21 01:45:52 +03:00
dkanada
eda208e258
Merge pull request #2829 from Bond-009/warn19 
Fix some warnings
 2020-04-19 12:04:02 +09:00
Mark Monteiro
00a0e013c6 Update documentation for URL methods in ApplicationHost 2020-04-16 21:46:49 -04:00
Mark Monteiro
fee76097f4 Remove CanConnectWithHttps Property 
It is only used in one place and only adds confusion by existing
 2020-04-16 21:45:00 -04:00
ConfusedPolarBear
36f3e933a2 Add quick connect 2020-04-15 14:49:20 -05:00
Bond_009
d6daac5064 Fix build 2020-04-15 11:12:58 +02:00
Mark Monteiro
9728aa8b0a Merge branch 'master' into register-services-correctly 2020-04-13 17:06:24 -04:00
dkanada
cb2523e2ef merge branch master into plugin 2020-04-13 14:38:19 +09:00
Bond-009
3d611743ed
Merge pull request #2680 from mark-monteiro/remove-common-process 
Remove CommonProcess and ProcessFactory
 2020-04-11 20:30:20 +02:00
Mark Monteiro
7152b55747 Use a separate line for each property initializer 2020-04-11 13:28:21 -04:00
Mark Monteiro
17e8813378 Use ActivatorUtilities to construct MediaEncoder and update constructor to inject EncodingHelper correctly 2020-04-11 10:53:13 -04:00
Mark Monteiro
1e1295bebf Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
dkanada
bd55bdb4e3 merge branch master into plugin 2020-04-11 20:10:16 +09:00
dkanada
8e9aeb84b1 remove release channel from plugin classes 2020-04-11 19:33:36 +09:00
Bond_009
49fe5e0a21 Fix some warnings 2020-04-11 12:03:10 +02:00
Vasily
e85f9f5613 Make localhost LiveTV restreams always use plain HTTP port 2020-04-07 18:41:15 +03:00
dkanada
0cd7cd611e
Merge pull request #2758 from Bond-009/plugininstalled 
Remove PluginInstalled
 2020-04-06 19:01:15 +09:00
Mark Monteiro
5bc6c08a0a Merge remote-tracking branch 'upstream/master' into simplify-https-config 2020-04-06 00:24:11 -04:00
Mark Monteiro
410a322fe2 Add CanConnectWithHttps to interface 2020-04-05 23:30:57 -04:00
Mark Monteiro
f91f2ef328 Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-05 10:07:17 -04:00
Mark Monteiro
f2760cb055 Register IImageEncoder in Jellyfin.Server instead of Emby.Server.Implementations 2020-04-05 10:03:53 -04:00
Bond-009
29539174a3
Merge pull request #2636 from mark-monteiro/development-https 
Use ASP.NET Core HTTPS Development Certificate
 2020-04-05 15:09:27 +02:00
Mark Monteiro
bc91445b5d Use correct naming convention for _relevantEnvVarPrefixes 2020-04-05 09:05:23 -04:00
Mark Monteiro
735d6c8ad5 Convert properties in ApplicationHost to private readonly fields, where possible 2020-04-04 23:18:47 -04:00
Mark Monteiro
241d0ae65c Inject IStartupOptions into StartupWizard 2020-04-04 23:14:35 -04:00
Mark Monteiro
809cf3a0c2 Register IJsonSerializer correctly 2020-04-04 21:33:57 -04:00
Mark Monteiro
710767fbf2 Add deprecation warning message for injecting ILogger 2020-04-04 21:27:48 -04:00
Mark Monteiro
e16c16dd51 Register and construct IHttpClient correctly 2020-04-04 21:18:09 -04:00
Mark Monteiro
adf0e8d3fd Register and construct ITaskManager and IIsoManager correctly 2020-04-04 21:00:11 -04:00
Mark Monteiro
3f2f95d877 Register IProcessFactory, ICryptoProvider and ISocketFactory correctly 2020-04-04 20:42:11 -04:00
Mark Monteiro
aee6a1b476 Remove unnecessary async and parameter from ApplicationHost initialization method 2020-04-04 20:40:50 -04:00
Mark Monteiro
5d648bf54f Register and construct ILocalizationManager correctly 2020-04-04 20:21:48 -04:00
Mark Monteiro
cbc0224aaf Register IStreamHelper, IInstallationManager, IZipClient, IHttpResultFactory and IBlurayExaminer correctly 2020-04-04 20:00:55 -04:00
Mark Monteiro
615717e562 Register and construct IUserDataManager and IUserDataRepository correctly 2020-04-04 19:57:26 -04:00
Mark Monteiro
5827f0f5a9 Register IDisplayPreferencesRepository correctly 2020-04-04 19:40:53 -04:00
Mark Monteiro
a5234dfd88 Register and construct IAuthenticationRepository correctly 2020-04-04 19:36:27 -04:00
Mark Monteiro
4daa5436fc Register and construct IUserManager and IUserRepository correctly 2020-04-04 19:31:14 -04:00
Mark Monteiro
84b48eb69c Convert MediaEncoder property to field 2020-04-04 19:01:21 -04:00
Mark Monteiro
fe9f4e06d1 Register and construct LibraryManager correctly 2020-04-04 18:28:46 -04:00
Mark Monteiro
7fd25f94f3 Inject and construct ISearchEngine and IMusicManager correctly 2020-04-04 18:22:29 -04:00
Mark Monteiro
c2b21ce553 Register and construct ILibraryMonitor correctly 2020-04-04 17:33:00 -04:00
Mark Monteiro
d173358065 Move ApplicationHost certificate initialization to constructor 2020-04-04 17:19:16 -04:00
Mark Monteiro
07cebbeae2 Register and construct IImageProcessor, SqliteItemRepository and IImageEncoder correctly 2020-04-04 17:12:24 -04:00
Mark Monteiro
efe3ebaab8 Eliminate circular dependency between LibraryManager and ImageProcessor 2020-04-04 16:01:10 -04:00
Mark Monteiro
11693d6024 Register ITvManagerService correctly 2020-04-04 15:44:44 -04:00
Mark Monteiro
71c84905de Register IDeviceManager correctly 2020-04-04 15:40:06 -04:00
Mark Monteiro
573da63d41 Register and construct IMediaSourceManager correctly 2020-04-04 15:28:21 -04:00
Mark Monteiro
dd5a55aeba Register ISubtitleManager correctly 2020-04-04 15:12:02 -04:00
Mark Monteiro
0ce82ab332 Remove unnecessary fields in ApplicationHost 2020-04-04 15:05:50 -04:00
Mark Monteiro
51b9a6e94b Register IProviderManager correctly 2020-04-04 14:56:50 -04:00
Mark Monteiro
75b05ca1e6 Register and construct DtoService correctly 2020-04-04 14:41:03 -04:00
Mark Monteiro
cb2d99e831 Construct LiveTvDtoService and LiveTvManager correctly 2020-04-04 14:40:04 -04:00
Mark Monteiro
f78423bd49 Register IChannerManager correctly 2020-04-04 14:32:35 -04:00
Mark Monteiro
bb3db9e845 Register ISessionManager, IDlnaManager and ICollectionManager correctly; replace private properties with fields 2020-04-04 13:56:01 -04:00
Mark Monteiro
3d5b4f869c Register ILiveTvManager and IPlaylistManager correctly 2020-04-04 13:16:53 -04:00
Mark Monteiro
1456365411 Register IUserViewManager correctly 2020-04-04 13:10:39 -04:00
Mark Monteiro
f1d0fb1edb Register INotificationManager correctly; resolve services correctly 2020-04-04 13:03:32 -04:00
Mark Monteiro
78370911c2 Register IDeviceDiscovery, IChapterManager, IAttachmentExtractor correctly 2020-04-04 12:56:36 -04:00
Mark Monteiro
7884c3813d Register IEncodingManager correctly; remove unnecessary properties in ApplicationHost 2020-04-04 12:51:56 -04:00
Mark Monteiro
4ba07b114d Register and initialize IActivityRepository correctly 2020-04-04 12:46:35 -04:00
Mark Monteiro
3dbbe54f6c Register IResourceFileManager correctly 2020-04-04 12:42:21 -04:00
Mark Monteiro
18c1823cea Register IAuthorizationContext correctly 2020-04-04 12:40:33 -04:00
Mark Monteiro
358deecf52 Register ISessionContext correctly 2020-04-04 12:38:59 -04:00
Mark Monteiro
3147111471 Register IAuthService correctly 2020-04-04 12:34:01 -04:00
Mark Monteiro
92b0d40ad4 Move service initializations into correct method 2020-04-04 12:33:25 -04:00
Mark Monteiro
e9e12b8eb9 Register ISubtitleEncoder correctly 2020-04-04 12:26:24 -04:00
Bond_009
ae21c67537 Remove PluginInstalled 
Doesn't do anything yet as all plugins (afaik) still require a restart
 2020-04-04 11:28:37 +02:00
Mark Monteiro
e0f40f57d8 Merge remote-tracking branch 'upstream/master' into remove-common-process 2020-04-03 20:22:03 -04:00
Mark Monteiro
ca71ac72ab Replace EnableHttps and SupportsHttps with ListenWithHttps and CanConnectWithHttps 2020-04-02 17:45:04 -04:00
Bond-009
b3283e37f2
Merge pull request #2740 from JustAMan/fix-livetv 
Fix GetLocalApiUrl for cases with https enabled
 2020-04-02 18:04:49 +02:00
Vasily
bece62fd5c Fix GetLocalApiUrl for cases with https enabled 
This should fix LiveTV and tuners
 2020-04-02 13:40:48 +03:00
Mark Monteiro
0e57348cf4 Merge remote-tracking branch 'upstream/master' into development-https 2020-04-01 23:21:30 +02:00
Mark Monteiro
5b1091db27 Merge remote-tracking branch 'upstream/master' into do-not-instantiate-services-at-startup 2020-04-01 23:05:36 +02:00
Vasily
07ea120ba9
Merge pull request #2601 from mark-monteiro/support-running-without-web-content 
Support Running Server Without Web Content
 2020-04-01 23:38:43 +03:00
Vasily
10275a1f32
Merge pull request #2447 from Bond-009/minor 
Add analyzers to MediaBrowser.Providers and minor improvements
 2020-04-01 23:35:40 +03:00
Bond_009
787049f35f Merge branch 'master' into minor 2020-04-01 18:53:22 +02:00
Bond_009
147e434634 Try to not crash on unsupported plugin load 2020-04-01 14:50:18 +02:00
Mark Monteiro
b947d98266 Delete unnecessary ProcessFactory abstraction 2020-03-27 00:45:48 +01:00
Mark Monteiro
ee2f911a2b Remove unnecessary CommonProcess abstraction 2020-03-27 00:10:16 +01:00
Mark Monteiro
d1fe28fac6 Check for null before disposing 2020-03-25 19:16:12 +01:00
Mark Monteiro
6f8c81ff7e Register ServiceController with the DI framework 2020-03-21 23:28:07 +01:00
Mark Monteiro
dc140429fe Do not create unnecessary instances of IService at server startup 2020-03-21 23:17:30 +01:00
Mark Monteiro
c36e4ecc6c Log all 'DOTNET_' and 'ASPNETCORE_' environment variables at application startup 2020-03-21 22:45:57 +01:00
Mark Monteiro
0e3d319a3a Log 'ASPNETCORE_ENVIRONMENT' value at application startup 2020-03-21 22:30:38 +01:00
dkanada
9649b986d8
Merge pull request #2621 from mark-monteiro/log-env-vars-at-startup 
Log 'JELLYFIN_' environment variables at application start
 2020-03-18 23:52:43 +09:00
dkanada
a96c0a72b8
Merge pull request #2549 from dkanada/refactor 
Refactor some provider classes
 2020-03-18 17:43:15 +09:00
Mark Monteiro
885bc11b67 Log 'JELLYFIN_' environment variables at application start 2020-03-17 14:30:08 +01:00
Mark Monteiro
e2685c51ec Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-15 18:07:02 +01:00
Mark Monteiro
05ab61200a Do not call UseContentRoot() on the web host builder 
This call has nothing to do with static web content and should not have ever been called with the web content path: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/?view=aspnetcore-3.1&tabs=windows#content-root
Since this call is removed, the ContentRoot property is also removed from ApplicationHost as it is no longer needed.
Finally, move validation of the static content path to the DashboardService where it is actually used.
 2020-03-15 17:42:57 +01:00
Mark Monteiro
6fbdf0d6a2 Construct ApplicationHost with DI framework instead of manually 2020-03-15 15:28:29 +01:00
Bond-009
94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
Mark Monteiro
6131599e88 Merge branch 'master' into support-injecting-iconfiguration 2020-03-10 22:45:17 +01:00
dkanada
d7c34b4611 start tvdb migration for plugin interface 2020-03-09 23:53:07 +09:00
Mark Monteiro
9aa259eb95 Revert unnecessary ordering changes in ApplicationHost 2020-03-03 23:56:47 +01:00
Mark Monteiro
6b06a9a919 Make Logger and LoggerFactory both protected in ApplicationHost 2020-03-03 23:53:48 +01:00
Mark Monteiro
c49a12dd73 Make LoggerFactory private in ApplicationHost and use it to construct loggers with context 2020-03-03 23:31:25 +01:00
Mark Monteiro
370c312e01 Make logger private in ApplicationHost 2020-03-03 23:08:42 +01:00
Mark Monteiro
76957213e6 Merge remote-tracking branch 'upstream/master' into support-injecting-iconfiguration 2020-03-03 22:27:49 +01:00
Mark Monteiro
a4bf645ba5 Fix compilation error 2020-03-03 01:10:26 +01:00
Mark Monteiro
c376f4ca51 Register Serilog logging services correctly 2020-03-03 00:35:41 +01:00
Mark Monteiro
189f005846 Remove IConfiguration from service collection 
This does not appear to be used anywhere and the web host already handles injecting this as a special case anyways
 2020-02-28 23:35:53 +01:00
Mark Monteiro
48f8118072 Do not save a reference to the startup config in ApplicationHost 2020-02-28 23:28:15 +01:00
dkanada
974a04c129 update plugin classes for nightly builds 2020-02-26 01:58:39 +09:00
dkanada
a3bb81553d
Merge pull request #2176 from Bond-009/nullable2 
Enable nullable reference types for Emby.Photos and Emby.Notifications
 2020-02-23 21:52:46 +09:00
Bond_009
07cc4be6a7 Fix some warnings 
* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
 2020-02-23 12:11:43 +01:00
Bond_009
a07ee65365 Minor improvements 2020-02-23 10:53:51 +01:00
dkanada
6e239c52c5
Merge pull request #2291 from Bond-009/sessionmanager 
Fix warnings in SessionManager
 2020-02-23 10:53:44 +09:00
dkanada
61015c1d0f
Merge pull request #2321 from Bond-009/images 
Simplify image processing by removing image enhancers
 2020-02-21 12:32:54 +09:00
Bond-009
0f173e1778
Merge branch 'master' into sessionmanager 2020-02-19 21:07:09 +01:00
Ulrich Wagner
0f2ee2686d Constructor of the LibraryManager takes the mediaEncoder as parameter 2020-02-19 16:06:30 +01:00
Bond_009
f5db4c8402 Another baseurl related fix 
Baseurl always starts with a '/' (unless it's empty)
 2020-02-12 20:57:34 +01:00