Commit Graph

13121 Commits

Author SHA1 Message Date
Joshua M. Boniface ba78f6a0ff Merge pull request #999 from cvium/dont_write_disposed_log
Check that ffmpeg log target isn't disposed before writing to it
2019-02-27 00:27:25 -05:00
Joshua M. Boniface 968e282c90 Merge pull request #1007 from Bond-009/time
Log time in a standardized way
2019-02-26 16:05:59 -05:00
Bond-009 0804bed66d Log time in a standardized way 2019-02-26 19:40:23 +01:00
Vasily 9bab93262e Merge pull request #1003 from Bond-009/stopwatch
Use stopwatch for more accurate measurements and reduce log spam
2019-02-26 01:27:42 +03: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
Vasily b3438559cc Merge pull request #1000 from cvium/fix_object_disposed
Don't close the socket response multiple times
2019-02-25 16:52:31 +03: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 547d0ecf58 Move the check further down 2019-02-24 22:04:30 +01:00
Claus Vium 6e07eab247 Don't close the socket response multiple times 2019-02-24 21:45:03 +01:00
Claus Vium 96b3d37caf Check that ffmpeg log target isn't disposed before writing to it 2019-02-24 21:25:24 +01:00
Bond-009 4a3e42e779 Merge pull request #986 from JustAMan/submodule-update
Backmerge submodule updating strategy
2019-02-23 10:13:02 -05:00
Anthony Lavado de45cfdd8c Merge pull request #984 from WWWesten/patch-1
Update kz.csv
2019-02-22 22:05:36 -05:00
Vasily d82d6b6aef Merge pull request #981 from cvium/close_response_stream
Close the response stream after fetching temp files
2019-02-23 02:01:20 +03:00
Vasily 7ae526da8b Merging #975 to master 2019-02-23 01:52:51 +03: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
Bond-009 db54fe4c70 Merge pull request #975 from cvium/release-10.2.z
Update submodule
2019-02-22 12:57:20 -05:00
Claus Vium 00fe66a38c Update submodule 2019-02-21 20:59:10 +01: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
Vasily 785fa76ac6 Merge pull request #955 from ploughpuff/avoid
Avoid exceptions due to folder and file not found
2019-02-21 15:05:31 +03:00
Vasily 6c967c5982 Merge pull request #952 from Liggy/populate-extras
Populate video extras again
2019-02-21 15:02:36 +03:00
Bond-009 affb8c8673 Merge pull request #962 from scheidleon/fix-windows-build
Fix Path
2019-02-20 15:38:43 -05:00
scheidleon 74aa38acd7 Fix Path 2019-02-20 21:04:52 +01:00
Joshua M. Boniface d4ded281aa Merge pull request #961 from jellyfin/release-10.2.z
Release 10.2.1
2019-02-20 14:24:22 -05:00
Claus Vium c597f0de35 Make Tvdb strings const 2019-02-20 19:55:06 +01:00
Bond-009 3965f90236 Update MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
Co-Authored-By: cvium <cvium@users.noreply.github.com>
2019-02-20 19:36:33 +01:00
Claus Vium 8af4417f8f Add ConfigureAwait to awaited calls 2019-02-20 19:35:47 +01:00
Joshua Boniface 83948420a4 Bump version to 10.2.1 v10.2.1 2019-02-20 13:29:14 -05:00
Andrew Rabert 8c53407a9d Merge pull request #960 from nvllsvm/dock
Use jellyfin/ffmpeg image
2019-02-20 13:15:23 -05:00
Claus Vium 4a5c526ccc Fix logging args and add ilogger with categoryname 2019-02-20 19:08:47 +01:00
Andrew Rabert 69a81c0bc2 Use jellyfin/ffmpeg image 2019-02-20 12:11:50 -05:00
Torsten 2690ac299b Only refresh metadata if extras changed 2019-02-20 16:39:49 +01:00
Torsten 268b099ca8 Merge branch 'populate-extras' of github.com:Liggy/jellyfin into populate-extras 2019-02-20 16:38:30 +01:00
Liggy 33171a58b5 Merge branch 'master' into populate-extras 2019-02-20 16:37:57 +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
Liggy 13bfe5093e Merge branch 'master' into populate-extras 2019-02-20 14:24:23 +01:00
Bond-009 99bed9a9c3 Merge pull request #939 from joshuaboniface/cleanup-builds
Clean up and rename obsolete deployment platforms
2019-02-20 07:28:20 -05:00
Vasily 8ef41020d9 Merge pull request #847 from Bond-009/async
Make websockets code async
2019-02-20 15:03:42 +03:00
Bond-009 fca226bdfd Add comment 2019-02-20 12:53:35 +01:00
Vasily bca7a26ffd Merge branch 'master' into update_tvdb 2019-02-20 14:46:07 +03:00
Vasily 60df855b26 Merge pull request #930 from fruhnow/AuthorizationCheck
checking user-permission in GetQueryResult
2019-02-20 14:42:35 +03:00
Vasily 44ed037e73 Merge pull request #950 from cvium/replace_priority_queue
Replace OptimizedPriorityQueue source with NuGet reference
2019-02-20 14:39:52 +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
Claus Vium 1f30a50f4a Address review comments 2019-02-20 11:03:04 +01:00
Joshua M. Boniface 6c6e9ca9f2 Merge pull request #889 from Bond-009/xmlex
Fix uncaught xml error
2019-02-19 21:31:16 -05: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
Torsten 5917e91447 Merge https://github.com/jellyfin/jellyfin into populate-extras 2019-02-19 23:21:40 +01:00