Commit graph

2779 commits

Author SHA1 Message Date
Matt Lyons b52199e9e2
Handle null outputFileExtension in GetOutputFilePath 2020-04-13 12:44:15 +10:00
Vasily 6386b9b1b9
Merge pull request #2782 from JustAMan/fix-ssa-delivery
Fix support for attachments with baseURL set
2020-04-12 23:37:34 +03:00
Bond-009 14674d4469
Merge pull request #2772 from barronpm/codecleanup
MediaBrowser.Api code cleanup
2020-04-11 19:30:23 +02:00
Mark Monteiro 1e1295bebf Merge remote-tracking branch 'upstream/master' into register-services-correctly 2020-04-11 10:00:39 -04:00
dkanada bd55bdb4e3 merge branch master into plugin 2020-04-11 20:10:16 +09:00
dkanada 8e9aeb84b1 remove release channel from plugin classes 2020-04-11 19:33:36 +09:00
Vasily 5b59cd2eb2
Merge pull request #2696 from mark-monteiro/fix-extras
Display Extras With Unknown Types
2020-04-07 23:39:31 +03:00
Bond-009 3a98ad8255
Merge pull request #2721 from PrplHaz4/patch-2
Separate Channels permissions from All Libraries
2020-04-07 19:10:34 +02:00
Patrick Barron 555651aae2 Fixed indentation and corrected typo 2020-04-06 23:17:49 -04:00
Vasily 5be60782ed Fix support for attachments with baseURL set
* Revert "Add baseURL to attachments"
* This is properly handled by jellyfin-web#1020
2020-04-06 14:06:42 +03:00
Patrick Barron c9da49ebaa Implemented more suggestions 2020-04-05 23:12:25 -04:00
Patrick Barron 47ba4a84cd Simplified more conditionals 2020-04-05 18:06:30 -04:00
Patrick Barron 81b4a4c54c Implement various suggestions 2020-04-05 17:58:39 -04:00
Patrick Barron e1958e3902 Miscellaneous code cleanup 2020-04-05 15:56:08 -04:00
Patrick Barron add0a2088d Simplified Conditionals and returns 2020-04-05 14:44:14 -04:00
Patrick Barron 80cfcf5643 Remove unnecessary casts and explicit array types 2020-04-05 13:00:35 -04:00
Patrick Barron 86c06996b1 Remove redundant name qualifiers 2020-04-05 12:48:22 -04:00
Patrick Barron 961f48f5bc Use ? and ?? where applicable 2020-04-05 12:45:01 -04:00
Patrick Barron 6a3f9253db Convert using statements to using declarations where applicable 2020-04-05 12:26:11 -04:00
Bond_009 30ce346f34 Enable nullabe reference types for MediaBrowser.Model 2020-04-05 18:10:56 +02:00
Patrick Barron 5966ee6d87 Convert type checks and null checks into pattern matching 2020-04-05 12:07:43 -04:00
PrplHaz4 46453549b5
Start line with Boolean 2020-04-05 07:26:21 -04:00
PrplHaz4 b05e04c0cb
Collapse IsInEnabledFolder to single expression
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-04-05 06:42:15 -04:00
Mark Monteiro efe3ebaab8 Eliminate circular dependency between LibraryManager and ImageProcessor 2020-04-04 16:01:10 -04:00
artiume d10ae74b38
Force Audio Transcoding for LiveTV Transcoding
Noticing some sync issues when transcoding livetv, the only thing I was able to do to fix it was to force the audio stream to be transcoded as well. This was how I originally wrote the code and we changed it during the review process. I am reverting it back to the original code.
2020-04-02 14:14:57 -04:00
Mark Monteiro 377f9896ce Small fixes 2020-04-01 19:04:00 +02:00
Bond-009 ddd5d3aaec
Merge branch 'master' into usings 2020-04-01 18:51:44 +02:00
Mark Monteiro cc8294842a Add ExtraType.Unknown enum value and use it instead of null 2020-04-01 18:10:29 +02:00
Vasily 9aefb41512
Merge pull request #2503 from nyanmisaka/vaapi
Fix various bugs in HWA subtitle burn-in
2020-03-31 23:19:44 +03:00
PrplHaz4 025888204d
Fix permission setting on Channels
Currently, permission settings on Channels are not taken into account prior to returning `{UserName} is not permitted to access Library {ItemName}.`.  Whether or not a user can see items within the Channel is solely dependent on `EnableAllFolders`, so you cannot view a plugin's Channels unless you can also see ALL libraries.

