michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,110 Commits 2 Branches 79 Tags 73 MiB
82b0786cc6
Commit Graph

358 Commits

Author SHA1 Message Date
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
2a01537371 Merge command line options into framework configuration 2020-03-15 15:34:09 +01:00
Mark Monteiro
0996ce2898 Add --nowebcontent command line flag 
Added without any functionality
 2020-03-15 15:31:43 +01:00
Mark Monteiro
6fbdf0d6a2 Construct ApplicationHost with DI framework instead of manually 2020-03-15 15:28:29 +01:00
Mark Monteiro
6a6293afc7 Make startup config nullable when configuring app configuration 2020-03-15 13:15:47 +01:00
Mark Monteiro
420e3619fb Use startup configuration to set the default redirect path 2020-03-15 13:01:05 +01:00
Mark Monteiro
4102e3afd0 Rename IsNoWebContent to NoWebContent 2020-03-15 13:00:14 +01:00
Mark Monteiro
99bf6edba2 Merge remote-tracking branch 'upstream/master' into support-running-without-web-content 2020-03-11 23:04:47 +01:00
Mark Monteiro
29bad073eb Use config setting to decide if web content should be hosted 
Also fail server startup if web content is expected but missing
 2020-03-11 22:54:54 +01:00
Mark Monteiro
6131599e88 Merge branch 'master' into support-injecting-iconfiguration 2020-03-10 22:45:17 +01:00
Mark Monteiro
9e89cbbc3a Store migration names alongside Ids in configuration in order to assist with development/debugging 2020-03-08 17:40:30 +01:00
Mark Monteiro
72bf920291 Use a Guid to uniquely identify migrations instead of a string name 
Also use a list instead of an array to store executed migrations in the configuration class
 2020-03-08 16:05:31 +01:00
Mark Monteiro
8dbb1c9257 Use logging.json instead of logging.user.json for override settings 2020-03-08 15:46:13 +01:00
Mark Monteiro
2f0b4cc24c Clean up migration logging messages 2020-03-08 15:02:59 +01:00
Mark Monteiro
a0fdceb4bc Throw exception on migration failure to halt application 
Also save migration configuration after each migration instead of at the end in case an exception is thrown part way through the list
 2020-03-08 15:02:42 +01:00
Joshua M. Boniface
ae9948ce04
Merge branch 'master' into logging-migration 2020-03-07 21:19:24 -05:00
Mark Monteiro
1295f6c79b Documentation and log message cleanup 2020-03-07 20:26:06 +01:00
Mark Monteiro
7ecb16a46e
do not ignore exceptions during migration execution 2020-03-07 18:23:32 +01:00
Mark Monteiro
4c2b543b30 Rename IUpdater to IMigrationRoutine 2020-03-06 21:51:50 +01:00
Mark Monteiro
6660006f01 Load user logging config file into application configuration 2020-03-06 19:28:36 +01:00
Mark Monteiro
1a9908d094 Add migration to create "logging.user.json" 2020-03-06 19:11:42 +01:00
Mark Monteiro
f2fdf50b3b Create separate constants for the two logging file names 2020-03-06 19:07:34 +01:00
Vasily
5a0f1fe848 Implement review suggestion 2020-03-06 19:01:07 +03:00
Vasily
098d3538e3 Disable logging.json migration as it is not ready yet 2020-03-06 17:22:22 +03:00
Vasily
d4564d8e29 More logging, mark all migrations as applied if setup wizard is not complete 2020-03-06 13:22:44 +03:00
Vasily
216e425cc5 Fix comment 2020-03-05 20:52:00 +03:00
Vasily
55b429e5e8 Moved migration routines to their own directory 2020-03-05 20:40:17 +03:00
Vasily
ccafebca68 Extract "migrations" config name to a proper constant 2020-03-05 20:37:49 +03:00
Vasily
ecaa7f8014 Improve migration logic 2020-03-05 20:09:33 +03:00
Vasily
66e11879ef Shuffle migrations in a more manageable structure 2020-03-05 18:21:27 +03:00
Vasily
9eef0e8ca0 Implement EnableThrottling migration for pre-10.5.0 to 10.5.0 or newer 2020-03-05 17:41:32 +03:00
Vasily
acd67c7152 Add tracking of JF version used to run this config previously 2020-03-05 16:22:15 +03:00
Mark Monteiro
76957213e6 Merge remote-tracking branch 'upstream/master' into support-injecting-iconfiguration 2020-03-03 22:27:49 +01:00
Mark Monteiro
9a6c279473 Increase min log level to 'Warning' framework namespaces 2020-03-03 00:36:54 +01:00
Mark Monteiro
c376f4ca51 Register Serilog logging services correctly 2020-03-03 00:35:41 +01:00
Mark Monteiro
48f8118072 Do not save a reference to the startup config in ApplicationHost 2020-02-28 23:28:15 +01:00
Mark Monteiro
a4e5a5ab31 Register configuration correctly with application using 'ConfigureAppConfiguration()' in WebHostBuilder 
Without this, the correct instance of IConfiguration is not injected into services that rely on it
 2020-02-28 23:18:22 +01:00
