Commit graph

1223 commits

Author SHA1 Message Date
Joshua M. Boniface e3dbed1c1a
Update Emby.Server.Implementations/Library/UserManager.cs
Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
2019-03-16 10:16:23 -07:00
redSpoutnik 480a6607e2
Merge branch 'master' into subtitle-display-title 2019-03-16 17:54:57 +01:00
Phallacy 7f0fa74467 updated regex to string literal with escaped - 2019-03-16 00:38:31 -07:00
LogicalPhallacy 9df1506794
Merge pull request #2 from LogicalPhallacy/master
update lockoutfix to latest for testing
2019-03-16 00:26:12 -07:00
LogicalPhallacy 2d0844b5db
Merge pull request #1 from jellyfin/master
merging myself to latest
2019-03-16 00:25:16 -07:00
Phallacy 1ee016c997 configurable user lockout 2019-03-16 00:18:52 -07:00
Phallacy 221389089c quick fix for auth bug 2019-03-15 21:25:19 -07:00
Vasily 11fde02035
Merge pull request #1105 from ploughpuff/ratelimit
Only delay making MusicBrainz request if necessary
2019-03-15 16:01:55 +03:00
PloughPuff d125fbc43d Added contact email to user agent
MusicBrainz request a contact email address is supplied in comment section of user agent field.
2019-03-14 21:34:09 +00:00
redSpoutnik 427688a0a0 Change subtitles DisplayTitle behavior 2019-03-14 22:31:51 +01:00
Erwin de Haan 21cc38fcf4 Adjusted AssemblyCopyright attribute values. 2019-03-14 22:17:56 +01:00
Vasily 208585d3f6
Merge pull request #1106 from Bond-009/warn2
More warning fixes
2019-03-14 19:54:44 +03:00
Bond-009 bf43dc00bb More warning fixes 2019-03-13 22:32:52 +01:00
Bond-009 e64aaebbac Improvements around streams
* Use ArrayPool instead of allocating new buffers each time
* Remove NetworkStream copy
* Remove some dead code
2019-03-13 21:11:01 +01:00
Vasily 605bf0e8c3
Merge pull request #1100 from ploughpuff/rmprobeswitch
Finalise removal of --ffprobe switch
2019-03-13 01:42:07 +03:00
Vasily 89e2af6b57
Merge pull request #1096 from dkanada/opensubs
Remove open subtitles from the server
2019-03-13 01:22:55 +03: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
Bond-009 3ddbda9aca
Merge branch 'master' into xml 2019-03-12 16:37:18 +01:00
Vasily 1fef8bf266
Merge pull request #1060 from Bond-009/assinfo
Remove redundant class AssemblyInfo
2019-03-12 16:34:21 +03:00
Joshua Boniface 3c4043199a Implement review feedback 2019-03-12 09:18:45 -04:00
Vasily 0220309ea7
Merge pull request #1095 from Bond-009/fix1077
Add AppConfig to the DI service collection
2019-03-12 12:56:39 +03: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
dkanada 715ddbb3b0 remove open subtitles from the server 2019-03-11 18:10:31 -07:00
Bond-009 0ff038f0a2 Fix nullref 2019-03-11 23:13:01 +01:00
Vasily 2324c408ba
Merge pull request #1089 from jellyfin/translations
Update translations
2019-03-11 15:30:50 +03:00
Joshua Boniface 5f7524aca2 Remove unneccessary string 2019-03-10 17:21:10 -04:00
Joshua Boniface 132ce3ece1 Add further resources to complete WebPath 2019-03-10 17:04:18 -04:00
Joshua Boniface 25deca9579 Make use of WebPath 2019-03-10 16:20:46 -04:00
Joshua Boniface 93d15cd969 Add configuration flag for Web directory 2019-03-10 16:17:48 -04:00
WWWesten 16adaa64c9 Translated using Weblate (Kazakh)
Currently translated at 100.0% (94 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/kk/
2019-03-10 03:06:01 -04:00
Matsuri 93fe7957fb Translated using Weblate (Chinese (Simplified))
Currently translated at 97.8% (92 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hans/
2019-03-10 03:06:00 -04:00
Joshua M. Boniface fb96763f65
Merge pull request #1077 from Bond-009/musicbrainz
Make MusicBrainz base url configurable
2019-03-09 23:19:32 -05:00
Claus Vium f2062ba19b Disable HTTPS in Kestrel if Certificate is null 2019-03-08 22:25:45 +01:00
Bond-009 58061a7295 Make MusicBrainz base url configurable 2019-03-08 17:15:52 +01:00
Claus Vium e3b844b5aa Add urlprefixes during init 2019-03-07 22:49:41 +01: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 669c48cc8b
Merge pull request #1065 from cvium/closed_response
Don't set status code if response is closed
2019-03-07 22:32:01 +01:00
Claus Vium 3fa43a1e08 Don't set status code if response is closed 2019-03-07 22:26:23 +01:00
Vasily 028a98d2c1
Merge pull request #1058 from Bond-009/clean
Cleanup/simplification
2019-03-08 00:23:00 +03:00
Bond-009 620d7b560d Fail on warnings for Jellyfin.Server 2019-03-07 21:52:16 +01:00
Bond_009 37ea50a572 Reduce the amount of exceptions thrown 2019-03-07 21:42:56 +01:00
Bond-009 c5fce647de Cleanup/simplification
* Removed useless copies/allocations
* Reduced unneeded complexity
2019-03-07 21:13:13 +01:00
Claus Vium 0abe57e930 Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc 2019-03-07 20:16:51 +01:00
Bond-009 ae0ecc1b10
Merge pull request #870 from LogicalPhallacy/betterauth
Better default authentication
2019-03-07 19:11:36 +01:00
Claus Vium dfff68b2f4 Make SkipLogExtensions static 2019-03-07 19:05:53 +01:00
Bond-009 f486f5966f
Update Emby.Server.Implementations/Library/DefaultAuthenticationProvider.cs
Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
2019-03-07 09:56:03 -08:00
Bond-009 e91dd14b31 Remove redundent class AssemblyInfo 2019-03-07 18:10:55 +01:00
Vasily a4b52b7264
Merge pull request #844 from ploughpuff/ffmpeg
Reworked FFmpeg path discovery and always display to user
2019-03-07 17:23:06 +03:00
Vasily 5ae0ef0527
Merge pull request #1028 from Bond-009/ratings
Simplify rating loading
2019-03-07 17:22:26 +03:00
Phallacy dfb1d704ed made hashset static and readonly 2019-03-07 03:32:05 -08:00
Phallacy 8f4895e8a5 more fixes for perf and style 2019-03-07 03:11:41 -08:00
Bond_009 a9302b8b53 Remove useless abstraction around XmlReaderSettings
This removes the amount of stuff that needs to be passed around
Also removes some unneeded `ManagedFileSystem` usage
2019-03-07 12:04:14 +01:00
Bond-009 c31b0b311b
Apply suggestions from code review
more minor fixes before I do larger fixes

Co-Authored-By: LogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>
2019-03-07 02:41:44 -08:00
Claus Vium bba049c987 Make FileSystem readonly 2019-03-06 19:29:25 +01:00
Claus Vium 21c2acc520 Remove public Host property 2019-03-06 19:27:05 +01:00
Claus Vium 394d23a73a Review comments 2019-03-06 19:14:03 +01:00
Bond-009 04db0369d4
Update LocalizationManager.cs 2019-03-06 17:31:52 +01:00
Vasily 2242c8d793
Merge pull request #915 from cvium/remove_encryptionmanager
Remove IEncryptionManager
2019-03-06 15:56:15 +03:00
Phallacy bef665be36 Minor fixes to address style issues 2019-03-05 23:45:05 -08:00
PloughPuff 2617a49b78 Renamed Init() to SetFFmpegPath() 2019-03-05 21:29:15 +00:00
PloughPuff ed69e690b8 Review comments
Address review comments from JustAMan, Bond-009 and cvium.
2019-03-05 21:29:15 +00:00
PloughPuff 20775116f7 Reworked FFmpeg path discovery and always display to user
1) Reworked FFmpeg and FFprobe path discovery (CLI switch, Custom xml, system $PATH, UI update trigger).  Removed FFMpeg folder from Emby.Server.Implementations.  All path discovery now in MediaEncoder.

2) Always display FFmpeg path to user in Transcode page.

