Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-23 14:10:40 +02:00
Code Issues Packages Projects Releases Wiki Activity
14364 commits 25 branches 76 tags 1.3 GiB
Commit graph

283 commits

Author SHA1 Message Date
Bond-009 61d7bed181
Merge pull request #1304 from jellyfin/release-10.3.z 
Backmerge 10.3.1
 2019-04-25 07:27:37 +02:00
Bond-009 6973182ade Fix more possible exceptions 2019-04-20 17:47:11 +02:00
Bond-009 f62af07381 Handle exception when loading unsupported assembly 
Fixes #1256
 2019-04-20 17:47:11 +02:00
Bond-009 a8da122fb3
Merge pull request #1252 from jellyfin/release-10.3.z 
Backmerge release 10.3.0
 2019-04-20 12:25:29 +02:00
Bond-009 8f703f4744 Remove unused event 
Release builds were failing because of this unused event.
 2019-04-18 13:19:16 +02:00
Joshua M. Boniface c3532b92f7
Merge pull request #1158 from Bond-009/httpclean 
Reduce complexity http routes
 2019-04-17 22:12:17 -04:00
Anthony Lavado 34ab99caf1
Move the ProductName to the public endpoint 
Moves the ProductName field over from the private system/info point to
the public one, for easier identification
 2019-04-16 01:16:02 -04:00
Joshua Boniface 05a4161fd3 Correct the installation and removal of plugins 
Upgrading plugins was broken for various reasons. There are four
fixes and a minor one:

1. Use a directory name based only on the `Name` of the plugin, not
   the source filename, which contains the version. Avoids strange
   duplication of the plugin.
2. Use the new directory name for the deletes if it's present, so
   that installation and removal happen at that directory level
   and we don't leave empty folders laying around. Ensures we
   properly remove additional resources in plugins too, not just
   the main `.dll` file.
3. Ignore the incoming `target` when installing, and always set
   it ourself to the proper directory, which would matter when
   reinstalling.
4. Deletes an existing target directory before installing if it
   exists. Note that not calling any of the plugin removal code
   is intentional; I suspect that would delete configurations
   unexpectedly when upgrading which would be annoying. This way,
   it just replaces the files and then reloads.
5. (Minor) Added some actual debug messages around the plugin
   download section so failures can be more accurately seen.
 2019-04-03 20:05:14 -04:00
Joshua Boniface 38fcd31917 Search all subdirectories for Plugins 
This was added in #801 which broke the previous plugin install
behaviour. Previously plugins could be loaded from subdirectories
but this search was only for the highest level. Change it to search
all subdirectories instead to restore the previous behaviour.

Also modifies the same option from #934, though I'm not 100% sure
if this is needed here.
 2019-04-02 18:29:14 -04:00
Joshua M. Boniface 72dd609109
Merge pull request #1149 from LogicalPhallacy/ImprovedPasswordReset 
Adds per user password reset
 2019-03-29 18:26:30 -04:00
Bond_009 3001f21f8d Hacky fix for a hacky issue 2019-03-28 19:11:05 +01:00
Joshua M. Boniface 2dbc1153e8
Merge pull request #934 from Bond-009/plugin 
WIP - Don't require a restart for 75% of plugins
 2019-03-27 21:35:09 -04:00
Bond-009 73a9079ee2
Merge branch 'master' into httpclient 2019-03-27 19:43:02 +01:00
Joshua M. Boniface cc2edc4d66
Merge pull request #1151 from Phlogi/patch-1 
Use public ports and advertise DNS if available for WAN address
 2019-03-27 13:54:14 -04:00
Bond-009 d0fbd260d5
Merge branch 'master' into httpclient 2019-03-27 16:34:26 +01:00
Bond-009 a332092769 Reduce complexity http routes 2019-03-26 19:20:40 +01:00
Phlogi 122cba2aa7
Correct use of local variable wanAddress. 2019-03-25 22:26:05 +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
Phlogi 1b03f078b9
No need to assign empty string. 2019-03-25 21:43:50 +01:00
Phlogi 4c8f8cf64c
Removed trailing spaces, renamed get wan IP function. 2019-03-25 21:34:55 +01:00
Bond-009 6566c91360 Seperate changes from #1023 
The unrelated changes from #1023 (and more)
 2019-03-25 21:27:03 +01:00