Mark Monteiro
3043b7323b Use constants for settings keys 2020-02-28 17:57:38 +01:00
Mark Monteiro
d95ccbacac Use IsHostingContent instead of explicitly checking ContentRoot 2020-02-26 16:11:09 +01:00
Mark Monteiro
192ec57b60 Remove log message executed before logger is initialized 2020-02-25 17:22:21 +01:00
Mark Monteiro
f3be93a4de Use the swagger API page as the default redirect path if not hosting the jellyfin-web content 2020-02-25 17:02:51 +01:00
Mark Monteiro
26af5ea45a Do not set a static content root if the jellyfin-web directory does not exist or is empty 2020-02-25 16:51:36 +01:00
Bond-009
a2490a7ae5
Merge branch 'master' into images 2020-02-12 17:41:46 +01:00
Bond_009
87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
Bond_009
2186df8ac4 Update deps 2020-01-28 22:42:07 +01:00
Bond-009
71bdcd7307 Fix spacing logs 2020-01-27 17:24:29 +01:00
Bond_009
ddf9b38799 Simplify image processing by removing image enhancers 2020-01-21 20:26:30 +01:00
Bond-009
96c9af5904 Add brackets around thread id 2020-01-16 13:20:01 +01:00
Bond_009
976459d3e8 Rewrite WebSocket handling code 2020-01-13 20:06:08 +01:00
Bond-009
65fe243afb Add thread ID and source to logging 2020-01-13 19:44:17 +01:00
Bond_009
bb236b9591 Merge branch 'master' into warn12 2020-01-10 21:18:16 +01:00
dkanada
fb61a1f882
Merge pull request #2150 from Bond-009/releaseerror 
Enable TreatWarningsAsErrors for some projects
 2020-01-02 10:13:57 +09:00
Joshua M. Boniface
d3bce6e380
Merge pull request #2107 from Bond-009/dotnet3.1 
Move to .Net Core 3.1
 2020-01-01 13:30:20 -05:00
Bond_009
7f5a174dff Merge branch 'master' into warn12 2019-12-20 19:43:57 +01:00
Bond_009
5a8e972952 Enable TreatWarningsAsErrors for some projects 
Analyzers are only run in debug build, so setting TreatWarningsAsErrors
for release build will catch the compiler warnings until we resolve all
analyzer warnings.
 2019-12-13 20:11:37 +01:00
Bond_009
2ef4ffd698 More warnings (removed) 2019-12-11 00:13:57 +01:00
Bond_009
0bf8bfbb0c Merge branch 'master' into mediaencoding 2019-12-10 23:00:59 +01:00
Bond_009
c8f403238e Move to .Net Core 3.1 2019-12-06 21:28:47 +01:00
excelite
12dd2c51a7 added required nuget package to enable serilog based centralized logging in gelf fromat 2019-11-29 23:03:59 +01:00
excelite
60691349a1 added filesize limit for logfiles and a maximum logfile count 2019-11-28 11:20:46 +01:00
Vasily
5263aaa026
Merge pull request #1503 from cvium/webapi_v2 
Move StartupWizard to ASP.NET Web Api
 2019-11-27 11:50:06 +03:00