3) Allow user to remove a Custome FFmpeg path and return to using system $PATH (or --ffmpeg if available).

4) Remove unused code associated with 'prebuilt' FFmpeg.

5) Much improved logging during path discovery.
2019-03-05 21:24:54 +00:00
Claus Vium 446f9bf81f Remove more Content-Length references 2019-03-05 20:48:04 +01:00
Claus Vium 913e80fd55 Add ProcessWebSocketRequest to IHttpListener 2019-03-05 20:35:07 +01:00
Claus Vium 9a4a01fb0e Fix DI in FileWriter.TransmitFile 2019-03-05 19:32:22 +01:00
Claus Vium 78742b8e4c Switch to HeaderNames instead of hardcoded strings (and other header related fixes) 2019-03-05 19:20:28 +01:00
Claus Vium bc00617df7 Remove unused Brotli compressor 2019-03-05 10:26:43 +01:00
Phallacy 2c26517172 minor style fixes 2019-03-04 23:58:25 -08:00
Claus Vium 51648a2a21 Remove unused _listener 2019-03-05 08:05:42 +01:00
Claus Vium 12df381495 Grab content root from config and fix kestrel port bindings 2019-03-05 07:55:29 +01:00
Claus Vium 0250204f14 Expand todo 2019-03-04 22:26:57 +01:00
Bond-009 0419deeec4
Update LocalizationManager.cs 2019-03-04 20:18:35 +01:00
Claus Vium 9020f68ce1 Use QueryHelpers.AddQueryString 2019-03-04 20:08:54 +01:00
Claus Vium 557c4d065d Review comments 2019-03-04 19:55:59 +01:00
Claus Vium 6cc1bd544a Fix a logging statement 2019-03-04 19:31:26 +01:00
Joshua M. Boniface aba22b92bc
Merge pull request #735 from Bond-009/loop
Readability changes
2019-03-04 00:27:48 -05:00
Claus Vium 040871459b Remove some unused references 2019-03-03 14:35:54 +01:00
Claus Vium 6263b73d9c Await host startup 2019-03-03 14:30:41 +01:00
Claus Vium 1cc433eabc Start the webhost before RunStartupTasks and fix ContentEncoding 2019-03-03 13:54:14 +01:00
Claus Vium d450169964 Use EnableHttps instead of CertificateInfo 2019-03-03 08:46:17 +01:00
Claus Vium e823c11b46 Add certificate to https and minor cleanup 2019-03-03 08:29:23 +01:00
Lynxy 5368112d90 Correct the list of series types 2019-03-01 22:28:25 -05:00
Bond-009 ed07ed44ae Simplify rating loading 2019-03-01 19:30:48 +01:00
Bond-009 9993dafe54 Don't mix LINQ and roreach loops for readability 2019-03-01 17:12:22 +01:00
Claus Vium 6bdb5debd2 Add some websocket manager boilerplate 2019-03-01 14:08:51 +01:00
Deniz 3d3d879b99 Translated using Weblate (Turkish)
Currently translated at 100.0% (94 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/tr/
2019-02-28 23:13:39 -05:00
ElFantasma 53ed6e5e6e Translated using Weblate (Spanish (Argentina))
Currently translated at 100.0% (94 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/es_AR/
2019-02-28 23:13:38 -05:00
SaddFox d0e4e0f600 Translated using Weblate (Slovenian)
Currently translated at 87.2% (82 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sl/
2019-02-28 23:13:36 -05:00
v1tin 311caf3fc3 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (94 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/pt_BR/
2019-02-28 23:13:35 -05:00
EffeF 7c13021def Translated using Weblate (Italian)
Currently translated at 100.0% (94 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/it/
2019-02-28 23:13:35 -05:00
TheBird956 c8788d83fb Translated using Weblate (French (Canada))
Currently translated at 100.0% (94 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fr_CA/
2019-02-28 23:13:35 -05:00
TheBird956 331260cf80 Translated using Weblate (French)
Currently translated at 100.0% (94 of 94 strings)

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/fr/
2019-02-28 23:13:34 -05:00
Phallacy edba82db37 fixed logic flip in auth empty check and fixed crypto algo choice 2019-02-27 23:05:12 -08:00
Claus Vium 1ac282b12e Call SharpWebSocket's Closed event handler before disposing 2019-02-27 23:39:20 +01:00
Claus Vium 588a13377c Remove a file that shouldn't have been added 2019-02-27 23:24:43 +01:00
Claus Vium fb1de5a921 Remove more cruft and add the beginnings of a socket middleware 2019-02-27 23:22:55 +01:00
Claus Vium dab8e15052 Check websocket state before closing 2019-02-27 21:48:28 +01:00
Claus Vium e47d121985 Fix websockets 2019-02-27 21:40:47 +01:00
Claus Vium c0b95dbc79 Fix query log for real 2019-02-27 20:11:40 +01:00
Claus Vium 647adc51c8 Fix query log 2019-02-27 19:55:25 +01:00
Vasily 3769453541
Merge pull request #978 from fasheng/fix-dlna-multiple-interfaces
Fix DLNA for multiple interfaces on linux
2019-02-27 19:23:31 +03:00
Vasily 8c2af50170
Merge pull request #1011 from Bond-009/order
Don't try to order the response the same as the request
2019-02-27 17:29:12 +03:00
Claus Vium 27e7e792b3 Replace some usage of QueryParamCollection 2019-02-27 14:23:39 +01:00
Xu Fasheng 7429c07c05 Remove redundant parenthesis 2019-02-27 20:16:54 +08:00
Claus Vium 333bd2107a Remove HttpUtility 2019-02-27 12:40:18 +01:00
Claus Vium 25d3d0b731 Remove some unused stuff 2019-02-27 08:02:32 +01:00
Claus Vium 77addb2283 Remove SocketHttpListener 2019-02-27 07:32:36 +01:00
Joshua M. Boniface 9eba31185a
Merge pull request #959 from Bond-009/string
Reduce string allocations at startup
2019-02-27 00:37:31 -05:00
Joshua M. Boniface aea7edf0fa
Merge pull request #891 from Bond-009/postsan
Reduce the amount of db calls during the post scan event
2019-02-27 00:31:48 -05:00
Claus Vium 848cfc32cc More cleanup 2019-02-26 22:57:59 +01:00
Claus Vium 5510e8ebee Remove unused Cookies 2019-02-26 22:53:59 +01:00
Claus Vium 9c02e99e35 Undo some of the span abuse 2019-02-26 22:40:25 +01:00
Claus Vium 148db8b81a Remove unused SharpSocket stuff 2019-02-26 22:11:21 +01:00
Claus Vium e342b7bc71 Extend the IHttpServer interface to avoid the typecasting 2019-02-26 22:11:21 +01:00
Claus Vium f1c93ae618 Remove SetContentLength and company 2019-02-26 22:11:21 +01:00
Claus Vium 4e229ad86b Fix PathInfo 2019-02-26 22:11:21 +01:00
Claus Vium e88f079da6 Remove websocket options and configure kestrel listen ports 2019-02-26 22:11:21 +01:00
Claus Vium 4e8de67aca Remove SocketSharp from Jellyfin.Server and some other cleanup 2019-02-26 22:11:21 +01:00
Claus Vium a85488cd20 Fix websockets array index out of bounds and some cleanup 2019-02-26 22:11:21 +01:00
Claus Vium 5a7cca9d1b Fix websockets and RawUrl 2019-02-26 22:11:21 +01:00
Claus Vium d6c6f3c10c Still broken 2019-02-26 22:11:21 +01:00
Claus Vium 38f52a139e Add response compression middleware 2019-02-26 22:11:21 +01:00
Claus Vium 194da8416b Use middlewares instead of Routing 2019-02-26 22:11:21 +01:00
Claus Vium f3e7bc0573 Replace some todos with http extensions and prepare some socket work 2019-02-26 22:11:21 +01:00
Claus Vium c3fa299acc Remove hardcoded path and fix url bug in Windows 2019-02-26 22:11:21 +01:00
Claus Vium 852460b991 kestrel init 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 1731bf7372 Remove ordering items 2019-02-26 20:47:23 +01:00
Bond-009 0804bed66d Log time in a standardized way 2019-02-26 19:40:23 +01:00
Bond_009 0f9006c81f Use stopwatch for more accurate measurements and reduce log spam
DateTime.Now is suitible for small timespans
Replaced the needlessly complex and verbose logging for the httpserver
2019-02-25 18:26:17 +01:00
Anthony Lavado de45cfdd8c
Merge pull request #984 from WWWesten/patch-1
Update kz.csv
2019-02-22 22:05:36 -05:00
WWWesten e79d44d9f1
Update kz.csv
The new ratings system
2019-02-23 01:51:35 +05:00
Claus Vium fb7de2f966 Remove duplicate code and use using to properly dispose the response stream 2019-02-22 20:24:42 +01:00
Xu Fasheng cbd0e71c07 Send DLNA devices message to only the matched interface
This will be the right way for multiple interfaces, or the client will
receive all devices message with different IP addresses and could not
detect which one could access.

And provide one option DlnaOptions.SendOnlyMatchedHost to fallback to old
behaviour if this commit missed something.
2019-02-22 20:18:34 +08:00
Xu Fasheng cf4e64f430 Add option to toggle if ignore virtual interfaces
Some VPN like ZerotierOne owns IP address but no gateway, and there is no
good idea in NetworkManager.GetIPsDefault() to filter such virtual interfaces,
so just provide one option to let user decide it.
2019-02-22 20:13:17 +08:00
Vasily e7e7d96f51
Merge pull request #776 from cvium/update_tvdb
Update tvdb provider to v2 api
2019-02-21 15:09:54 +03:00
Bond_009 320707d44c Reduce string allocations at startup 2019-02-20 16:49:03 +01:00
PloughPuff 73c1cdb32a Avoid exceptions due to folder and file not found
1) Use function to return path to temp transcode path which has benefit of creating temp folder if not exists, thereby avoiding the exception when GetFilePaths is used.
2) Check json files exists before attempting to read from it.  Avoids having to mask FileNotFound exceptions when debugging.
2019-02-20 13:30:06 +00:00
Vasily bca7a26ffd
Merge branch 'master' into update_tvdb 2019-02-20 14:46:07 +03:00
Claus Vium a23f04623e Remove IEncryptionManager 2019-02-20 11:09:06 +01:00
Phallacy 098de6b050 made newlines into linux newlines 2019-02-20 01:17:30 -08:00
Phallacy a0d31a49a0 merging with master to clear merge conflict 2019-02-20 00:46:13 -08:00
Phallacy 6bbb968b57 minor changes and return to netstandard 2019-02-20 00:00:26 -08: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
Joshua M. Boniface b43317c5e1
Merge pull request #830 from Bond-009/update
Removed remaining self-update code
2019-02-19 21:21:36 -05:00
Bond-009 c6188e26af Got to start somewhere 2019-02-18 22:47:02 +01:00
Phallacy 56e3063342 little fixes for JustAMan 2019-02-18 10:56:01 -08:00
Vasily 13f2783a8e
Merge pull request #887 from wtayl0r/replace-primitives-with-iconfiguration
Replace primitive injection with IConfiguration
2019-02-18 19:30:11 +03:00