This PR enables does two things for Channel-providing Plugins:
1. Fixes functionality of "EnableAllChannels"
2. Allows users with Channel permissions to access all folders within that Channel

I'm not 100% sure on 2 but I wasn't able to see an obvious way to propagate permissions downward into specific Folders inside a Channel.

I tested on a fairly simple library with two channel-providing plugins (ServerWMC, LazyMan) and it seems to work, but this behavior should also be tested by someone with more content/collections.
2020-03-30 17:14:59 -04:00
nyanmisaka 95c5c08610 minor improvements 2020-03-31 04:04:55 +08:00
nyanmisaka 0af353404c fix the UTF-16 error while burning ass/ssa subtitles 2020-03-30 14:47:55 +08:00
Nyanmisaka 0e9d9a7897 fix the incorrect HLS time while using hw encoders 2020-03-30 14:48:57 +08:00
nyanmisaka fac6831653 fix various bugs in VAAPI hardware acceleration 2020-03-30 14:47:55 +08:00
Mark Monteiro e266ad51c5 Simplify logic; remove unnecessary methods 2020-03-28 14:17:33 +01:00
Mark Monteiro 5fcbedc194 Display extras with an unknown type 2020-03-28 13:40:56 +01:00
Bond_009 e9d1eabd53 Remove unused usings 2020-03-24 16:12:06 +01:00
Andreas B 0a2d24aff3 Add RESOLUTION field to HLS master playlist 2020-03-19 23:39:33 +01:00
Andreas B 8a990d1d95 Add FRAME-RATE field to HLS master playlist 2020-03-19 23:39:33 +01:00
Andreas B f2858878d1 Add CODECS field to HLS master playlist 2020-03-19 23:39:23 +01:00
Andreas B 85da15685f Refactor DynamicHlsService.AppendPlaylist to use StringBuilder 2020-03-15 15:06:38 +01:00
Bond-009 94fe9b8f6d
Merge branch 'master' into warn17 2020-03-11 20:26:43 +01:00
Bond_009 bbd4860b55 Another warning 2020-03-11 16:30:22 +01:00
Bond-009 a7e1a5c96a
Merge pull request #2506 from mark-monteiro/inject-loggers-with-context
Inject loggers with context using ILogger<T>
2020-03-10 15:04:35 +01:00
MrTimscampi e8c593f413 Add baseURL to attachments 2020-03-07 17:41:36 +01:00
Mark Monteiro b67e9cde8c Replace ILogger with ILogger<T> wherever possible
Log entries will contain additional class context when using this interface
2020-03-03 23:07:10 +01:00
Davide Polonio cd471ed4df Fix emby/users/public not taking into account first run
The previous implementation was not taking in account the first seup
phase. Now the check has been added.