Vasily
c45d54efb2
Merge pull request #1942 from Bond-009/nullable 
Enable nullable reference types for Jellyfin.Server
 2019-11-27 11:48:41 +03:00
Bond_009
cc5acf37f7 Make probesize and analyzeduration configurable and simplify circular 
dependencies

Makes the probesize and analyzeduration configurable with env args.
(`JELLYFIN_FFmpeg_probesize` and `FFmpeg_analyzeduration`)
 2019-11-25 12:07:59 +01:00
Claus Vium
47a4f2f387 Fix more review comments 2019-11-24 19:25:46 +01:00
Claus Vium
27e3cf1558 Move appbuilder and service collection to Jellyfin.Server 2019-11-24 15:27:58 +01:00
Bond_009
526776372e Validate https certificates 2019-11-22 16:23:42 +01:00
Bond_009
3cf9313c86 Update deps 2019-11-21 17:08:06 +01:00
Bond_009
3f7836d9eb Update deps and add MultiThreading analyzer 2019-11-01 17:55:44 +01:00
Bond-009
1258a3766f
Update Jellyfin.Server/Program.cs 
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
 2019-10-29 17:49:41 +01:00
Bond_009
2702dca8b6 Enable nullable reference types for Jellyfin.Server 2019-10-26 23:58:23 +02:00
Claus Vium
c3eac58dda Reload logging.json on changes 2019-10-23 19:52:12 +02:00
Bond_009
516933aab5 Move to netcore3.0 2019-10-11 18:32:13 +02:00
Bond_009
1745f0181c Log startup time 2019-09-29 00:29:28 +02:00
Bond_009
4f63bfd616 Don't log revision number 2019-09-27 23:58:04 +02:00
Vasily
ac9dfa8e93
Merge pull request #1775 from Bond-009/fixes 
Fix multiple mistakes and warnings
 2019-09-24 19:08:39 +03:00
