Commit Graph

271 Commits

Author SHA1 Message Date
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
Bond-009
be77e14db9 Warnings for docs 2019-02-16 00:43:56 +01:00
Bond-009
34af7501fa Fix up CoreAppHost.cs 2019-02-16 00:43:56 +01:00
Bond-009
183ef34422 Do not declare visible instance fields 2019-02-16 00:43:56 +01:00
Bond-009
637936cb9f Closing braces should be followed by an empty line 2019-02-16 00:43:56 +01:00
Bond-009
d8b312674d No multiple empty lines 2019-02-16 00:43:56 +01:00
Bond-009
ebae7229c1 Single line comments should start with a space 2019-02-16 00:43:56 +01:00
Bond-009
3df8cda110 ConfigureAwait 2019-02-16 00:43:56 +01:00
Bond-009
43cf11aa35 Change discards 2019-02-16 00:42:56 +01:00
Vasily
7cc69f30c4
Merge pull request #801 from Bond-009/di
Move to Microsoft.Extensions.DependencyInjection
2019-02-15 21:21:58 +03:00
Vasily
8425d76198
Merge pull request #875 from Bond-009/error
Treat warnings as errors for release builds
2019-02-15 13:58:49 +03:00
ploughpuff
a2dd2ddd55 Rewrite rules for determining app paths and use XDG_CONFIG_HOME for configDir (#781)
Re-write rules for determining dataDir, configDir and logDir.  Generally, arguments from command line take precedence, then JELLYFIN env vars, before using XDG names.

Co-Authored-By: ploughpuff <33969763+ploughpuff@users.noreply.github.com>
2019-02-13 16:35:14 +01:00
Bond-009
a5882ae162 Treat warnings as errors for release builds 2019-02-12 22:15:11 +01:00
Bond-009
3f13851be5 Address comments 2019-02-12 21:06:47 +01:00
Bond_009
ea446fd4a3 Revert back to netcoreapp2.1 2019-02-12 21:06:47 +01:00
Bond_009
585b5201f1 Last bits 2019-02-12 21:06:47 +01:00
Bond_009
8d98885cda Less string allocations 2019-02-12 21:06:47 +01:00
Bond_009
41fb1e5106 Tuple -> ValueTuple 2019-02-12 21:06:47 +01:00
Bond_009
9af28607c9 Simplify plugin loading 2019-02-12 20:52:23 +01:00
Bond_009
81a8ebde22 Move to Microsoft.Extensions.DependencyInjection
This PR replaces SimpleInjector with
Microsoft.Extensions.DependencyInjection.
2019-02-12 20:52:23 +01:00
Bond_009
bee8f58265 Upgrade package versions 2019-02-09 21:32:59 +01:00
Bond_009
3a5bbcf2a8 Style fixes 2019-02-09 15:45:36 +01:00
Bond_009
449074e73f Make more things async 2019-02-09 15:39:17 +01:00
Erwin de Haan
f1ef0b0b4c Fix namespacing so it lines up properly with file names and paths (#715)
* Fix stupid namespacing so it lines up properly with file names and paths.
2019-02-09 10:10:33 +01:00
Bond-009
38d9eeffbe Fix more warnings 2019-02-08 00:07:57 +01:00
Bond-009
f60ad53393 Quick style fix 2019-02-07 23:36:44 +01:00
Joshua M. Boniface
c4f51e16a5
Merge pull request #736 from Bond-009/startasync
Start startup tasks async
2019-02-03 22:23:54 -05:00
Joshua M. Boniface
56dcc45dc0
Merge pull request #732 from Bond-009/locale
Reworked LocalizationManager to load data async
2019-02-03 22:08:20 -05:00
Andrew Rabert
42d5a48491
Merge pull request #788 from Bond-009/warnings
Fix more warnings
2019-02-02 14:21:03 -05:00
Bond_009
5ac6d0ae59 Fix more warnings 2019-02-01 21:56:50 +01:00
Bond-009
fa3a8108e5
Update StartupOptions.cs 2019-02-01 19:52:39 +01:00
Bond_009
660f6174b3 Rebase on master 2019-02-01 18:17:43 +01:00
Bond_009
8af1e93cd4 Make cache dir configurable 2019-02-01 18:13:18 +01:00
Joshua M. Boniface
c713824bf9
Merge pull request #734 from Bond-009/culture
Fix more analyzer warnings
2019-01-31 21:11:13 -05:00
PloughPuff
b5e8cce4cf Improved help text and output errors to stderr
Addressed review comments from JustAMan.
2019-01-31 18:56:34 +01:00
PloughPuff
211ae30188 Revert back to NoAutoRunWebApp
Addressed further review comments.  Removed unnecessary .ParsedStartupOptions namespace.  Removed DataDir, ConfigDir and LogDir from Interface file as not necessary.
2019-01-31 18:56:34 +01:00
PloughPuff
e18b89ca27 Move Options to Jellyfin.Server and create interface file
Changes following review comments.
2019-01-31 18:56:34 +01:00
PloughPuff
ebd2a30087 Accept single-hyphen usage and rename -programdatadir to -datadir
For backwards compatibility, modify the args[] strings to replace single-hyphens with double-hyphens before parsing.

Also rename -programdatadir to -datadir.
2019-01-31 18:56:34 +01:00
PloughPuff
fd361421b1 Use CommandLineParser package for handling CLI args 2019-01-31 18:56:34 +01:00
Bond-009
2a1f6361a5
Merge branch 'master' into locale 2019-01-31 18:44:36 +01:00
Bond_009
85a58fd655 Start startup tasks async 2019-01-27 15:40:37 +01:00
Bond_009
a709cbdc64 Fix more analyzer warnings 2019-01-27 12:12:44 +01:00
Bond_009
51edd5d067 Reworked LocalizationManager to load data async 2019-01-27 10:36:05 +01:00
Bond_009
ce11869a1a Move Skia back into it's own project 2019-01-26 20:43:13 +01:00
Andrew Rabert
b673054c8d
Merge pull request #711 from Bond-009/sysevent
Remove remnants of system events
2019-01-26 14:13:25 -05:00
Erwin de Haan
d1a0497f55 Revert "Merge pull request #452 from Bond-009/activitydb"
This reverts commit 48ad18d12b, reversing
changes made to fe197415ca.
2019-01-25 23:32:06 +01:00
Bond_009
fd7f420af2 Remove remnants of system events 2019-01-25 22:41:43 +01:00
Bond-009
fd36bbede8
Fix debug build on windows 2019-01-25 12:42:45 +01:00
Andrew Rabert
48ad18d12b Merge pull request #452 from Bond-009/activitydb
Use EF Core for Activity database
2019-01-24 23:02:20 -05:00
Bond_009
8191efb90c Fix some analyzer warnings
Some changes:
* Don't omit braces
* Fix culture sensitive string compare
* Define accessibility functions

I restricted myself to these 5 files, for now :p
2019-01-24 20:14:19 +01:00
Bond_009
58591da0b8 Disable warning for calling local function without this. prefixed 2019-01-23 19:17:45 +01:00
Bond_009
905a253ff5 Suffix async methods with Async 2019-01-23 19:09:34 +01:00
Bond_009
8d9428ebdc Ensure DB exists 2019-01-23 18:34:34 +01:00
Andrew Rabert
7327bb91a3 Fix func name 2019-01-20 20:48:24 -05:00
Andrew Rabert
c7f648f86a Merge branch 'dev' into imagesize 2019-01-20 20:45:06 -05:00
William Taylor
190bc46c1b Removed unused parameters from Program.getImageEncoder 2019-01-20 21:54:07 +00:00
William Taylor
65cd3ed597 Replaced injections of ILogger with ILoggerFactory
This makes resolving dependencies from the container much easier as
you cannot resolve with primitives parameters in a way that is any
more readable.

The aim of this commit is to change as little as possible with the end
result, loggers that were newed up for the parent object were given the same
name. Objects that used the base or app loggers, were given a new logger with
an appropriate name.

Also removed some unused dependencies.
2019-01-20 21:05:12 +00:00
Bond_009
7e4cc9f513 Touchup 2019-01-20 14:39:05 +01:00
Bond_009
ca910325f3 Remove unneeded fields 2019-01-20 14:25:13 +01:00
Bond_009
8fc8fc0622 Cleanup ImageProcessor 2019-01-20 14:18:37 +01:00
cvium
b35dcbb9f0 Remove MediaBrowser.Text since it violates licenses and is overall hacky 2019-01-20 06:30:50 +01:00
Andrew Rabert
875392c77f Combine Emby.Drawing and Emby.Drawing.Skia 2019-01-19 22:38:41 -05:00
Erwin de Haan
c5430f86b0 Fixed csproj and xml identation. 2019-01-19 15:01:16 +01:00
Erwin de Haan
1e94023927 Merge branch 'dev' into reformat 2019-01-19 14:45:02 +01:00
PloughPuff
582226c133 Cause exception if empty string used for config or log folders 2019-01-18 18:11:42 +00:00
PloughPuff
529d804414 Modify to use correct logic before creating directory
Address review comments.
2019-01-18 17:22:14 +00:00
Erwin de Haan
d116efe1f7 Merge branch 'dev' into reformat 2019-01-18 17:04:01 +01:00
PloughPuff
04d03c5cf9 Ensure all folders are created before running app 2019-01-18 10:10:45 +00:00
Joshua M. Boniface
2b1e3aa45f Merge pull request #567 from Bond-009/term
Shutdown gracefully when recieving a termination signal
2019-01-16 11:49:53 -05:00
Erwin de Haan
9d0a08571e Merge branch 'dev' into reformat 2019-01-13 21:59:37 +01:00
Erwin de Haan
e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Andrew Rabert
006e81588a Merge pull request #576 from Bond-009/analysers
Add code analysers for debug builds
2019-01-13 20:38:08 +00:00
Erwin de Haan
65bd052f3e ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Erwin de Haan
a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan
089ad8e7c2 Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
Erwin de Haan
ba610b5094 Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
Erwin de Haan
742bef5b5f EditorConfig reformat: Non-CS files. 2019-01-13 20:45:51 +01:00
Erwin de Haan
51ed47f4c4 EditorConfig reformat: Emby.XmlTv, Jellyfin.Server. MediaBrowser.Api, MediaBrowser.Common 2019-01-13 20:30:41 +01:00
Erwin de Haan
f0acc0446c Visual Studio Reformat: Jellyfin.Server 2019-01-13 20:24:27 +01:00
Bond_009
56de8c893a Add code analysers for debug builds 2019-01-13 19:16:22 +01:00
Bond_009
50c127fd9a Add proper exit codes 2019-01-13 01:05:25 +01:00
Bond_009
bf4de012da Catch exception instead of masking it 2019-01-13 00:55:37 +01:00
Bond_009
debb8e56fd Handle Ctrl+C and Ctrl+Break 2019-01-13 00:49:11 +01:00
Bond_009
0abdfbb526 Shutdown gracefully when recieving a termination signal 2019-01-12 23:31:45 +01:00
Erwin de Haan
e2751d42e8 Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Erwin de Haan
ec1f5dc317 Mayor code cleanup
Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
2019-01-10 20:38:53 +01:00
hawken
ba1794f64b Remove tabs and trailing whitespace 2019-01-07 23:24:34 +00:00
Joshua M. Boniface
423ad4a20b Merge pull request #450 from Bond-009/config
BaseApplicationPaths set up default config and log dir paths
2019-01-06 15:26:01 -05:00