A little method refactor has been done in order to make the code more
elegant.
2020-03-03 20:20:35 +01:00
Davide Polonio 737d4d2b3f
Fix conditional with a less verbose one
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2020-03-03 19:51:03 +01:00
Davide Polonio 5d760b7ee8 Fix emby/user/public API leaking private data
This commit fixes the emby/user/public API that was returning more data
than necessary. Now only the following information are returned:
- the account name
- the primary image tag
- the field hasPassword
- the field hasConfiguredPassword, useful for the first wizard only
(see
https://github.com/jellyfin/jellyfin/issues/880#issuecomment-465370051)
- the primary image aspect ratio

A new DTO class, PrivateUserDTO has been created, and the route has been
modified in order to return that data object.
2020-03-01 21:46:01 +01:00
Steven Tang 2e856ad9fe Fix download file with non-ASCII filename 2020-02-29 12:11:27 +08:00
dkanada 974a04c129 update plugin classes for nightly builds 2020-02-26 01:58:39 +09:00
artiume 697aee5b0c
Merge pull request #21 from jellyfin/master
nightly
2020-02-23 10:57:52 -05:00
Bond_009 07cc4be6a7 Fix some warnings
* Add analyzers to MediaBrowser.XbmcMetadata
* Enable TreatWarningsAsErrors for MediaBrowser.XbmcMetadata
* Add analyzers to MediaBrowser.WebDashboard
* Enable TreatWarningsAsErrors for MediaBrowser.WebDashboard
* Disable SA1600 in favor of CS1591
2020-02-23 12:11:43 +01:00
Bond_009 ffc9eb67f0 Switch remux and direct stream 2020-02-23 00:05:28 +01:00
artiume 4becaf83dd
Update MediaInfoService.cs 2020-02-22 10:03:17 -05:00
dkanada 61015c1d0f
Merge pull request #2321 from Bond-009/images
Simplify image processing by removing image enhancers
2020-02-21 12:32:54 +09:00
artiume a4e0364139
Update MediaInfoService.cs 2020-02-19 06:15:55 -05:00
artiume b375aeb56a
fix indentation
it was tabs
2020-02-19 06:07:48 -05:00
artiume 967f8c6dcd
Merge pull request #18 from jellyfin/master
nightly
2020-02-19 06:02:26 -05:00
artiume 63f13df6fc
Merge pull request #17 from jellyfin/master
10.5
2020-02-13 13:09:50 -05:00
dkanada 53db526667 merge branch master into refactor 2020-02-14 03:02:06 +09:00
artiume 40ad6f843f
Merge pull request #16 from jellyfin/master
nightly
2020-02-13 05:53:23 -05:00
Bond-009 a2490a7ae5
Merge branch 'master' into images 2020-02-12 17:41:46 +01:00
Vasily a26c1ab17d Remove commented code 2020-02-12 14:19:11 +03:00
Anthony Lavado 42066ee326
Merge branch 'master' into transcoding-throttling 2020-02-12 02:01:56 -05:00
Anthony Lavado 00073c162a
Merge pull request #2363 from dkanada/view
Add session view endpoint
2020-02-11 23:56:47 -05:00
artiume b5342bb7d9
Fix MaxBitrate 2020-02-11 10:57:16 -05:00
artiume a73ce1d781
Update MediaInfoService.cs 2020-02-06 17:21:10 -05:00
dkanada 1cb51a8ac7 rename session folder 2020-02-06 00:47:50 +09:00
dkanada c2733ac0dc split api keys into their own service 2020-02-06 00:26:21 +09:00
artiume 3b6a4c3a33
Merge pull request #11 from jellyfin/master
nightly
2020-02-04 06:02:38 -05:00
dkanada b7a9900556
Merge pull request #2357 from Bond-009/warn13
Fix warnings
2020-02-03 17:15:03 +09:00
dkanada 1bc8ca2542 add session view endpoint 2020-02-02 00:16:11 +09:00
dkanada 6341d986a9 fix a few warnings 2020-02-02 00:07:46 +09:00
dkanada 692a9bfdd0
update some comments
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2020-02-01 23:36:40 +09:00
dkanada afe9ed977b improve scan progress and fix a few bugs 2020-02-01 22:44:27 +09:00
Bond_009 87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
artiume 918df5e352 Merge remote-tracking branch 'jellyfin/master' 2020-01-26 09:33:31 -05:00
ThreeFive-O 4f3bfd9146 Add Transcoding framerate info 2020-01-24 23:33:32 +01:00
Bond-009 c8409d2ea1 Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
Bond_009 ddf9b38799 Simplify image processing by removing image enhancers 2020-01-21 20:26:30 +01:00
Denis 549a2d8b6d
Enable path mapping in PlaybackInfo endpoint 2020-01-17 22:48:28 +03:00
Bond-009 8865b3ea3d Remove dead code and improve logging 2020-01-13 20:06:08 +01:00
Bond_009 976459d3e8 Rewrite WebSocket handling code 2020-01-13 20:06:08 +01:00
Bond-009 cf13e89ad6
Update MediaBrowser.Api/Playback/MediaInfoService.cs
Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-01-13 09:01:14 +01:00
Bond_009 84d1b12530 Attempt #2 2020-01-12 21:55:04 +01:00
Bond_009 da5893b0f1 Try to fix nullreff 2020-01-12 21:21:20 +01:00
dkanada ce7744806c
Merge pull request #2216 from gnattu/master
Let HLS fallback to mpegts in case device reports unsupported container
2020-01-13 03:43:59 +09:00
gnattu ea075c1b48
Add reminder to remove the workaround
This will be no longer needed when ffmpeg is ready

Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
2020-01-12 13:22:20 -05:00
dkanada d217f1614e
Merge pull request #2096 from Bond-009/embytv
Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
2020-01-13 00:41:52 +09:00
Maximilian Marschall 081d942d03 Enable Throttling when transcoding without Hardware-Acceleration 2020-01-12 00:33:57 +01:00
dkanada a272638a84
Merge pull request #2170 from Bond-009/mediainfoservice
Minor changes to MediaInfoService
2020-01-11 16:54:23 +09:00
Bond_009 d9ec502ff9 Address comments 2020-01-10 21:25:45 +01:00
Bond_009 e714b9930e Merge branch 'master' into embytv 2020-01-10 21:16:46 +01:00
Artiume a40cb7bbd8
Merge pull request #7 from jellyfin/master
nightly
2020-01-09 12:14:54 -05:00
gnattu d5204f572a Fix typo and plural 2020-01-09 02:25:05 -05:00
dkanada 73fac50e57 rename two properties based on code suggestions 2020-01-08 10:52:48 +09:00
Bond_009 a253fa616d Fix build and address comments 2020-01-08 01:23:57 +09:00
dkanada aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09:00
Artiume 5b55997984
Merge pull request #6 from jellyfin/master
nightly
2020-01-05 11:49:45 -05:00
dkanada 529cff3920
Merge pull request #2153 from dkanada/fix-playlist
Fix playlist deletion and a few warning fixes
2020-01-01 15:00:57 +09:00
gnattu 167549f5f1 Let HLS fallback to mpegts in case device reported unsupported container 2019-12-31 22:33:14 -05:00
Artiume 0e920a6d5f
Update MediaInfoService.cs 2019-12-20 23:40:36 -05:00
Artiume 963b69c7b2
Update MediaInfoService.cs 2019-12-20 23:17:01 -05:00
Bond_009 5751d86536 Fix warnings and move to System.Text.Json 2019-12-20 21:49:16 +01:00
Artiume 6a6e02e1ec
Merge pull request #3 from jellyfin/master
nightly, big one
2019-12-19 20:51:45 -05:00
Bond-009 bb62dd14c2 Limit size for playbacktest 2019-12-19 17:46:17 +01:00
Vasily 06dfa2e687
Merge pull request #2134 from Bond-009/dlnam3u8
Fix comparison between different types
2019-12-19 18:51:51 +03:00
Bond-009 a5cd11735c Minor changes to MediaInfoService 2019-12-19 15:54:27 +01:00
dkanada bc7cbfb21a
Merge pull request #1941 from Bond-009/mediaencoding
Make probesize and analyzeduration configurable and simplify circular dependencies
2019-12-18 08:54:40 +09:00
Artiume f3e7c72bac
Update MediaInfoService.cs 2019-12-16 15:22:18 -05:00
Artiume b31f4ccbc2
Update MediaInfoService.cs 2019-12-16 14:53:42 -05:00
Artiume 46442e24f8
Update MediaInfoService.cs 2019-12-16 00:43:03 -05:00
Artiume 3fb7aabfde
Update MediaInfoService.cs 2019-12-16 00:40:25 -05:00
Artiume 64c313a8fb
Update MediaInfoService.cs 2019-12-16 00:27:48 -05:00
Artiume be956dfd02
Update MediaInfoService.cs 2019-12-15 23:52:07 -05:00
dkanada 61b9845e0f
Merge pull request #2099 from cryptobank/master
Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to...
2019-12-15 19:54:20 +09:00
dkanada 1b2453b4e9 fix playlist deletion 2019-12-14 12:51:27 +09:00
cryptobank f18d3ed33b Formatting fix (3)
Co-Authored-By: Bond-009 <bond.009@outlook.com>
2019-12-14 11:27:41 +10:30
Bond-009 baadb504bb Merge branch 'master' into mediaencoding 2019-12-12 16:34:34 +01:00
dkanada 96a5dda9ff
Merge pull request #2109 from Bond-009/plugin
Fix plugin installation and correct api behaviour
2019-12-12 15:40:22 +09:00
Joshua M. Boniface 9744f5aee3
Merge pull request #2118 from chaosinnovator/master
Add StartIndex result to /Items API query
2019-12-11 23:42:02 -05:00
Bond_009 0bf8bfbb0c Merge branch 'master' into mediaencoding 2019-12-10 23:00:59 +01:00
chaosinnovator b98e25a07e Add StartIndex result to /Items API query 2019-12-10 09:30:44 -08:00
Bond-009 b20b648659 Fix comparison between different types 2019-12-10 17:25:21 +01:00
Bond-009 19844a2c2a Fix typo 2019-12-10 17:07:23 +01:00
dkanada dee3076eaf
Merge pull request #1923 from Bond-009/random
Don't shuffle some types by default
2019-12-10 22:28:44 +09:00
Bond_009 ec70f3ac75 Fix plugin installation and correct api behaviour
The `/Packages/{Name}` endpoint would return a package that had either
the corrent name or the correct guid. In reality it shoud check if both
are correct.
2019-12-06 22:06:16 +01:00
cryptobank 5b5d527a09
Use string.Equals instead of of equals operator
Co-Authored-By: Vasily <JustAMan@users.noreply.github.com>
2019-12-07 06:47:57 +10:30
Bond-009 a2c35e6dba Merge remote-tracking branch 'upstream/master' into random 2019-12-06 12:06:13 +01:00
Petr Janda 75426d0004 Add logging when force_key_frames is disabled 2019-12-06 17:21:24 +10:30
Bond-009 5f6bca8aeb Merge remote-tracking branch 'upstream/master' into baseurl 2019-12-05 17:49:15 +01:00
Bond-009 a6f883345f Reduce #lines 2019-12-05 17:44:46 +01:00
Petr Janda 7cde256402 Merge remote-tracking branch 'upstream/master' 2019-12-05 19:29:20 +10:30
Petr Janda 70530e1f14 Fix formatting (2) 2019-12-05 19:20:47 +10:30
Petr Janda 89605d4fb1 Fix VAAPI encoding on 10-bit hevc. Update QSV encoding and scaling to take advantage of scale_qsv and overlay_qsv 2019-12-05 17:39:36 +10:30
Bond_009 5cab79c839 Clean up Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs 2019-12-04 21:39:27 +01:00
Bond-009 6f45d95951 Minor improvements to network code 2019-11-28 17:46:06 +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
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
Bond_009 3221e837f9 * Add support for multi segment base urls
* Make baseurl case-insensitive
2019-11-25 11:55:24 +01:00
Joshua M. Boniface 48120d01dc
Merge pull request #1991 from Bond-009/transtemp
Don't append transcodes to transcoding temp path
2019-11-24 15:13:50 -05:00
Joshua M. Boniface db581c4d9b
Merge pull request #2045 from Bond-009/baseurlfix2
Fix baseurl issues part 2
2019-11-24 13:25:52 -05:00
dkanada 47ad21b6e3
Merge pull request #2039 from Bond-009/fixcondition
Fix always false condition
2019-11-24 21:41:19 +09:00
Bond_009 602ebe3fdb Fix baseurl (attempt #2) 2019-11-23 22:50:37 +01:00
dkanada 51cdc6ea16
Merge pull request #1926 from Bond-009/auth
Add clearer exceptions, warnings and docs
2019-11-23 01:14:32 +09:00
Bond_009 d884ed353f Fix always false condition 2019-11-22 16:19:19 +01:00
Bond-009 b477b3874e Fix some warnings 2019-11-22 16:15:31 +01:00
Bond-009 d4b438791f Don't append transcodes to transcoding temp path 2019-11-21 16:57:49 +01:00
dkanada f3ca37e523 minor changes to transcode cleanup scheduled task 2019-11-21 21:55:10 +09:00