Erwin de Haan
0ca0d9d01e Remove submodule and add clone and build to CI 2019-09-24 16:22:26 +02:00
Bond_009
c9820d30ed Fix multiple mistakes and warnings 2019-09-23 20:32:44 +02:00
Bond-009
2919cf28ea Update deps (#1735) 2019-09-11 13:31:35 -04:00
Bond_009
14fbd845c2 Move IsoMounter to plugin 2019-08-29 23:11:55 +02:00
Bond_009
3fd489d1cb Upgrade SQLitePCL to v2 2019-08-19 17:03:21 +02:00
Bond_009
99aea27723 Fix possible hidden exceptions 
If an error occurred while starting the server which in turn caused an
exception in the dispose method of the apphost, the first exception
wouldn't get logged.
 2019-08-18 20:01:08 +02:00
Bond_009
d62a3f0e57 Fix master 2019-08-15 00:00:21 +02:00
Bond_009
cb492fe3c7 Improve clickable link 2019-08-11 15:17:39 +02:00
Bond_009
003238ef5e Update deps + document startup project 
* Fixed the release build
* Documented all public/internal members of Jellyfin.Server
* Enable TreatWarningsAsErrors for debug builds for Jellyfin.Server

This will ensure that any new public/internal members of Jellyfin.Server
are documented
 2019-08-11 15:11:53 +02:00
Bond_009
2a58c643d2 Fix more warnings 2019-08-09 23:16:24 +02:00
Bond_009
ddd1a282ea Remove IpAddressInfo and IpEndPointInfo classes 2019-07-25 00:15:06 +02:00
Bond_009
c7d12cc481 Fix merge errors 2019-07-07 00:43:43 +02:00
Bond-009
82f041d050
Merge branch 'master' into release-10.3.z 2019-07-06 23:08:52 +02:00
Bond_009
d405a400aa Fixes issues with HttpClientManager 2019-07-06 20:04:42 +02:00
Bond_009
2e4c0fee77 Add removed line 2019-06-28 12:16:51 +02:00
Bond-009
e88ebd748d Final fixes 2019-06-28 12:14:27 +02:00
Bond-009
b6954f3bfd More 2019-06-28 12:14:27 +02:00
dkanada
b3b08fecb2
Merge pull request #1453 from Bond-009/cleanup2 
Improve main code flow
 2019-06-26 01:03:09 -07:00
dkanada
1b2621cd30
Merge pull request #1454 from Bond-009/webresource 
Simplify file serving code
 2019-06-21 23:33:37 -07:00
Bond_009
5554595255 Update deps 2019-06-14 18:49:57 +02:00
Bond_009
253e72f667 Simplify file serving code 2019-06-10 00:53:16 +02:00
Bond_009
aa30227545 Improve main code flow 
Improved the way how some parts of the code depend on eachother
Fixed some style issues
 2019-06-09 23:51:52 +02:00
Anthony Lavado
aee3360841
Merge pull request #1366 from Bond-009/warn3 
Fix more warnings
 2019-06-05 01:17:21 -04:00
Bond-009
ce1fa42f9d
Merge branch 'master' into tasks 2019-06-01 17:06:01 +02:00
Bond-009
a6f9ceedd8 Fix more warnings 2019-06-01 11:31:27 +02:00
Bond-009
a332092769 Reduce complexity http routes 2019-03-26 19:20:40 +01:00
Bond-009
b44a70ff36 Simplify/remove/clean code 
* Remove useless runtime check (we only support one)
* Remove unused args
* Remove a global constant

And ofc fix some warnings ;)
 2019-03-25 22:25:32 +01:00
Bond_009
2696ac5eac Lower the amount of running tasks 2019-03-25 21:33:48 +01:00
Erwin de Haan
21cc38fcf4 Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Erwin de Haan
ee7bf86e0f Adjusted the Product Name so the User Agent is correct/better. 2019-03-14 22:11:47 +01:00
PloughPuff
b864e9da2a Finalise removal of --ffprobe switch 
Removed --ffprobe from src files and server/docker scripts.
 2019-03-12 22:09:18 +00:00
Vasily
297f25cfc2
Merge pull request #1059 from Bond-009/os 
Remove EnvironmentInfo
 2019-03-13 00:01:00 +03:00
Joshua M. Boniface
6751560228
Merge pull request #1092 from joshuaboniface/configurable-webdir 
Add configurable webdir option
 2019-03-12 12:51:11 -04:00
Joshua Boniface
3c4043199a Implement review feedback 2019-03-12 09:18:45 -04:00
Vasily
497b4f834f
Merge pull request #1021 from Bond-009/failonwarn 
Fail on warnings for Jellyfin.Server
 2019-03-12 11:31:22 +03:00
Joshua Boniface
037cf9e1ee Move CreateDirectory for dataDir to try block 2019-03-10 18:30:10 -04:00
Joshua Boniface
5268553e7f Have datadir envvar match the others 2019-03-10 18:24:11 -04:00
Joshua Boniface
132ce3ece1 Add further resources to complete WebPath 2019-03-10 17:04:18 -04:00
Joshua Boniface
93d15cd969 Add configuration flag for Web directory 2019-03-10 16:17:48 -04:00
Bond-009
decaffed86 Remove EnvironmentInfo 
This moved the last bit of usefulness of EnvironmentInfo into a static
class.
 2019-03-07 22:41:41 +01:00