Claus Vium 6480cfcc87
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:19:08 +01:00
Claus Vium e36d424b5f
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:18:47 +01:00
Claus Vium f7e7d72688
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:18:18 +01:00
Claus Vium 3474568ce2
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:18:04 +01:00
Claus Vium 89f2dfd78a
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:17:53 +01:00
Claus Vium 2c4c56d6d6
Formatting update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-25 10:17:40 +01:00
Phlogi 087d4153ae
Fix check for available WAN address. 2019-03-24 21:47:18 +01:00
Phlogi fb7f29de18
Format the WAN API Url correctly with https and Port. 2019-03-24 18:33:21 +01:00
Phlogi d18252542d
Also add the WAN switch to the public system info. 2019-03-24 17:11:21 +01:00
Phlogi 030fcaac15
Proper access to configuration objects 2019-03-24 17:02:03 +01:00
Phlogi 7ebb043249
Removed comment, renamed methods consistently. 2019-03-24 16:50:39 +01:00
Claus Vium 598b1c9966
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-24 16:47:59 +01:00
Claus Vium cf36aaef2b
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-24 16:47:48 +01:00
Claus Vium f30af9cd5f
Update Emby.Server.Implementations/ApplicationHost.cs 
Co-Authored-By: Phlogi <Phlogi@users.noreply.github.com>
 2019-03-24 16:47:42 +01:00
Phlogi 4ffec8ad26
Fix build, missing changes. 2019-03-24 12:19:10 +01:00
Phlogi 69cc5814d8
Change WAN IP behaviour: Use ServerConfiguration.WanDdns if set in configuration. 2019-03-24 12:11:46 +01:00
Phlogi 414a318a0d
WAN Address should use public ports instead of local ports. 
https://github.com/jellyfin/jellyfin/issues/601#issuecomment-475941080
 2019-03-24 11:59:40 +01:00
Phallacy 09921a00aa made password resets an interface and per user 2019-03-22 00:01:23 -07:00
redSpoutnik 480a6607e2
Merge branch 'master' into subtitle-display-title 2019-03-16 17:54:57 +01: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
Bond-009 bf43dc00bb More warning fixes 2019-03-13 22:32:52 +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
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
Bond-009 0ff038f0a2 Fix nullref 2019-03-11 23:13:01 +01: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
Claus Vium f2062ba19b Disable HTTPS in Kestrel if Certificate is null 2019-03-08 22:25:45 +01:00
Bond-009 7f42dcc60f Remove more unused stuff 2019-03-08 20:32:14 +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
Claus Vium 0abe57e930 Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc 2019-03-07 20:16:51 +01: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
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
Claus Vium 21c2acc520 Remove public Host property 2019-03-06 19:27:05 +01:00
Vasily 2242c8d793
Merge pull request #915 from cvium/remove_encryptionmanager 
Remove IEncryptionManager
 2019-03-06 15:56:15 +03: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 9a4a01fb0e Fix DI in FileWriter.TransmitFile 2019-03-05 19:32:22 +01:00
Claus Vium bc00617df7 Remove unused Brotli compressor 2019-03-05 10:26:43 +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 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 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
Bond-009 9993dafe54 Don't mix LINQ and roreach loops for readability 2019-03-01 17:12:22 +01:00
Claus Vium fb1de5a921 Remove more cruft and add the beginnings of a socket middleware 2019-02-27 23:22:55 +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
Claus Vium 9c02e99e35 Undo some of the span abuse 2019-02-26 22:40:25 +01:00
Claus Vium e342b7bc71 Extend the IHttpServer interface to avoid the typecasting 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 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
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
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 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
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
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
Bond_009 77a5617774 Removed remaining self-update code 2019-02-18 16:57:08 +01:00
Vasily 395072239d
Merge pull request #913 from Bond-009/log 
Reduce log spam
 2019-02-18 14:50:53 +03:00
Vasily e2f6ecaef6
Merge pull request #829 from Bond-009/fields 
Removed some unused fields
 2019-02-18 14:47:02 +03:00
William Taylor 18ae107ce4 Removed unnecessary configuration options and reduced primitive dependencies 2019-02-17 14:09:52 +00:00
Bond-009 a35ea49c99 Merge remote-tracking branch 'upstream/release-10.2.z' into newmaser 2019-02-17 10:38:44 +01:00
Bond-009 bdfd042d70
Merge branch 'master' into fields 2019-02-16 17:03:15 +01:00