Bond-009
620d7b560d Fail on warnings for Jellyfin.Server 2019-03-07 21:52:16 +01:00
Bond-009
cedf50eeec Fix the 2 new warnings 2019-03-07 21:29:17 +01:00
Claus Vium
0abe57e930 Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc 2019-03-07 20:16:51 +01:00
PloughPuff
656bffbbb2 Remove --ffprobe logic 2019-03-05 21:29:15 +00:00
Claus Vium
df92df7bd6 Remove BOM 2019-03-05 19:22:41 +01:00
Claus Vium
1cc433eabc Start the webhost before RunStartupTasks and fix ContentEncoding 2019-03-03 13:54:14 +01:00
Claus Vium
e823c11b46 Add certificate to https and minor cleanup 2019-03-03 08:29:23 +01:00
Claus Vium
4e8de67aca Remove SocketSharp from Jellyfin.Server and some other cleanup 2019-02-26 22:11:21 +01:00
Claus Vium
d6c6f3c10c Still broken 2019-02-26 22:11:21 +01:00
Claus Vium
852460b991 kestrel init 2019-02-26 22:11:21 +01:00
Claus Vium
33b67a357f Remove unused deps 2019-02-26 22:11:21 +01:00
Claus Vium
4db31acff9 Begin removing System.Net sources 2019-02-26 22:11:21 +01:00
Bond-009
9ba6227db4 Less string allocations 2019-02-26 17:11:04 +01:00
Claus Vium
4df3333b71 Remove the unused status code 2019-02-24 22:31:46 +01:00
Claus Vium
5262e50fee Try another fix 2019-02-24 22:28:46 +01:00
Claus Vium
6e07eab247 Don't close the socket response multiple times 2019-02-24 21:45:03 +01:00
Vasily
8ef41020d9
Merge pull request #847 from Bond-009/async 
Make websockets code async
 2019-02-20 15:03:42 +03:00
Vasily
50ce7572b4
Merge pull request #851 from Bond-009/appdata 
Simplify code to get data dir
 2019-02-20 14:31:01 +03:00
Vasily
74695428fe
Merge pull request #914 from Bond-009/httppostedfile 
Separate HttpPostedFile into it's own file
 2019-02-20 13:33:42 +03:00
Joshua M. Boniface
89d4ce309d
Merge pull request #848 from Bond-009/perf 
Minor changes to reduce allocations
 2019-02-19 21:24:51 -05:00
Bond-009
51ba28bd65 Remove useless check 2019-02-18 17:37:10 +01:00
Bond_009
a94aeb5c87 Simplify code to get data dir 2019-02-18 17:35:09 +01:00
William Taylor
c607c95e64 Removed async from non-async method 2019-02-17 14:33:20 +00:00
William Taylor
18ae107ce4 Removed unnecessary configuration options and reduced primitive dependencies 2019-02-17 14:09:52 +00:00
William Taylor
0d5fbcb031 Removed primitives from services in Program.cs 
This will make it easier to move dependency registration
to a system without having to new up all the services first.
Moved the primitives to an IConfiguration which is much easier to inject.
 2019-02-17 14:08:52 +00:00
Bond-009
4811e76860
Merge branch 'master' into perf 2019-02-16 17:05:44 +01:00
Bond-009
64a4f259a2
Merge branch 'master' into async 2019-02-16 17:05:05 +01:00
Bond-009
fb6a901374 Separate HttpPostedFile 2019-02-16 11:46:58 +01:00
Bond-009
18e1d03a89 Comments 2019-02-16 00:44:10 +01:00
Vasily
3947f2315d Update Jellyfin.Server/Jellyfin.Server.csproj 
Co-Authored-By: Bond-009 <bond.009@outlook.com>
 2019-02-16 00:43:56 +01:00
Bond-009
cb9e50b2ea Reorder elements 2019-02-16 00:43:56 +01:00
Bond-009
e620bb9512 Remove more doc warnings 2019-02-16 00:43:56 +01:00
Bond-009
8b04fe7633 More fixes 2019-02-16 00:43:56 +01:00
Bond-009
2cb747651b Correctly dispose WebSocketSharpListener 2019-02-16 00:43:56 +01:00
Bond-009
46897aab4f More warnings 2019-02-16 00:43:56 +01:00