Commit Graph

1276 Commits

Author SHA1 Message Date
Erwin de Haan
1f3aa3fe6f Apply review suggestions 2021-03-20 01:28:14 +01:00
Erwin de Haan
239a7156cc Fix arbitrary image file reads in ImageByNameController
GHSL-2021-050: Issue 4 Arbitrary image file read and directory traversal.
2021-03-20 01:14:59 +01:00
Erwin de Haan
f61d18612b Fix directory traversal in the HlsSegmentController in a fairly rudimentary but working way.
GHSL-2021-050: Issue 1,2,3 Arbitrary file read and directory traversal.
The segment id's can probably just be verified to be an actual ID or to not contain any forward or backward slashes
2021-03-20 01:14:59 +01:00
Patrick Barron
e5380c653b Merge branch 'master' into ef-cleanup
# Conflicts:
#	Jellyfin.Data/Entities/Libraries/MediaFileStream.cs
#	Jellyfin.Data/Jellyfin.Data.csproj
2021-03-14 10:19:35 -04:00
Bond-009
0e5d4a3bcf
Merge pull request #5422 from Bond-009/warn51 2021-03-14 00:41:40 +01:00
Bond-009
8bb2420a25
Merge pull request #5518 from crobibero/missing-endpoints
Add missing InstantMix endpoints
2021-03-13 22:59:47 +01:00
Bond_009
a8ed753f6c FxCop -> Net Analyzers (part 2) 2021-03-13 22:33:28 +01:00
crobibero
9ac9543ee2 Add missing InstantMix endpoints 2021-03-13 09:09:22 -07:00
Bond-009
260b48ef9d
Merge pull request #5515 from jellyfin/fix-refresh-endpoint
fix refresh endpoint
2021-03-13 15:07:42 +01:00
Claus Vium
fe2a310fe2
fix refresh endpoint
It was originally a POST 9af6eda0b4/MediaBrowser.Api/Library/LibraryService.cs (L155)
2021-03-13 09:13:45 +01:00
crobibero
eef15dc7ac Fix third part integration 2021-03-11 22:45:58 -07:00
Claus Vium
5592967497
Merge pull request #5403 from BaronGreenback/DLNAProfileFix 2021-03-10 11:50:08 +01:00
BaronGreenback
84da57cd48
Update StreamingHelpers.cs
Updated condition
2021-03-10 09:07:11 +00:00
David
ece0d67f99 Use FileShare.Read for log files 2021-03-09 17:31:31 +01:00
Bond_009
9ed7f429c0 FxCop -> Net Analyzers (part 1) 2021-03-09 03:04:47 +01:00
BaronGreenback
75c9659e05 Fix unreachable code & assign id to each profile. 2021-03-07 14:17:32 +00:00
David
60ffa6f514 Use FileShare.None when creating files 2021-03-07 14:43:28 +01:00
Patrick Barron
f638ee6b09 Enable nullable for Jellyfin.Data and remove unnecessary attributes 2021-03-06 17:43:01 -05:00
Bond-009
e839929b91
Merge pull request #5380 from Bond-009/plugins
100% branch coverage for DashboardController
2021-03-06 00:59:28 +01:00
Bond-009
3741be51ec
Merge pull request #5383 from cvium/fix-mergeversions-overflow
do not pick a linked item as primary when merging versions
2021-03-05 21:57:22 +01:00
cvium
59814bd55e do not pick a linked item as primary when merging versions 2021-03-05 19:57:48 +01:00
Claus Vium
d0a2d00b29
Fix UpdateMediaPath model binding (#5378) 2021-03-05 16:56:21 +01:00
Bond_009
a6d0db5d04 100% branch coverage for DashboardController 2021-03-05 11:15:14 +01:00
crobibero
858c91ab48 Specify defaults or set query parameter to nullable 2021-03-04 18:25:52 -07:00
BaronGreenback
d819a1d928
Remove Content-Length header from DLNA HEAD request (#5335) 2021-03-03 15:41:18 +01:00
Bond-009
c2af32d035
Merge pull request #5299 from Bond-009/tests13 2021-03-01 18:51:09 +01:00
Bond_009
914e891689 Fix unchecked input 2021-02-24 02:05:12 +01:00
Bond_009
aff0aea60f Improve branch coverage 2021-02-23 14:14:02 +01:00
Joshua M. Boniface
7ece3c5523
Merge pull request #5273 from Bond-009/warn31 2021-02-22 21:00:46 -05:00
Joshua M. Boniface
c0c4aff8a6
Merge pull request #5276 from Bond-009/minor12 2021-02-22 21:00:34 -05:00
Joshua M. Boniface
da55462d92
Merge pull request #5291 from Bond-009/tests12 2021-02-22 21:00:15 -05:00
dependabot[bot]
875e02318c
Bump Swashbuckle.AspNetCore from 6.0.5 to 6.0.7
Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.0.5 to 6.0.7.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.0.5...v6.0.7)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-22 16:11:56 +00:00
Bond_009
ec3237ba55 Fix tests 2021-02-22 13:46:40 +01:00
Bond_009
57102090d3 Add tests for DashboardController 2021-02-22 13:15:29 +01:00
dependabot[bot]
29fb2c57c8
Bump Swashbuckle.AspNetCore.ReDoc from 6.0.5 to 6.0.7
Bumps [Swashbuckle.AspNetCore.ReDoc](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.0.5 to 6.0.7.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.0.5...v6.0.7)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-22 12:00:48 +00:00
Bond_009
b1fe28d0a6 Use GetEncodingOptions where possible 2021-02-21 02:58:30 +01:00
Bond_009
eba859e33e Minor improvements 2021-02-21 02:49:52 +01:00
Bond_009
40b9e7592f Fix build 2021-02-20 23:34:15 +01:00
Bond_009
141efafd3d Enable TreatWarningsAsErrors for MediaBrowser.Model 2021-02-20 23:29:33 +01:00
dkanada
13d65318eb
Merge pull request #5223 from Bond-009/minor10
Minor improvements
2021-02-20 10:56:55 +09:00
dkanada
175e2a5249
Merge pull request #5242 from jellyfin/cancellationtokens
Properly forward cancellationTokens
2021-02-20 10:52:30 +09:00
crobibero
6ad2544a30 Bump Swashbuckle.AspNetCore to 6.0.5 2021-02-15 10:07:50 -07:00
Bond_009
e9f22303a4 Properly forward cancellationTokens 2021-02-15 14:19:17 +01:00
dependabot[bot]
7feef9a01b
Bump Swashbuckle.AspNetCore.ReDoc from 6.0.2 to 6.0.5
Bumps [Swashbuckle.AspNetCore.ReDoc](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.0.2 to 6.0.5.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.0.2...v6.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-15 12:00:48 +00:00
Bond-009
6616add8c8
Merge pull request #5213 from Bond-009/tests9
Add tests for RequestHelpers.GetItemTypeStrings
2021-02-13 11:10:28 +01:00
Bond_009
65bab55ca0 Minor improvements 2021-02-13 00:39:18 +01:00
dkanada
9fcdbd4c4b remove deprecated settings from server config 2021-02-12 21:58:37 +09:00
Bond_009
97935d2cd2 Add tests for RequestHelpers.GetItemTypeStrings 2021-02-11 18:21:08 +01:00
Bond-009
76d66e0dee
Merge pull request #5208 from crobibero/api-post-image
Add image file accept to openapi
2021-02-11 17:42:28 +01:00
crobibero
223b42aed3 Create BaseItemKind enum 2021-02-10 17:09:23 -07:00
crobibero
d5f0b046bb Add image file accept to openapi 2021-02-10 16:12:52 -07:00
crobibero
407c35f087 Update to dotnet 5.0.3 2021-02-09 19:02:02 -07:00
dependabot[bot]
df121c1516
Bump Swashbuckle.AspNetCore.ReDoc from 5.6.3 to 6.0.2
Bumps [Swashbuckle.AspNetCore.ReDoc](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 5.6.3 to 6.0.2.
- [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases)
- [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v5.6.3...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-02-08 12:00:45 +00:00
David Ullmer
07f1a2c2dc
Update Jellyfin.Api/Controllers/UserController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2021-02-06 18:36:18 +01:00
David
eb0ff0c370 Fix forgot password pin request 2021-02-06 17:18:37 +01:00
dkanada
86859a3926
Merge pull request #5010 from BaronGreenback/Remove_IPluginConfigurationPage
Removal of IPluginConfigurationPage
2021-02-05 11:38:44 +09:00
Claus Vium
63be326302
Merge pull request #5117 from jellyfin/fix-framerate-locale
Make FRAME-RATE field culture invariant
2021-01-28 15:35:23 +01:00
nyanmisaka
3ce0d589ba make FRAME-RATE field culture invariant 2021-01-28 01:00:55 +08:00
Bond-009
4a2678e63b
Merge pull request #5097 from Bond-009/cleanup4
Remove useless abstraction and clean up formatting
2021-01-26 17:44:49 +01:00
crobibero
77b417e41e Mark non-nullable body as null 2021-01-24 15:02:56 -07:00
Bond_009
f6b293203a
Restore weird behaviour 2021-01-24 17:55:25 +01:00
Bond_009
1c2cd7efa0
Remove useless abstraction and clean up formatting 2021-01-24 13:32:29 +01:00
Bond_009
d24e7f60c7
Fix GetOrderBy and add tests 2021-01-24 11:43:05 +01:00
crobibero
55670b91b2 Use ArrayModelBinder for sortBy and sortOrder 2021-01-23 17:32:13 -07:00
Ionut Andrei Oanca
68969c9530 Clear playlist in SyncPlay group 2021-01-24 01:05:17 +01:00
Joshua M. Boniface
4b6b90e0b1
Merge pull request #5069 from crobibero/obsolete-param 2021-01-23 14:45:18 -05:00
Joshua M. Boniface
3bf7e18886
Merge pull request #5031 from crobibero/5.0.2
Update to dotnet 5.0.2
2021-01-23 14:41:03 -05:00
Cody Robibero
91a9af95c2
Apply suggestions from code review
Co-authored-by: dkanada <dkanada@users.noreply.github.com>
2021-01-21 07:01:51 -07:00
crobibero
59ff2c5b4b Add ability to mark query parameter as obsolete. 2021-01-20 16:24:15 -07:00
crobibero
a087ab389a dotnet 5.0.2 2021-01-16 10:17:33 -07:00
crobibero
3b9567d583 Add query parameter to disable returning first episode as next up 2021-01-15 15:08:48 -07:00
BaronGreenback
a4e838fbf5 Remoed configurationPageType 2021-01-15 10:36:44 +00:00
BaronGreenback
c6aa6ceed9 Removal of IPluginConfigurationPage 2021-01-12 22:10:23 +00:00
crobibero
5f998bdd1f Require elevated auth to upload subtitles 2021-01-10 10:48:37 -07:00
Bond_009
620fbf0f89
Remove CropWhitespace function 2021-01-09 10:51:59 +01:00
crobibero
a15e126ef8 Fix inverted SkipWhile 2021-01-02 19:23:54 -07:00
Bond-009
9a10a18db1
Merge pull request #4905 from BaronGreenback/streamingHelper
Null exception fix
2021-01-01 18:21:21 +01:00
crobibero
1b894798b1 Change log level for converters 2021-01-01 09:34:39 -07:00
BaronGreenback
11700db312
Update StreamingHelpers.cs
Null exception fix
2021-01-01 00:25:47 +00:00
Cody Robibero
5c57569692
Merge branch 'master' into PluginDowngrade 2020-12-30 18:11:37 -07:00
BaronGreenback
4c291da45c
Encoding fix for System Logs. (#4564) 2020-12-30 18:31:26 +01:00
BaronGreenback
889e988167 Updated to latest unstable. 2020-12-23 17:25:34 +00:00
BaronGreenback
62702fa3eb Changes as requested 2020-12-23 16:28:50 +00:00
Bond-009
3a452463fc
Merge pull request #4849 from crobibero/clean-deps
Remove unused dependencies
2020-12-23 11:51:41 +01:00
Joshua M. Boniface
bfdd4727b5
Merge pull request #4850 from BaronGreenback/NetworkApiFix
Null reference fix
2020-12-22 22:21:59 -05:00
Joshua M. Boniface
a77788906c
Merge pull request #4821 from BaronGreenback/disableDlna 2020-12-22 22:20:44 -05:00
BaronGreenback
e113a50597 Possible null reference fix. 2020-12-22 16:14:06 +00:00
crobibero
1dac2226c4 Remove unused deps 2020-12-22 08:57:51 -07:00
BaronGreenback
bc9462981e changed to constants 2020-12-22 15:33:25 +00:00
BaronGreenback
bf24929d27 Changed to 503. 2020-12-22 15:23:55 +00:00
Claus Vium
53119ed2a1
Merge pull request #4824 from crobibero/livestream-post-body
Add request parameters to OpenLiveStreamDto
2020-12-21 23:10:46 +01:00
Claus Vium
98da2c67a5
Merge pull request #4836 from crobibero/dashboard-theme
Return dashboardTheme when requesting DisplayPreferences
2020-12-21 00:14:30 +01:00
David
13de663201 Fix similar endpoint for TV 2020-12-20 22:21:11 +01:00
crobibero
a682fc4516 Return dashboardTheme when requesting DisplayPreferences 2020-12-20 12:59:44 -07:00
David
eba403158e Re-add IsMovie 2020-12-20 17:00:27 +01:00
David
f4d1e33010 Fix similar items endpoint for movies and TV 2020-12-20 15:37:44 +01:00
crobibero
4539164d38 Add request parameters to OpenLiveStreamDto 2020-12-19 10:55:07 -07:00
BaronGreenback
9470712118 Added xml docs 2020-12-19 17:38:46 +00:00
BaronGreenback
3d0b9f9ea1 Did the other API, 2020-12-19 09:34:04 +00:00
BaronGreenback
c98144c60d Updated docs. 2020-12-18 23:59:21 +00:00
BaronGreenback
f06d52c475 Disable API if dlna is disabled. 2020-12-18 23:29:21 +00:00
Greenback
5d748c0e9f Renamed to ImagePath 2020-12-18 20:52:44 +00:00
BaronGreenback
5d5b198525
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-18 08:23:28 +00:00
BaronGreenback
e445c2932a
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-18 08:23:15 +00:00
crobibero
56ae63433f Set filename when downloading file 2020-12-17 13:05:44 -07:00
Greenback
1ed25ebd9a Corrections as recommended. 2020-12-16 22:36:25 +00:00
Greenback
ebbb57efc3 Change json default settings. 2020-12-16 21:40:52 +00:00
Claus Vium
21d2e9ff0c
Merge pull request #4771 from crobibero/typed-get-preference
Use typed UserManager GetPreference
2020-12-16 22:15:56 +01:00
Greenback
5323887540 Replaced TryGetPlugin with GetPlugin 2020-12-15 20:27:42 +00:00
Greenback
00ff3b9096 remove attribute 2020-12-15 19:35:30 +00:00
BaronGreenback
aecd35d306
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 19:31:36 +00:00
BaronGreenback
24ab152e9d
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 19:30:23 +00:00
BaronGreenback
e4993ae574
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 19:24:52 +00:00
BaronGreenback
2afa963fc1
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 19:24:39 +00:00
BaronGreenback
3f1ad7f963
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 19:22:54 +00:00
Greenback
c197dca759 Changed PluginId to guid so its the same type as plugin.id 2020-12-15 18:27:31 +00:00
Greenback
eb2439f23b Changes as recommended. 2020-12-15 16:37:11 +00:00
Bond-009
e84622b4ab
Merge pull request #4794 from cvium/fix_image_upload
Convert from base64 when saving item images
2020-12-15 12:24:05 +01:00
Bond-009
906ee4f962
Merge pull request #4781 from crobibero/map-xmltv
Use request body for mapping xml channels
2020-12-15 12:22:39 +01:00
Greenback
208d545cfe Changed as suggested. 2020-12-15 10:05:04 +00:00
Greenback
dddcfa6dbb Suggested changes. 2020-12-15 09:30:19 +00:00
BaronGreenback
41466c430d
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 09:17:06 +00:00
cvium
5b4eef741a Convert from base64 when saving item images 2020-12-15 09:27:33 +01:00
BaronGreenback
33385c1b8c
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 07:55:14 +00:00
BaronGreenback
1c6529c9eb
Update Jellyfin.Api/Controllers/PluginsController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-12-15 07:54:49 +00:00
BaronGreenback
67c480ad53
Merge branch 'master' into PluginDowngrade 2020-12-15 01:15:54 +00:00
Greenback
356d92cd71 Fixed repository listing 2020-12-15 00:49:14 +00:00
Greenback
494ace7984 Mark plugin failure on DI Loop. 2020-12-14 23:39:47 +00:00
Greenback
d2d45295fc Rollback change. 2020-12-14 23:13:29 +00:00
Greenback
a246a77ada Delete plugin working. 2020-12-14 23:08:04 +00:00
Greenback
7986465cf7 Initial upload 2020-12-14 16:14:39 +00:00
Joshua M. Boniface
4f6a585424
Merge pull request #4716 from OancaAndrei/syncplay-new-auth-policies 2020-12-13 16:58:28 -05:00
crobibero
c6b381db10 Use request body for mapping xml channels 2020-12-13 08:32:33 -07:00
crobibero
ee23d06154 Use a more descriptive function name 2020-12-13 08:15:26 -07:00
Claus Vium
13bb5e1ead
Merge pull request #4761 from crobibero/playlist 2020-12-13 13:34:04 +01:00
Claus Vium
f8ef38c0ea
Merge pull request #4758 from nyanmisaka/fix-landingScreen-options 2020-12-13 13:29:11 +01:00
crobibero
b670937c3d Use typed UserManager GetPreference 2020-12-11 15:00:43 -07:00
Bond-009
04ba59ab40
Merge pull request #4766 from barronpm/usermanager-async
Convert DeleteUser to async
2020-12-11 21:29:20 +01:00
Patrick Barron
76f61eb0d6 Convert DeleteUser to async 2020-12-11 10:15:43 -05:00
Nyanmisaka
a79c210c76
fix typo
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-12-11 11:35:00 +08:00
crobibero
297b7ea6fa Fix empty body for PlaybackInfo 2020-12-10 11:36:58 -07:00
crobibero
0d2106a272 Allow playlist to be created by query string 2020-12-10 11:36:31 -07:00
nyanmisaka
0332b72502 fix landing screen options 2020-12-10 22:41:00 +08:00
crobibero
aa5fa7cb8f Update to dotnet 5.0.1 2020-12-09 07:36:31 -07:00
Claus Vium
80ff564143
Merge pull request #4722 from crobibero/forbid
Fix API forbidden response
2020-12-08 10:11:14 +01:00
Claus Vium
4c199ac9a5
Merge pull request #4711 from barronpm/api-fixes
Add required attributes to parameters
2020-12-08 08:36:32 +01:00
crobibero
5150598c6d Fix API forbidden response 2020-12-07 08:55:42 -07:00
Ionut Andrei Oanca
fbeb0228a2 Minor code style related change 2020-12-07 16:15:56 +01:00
Ionut Andrei Oanca
499f3ee950 Update authorization policies for SyncPlay 2020-12-07 10:33:15 +01:00
Patrick Barron
391870ebae Add required attributes to parameters 2020-12-06 20:05:55 -05:00
Bond-009
26919eed26
Merge pull request #4672 from cvium/fix_mergeversions_which_was_unrelated_to_my_bughunt
Fix MergeVersions endpoint
2020-12-05 15:06:41 +01:00
cvium
ba7a1c8b7b Fix MergeVersions endpoint 2020-12-05 13:54:19 +01:00
Joshua M. Boniface
bba01bf7b9
Merge pull request #3194 from OancaAndrei/syncplay-enhanced
SyncPlay for TV series (and Music)
2020-12-04 20:22:30 -05:00
Joshua M. Boniface
4e6584c345
Merge pull request #4652 from crobibero/display-preferences
Add support for custom item display preferences
2020-12-04 20:05:04 -05:00
crobibero
76250a8895 Use md5 Guid for legacy compat 2020-12-04 16:27:31 -07:00
crobibero
3db6ae91f6 Add ItemId to all display preferences 2020-12-04 16:00:11 -07:00
Ionut Andrei Oanca
23473ef8fb Fix access policies to SyncPlay 2020-12-04 22:03:35 +01:00
Joshua M. Boniface
670f7cacc3
Merge pull request #4651 from crobibero/iso_manager
Remove IIsoMounter and IsoMounter
2020-12-04 14:53:09 -05:00
Ionut Andrei Oanca
cbf70e7a03 Change type of PlaylistItemId to Guid 2020-12-04 20:15:16 +01:00
crobibero
8d8738835e Use DisplayPreferencesId as ItemId 2020-12-04 09:16:38 -07:00
crobibero
e765184afa Fix existing DisplayPreferences migration 2020-12-03 15:00:26 -07:00
crobibero
685c966468 Suggestion from review 2020-12-03 14:35:18 -07:00
crobibero
b0c79edd2c Add support for custom item display preferences 2020-12-03 13:51:12 -07:00
Ionut Andrei Oanca
7169c0a22d Move SyncPlay request DTOs to proper namespace 2020-12-03 19:01:57 +01:00
Ionut Andrei Oanca
389367fec8 Rename 'track' into 'item' in SyncPlay 2020-12-03 15:54:39 +01:00
crobibero
ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07:00
cvium
7e0ea296c3 Move request validation to auth policies 2020-12-03 10:43:44 +01:00
Claus Vium
1d3b2e8dd6
Merge pull request #4643 from crobibero/empty-lib-null-ref
Fix null reference when getting filters of an empty library
2020-12-03 07:58:05 +01:00
Claus Vium
e042572588
Merge pull request #4633 from crobibero/guid-params
Use Guid as API parameter type where possible
2020-12-03 07:51:02 +01:00
crobibero
828504e925 The future is now 2020-12-02 08:04:08 -07:00
crobibero
08be7f094a Cleaner type checking 2020-12-02 07:55:34 -07:00
crobibero
41e127d1d2 Fix null reference when getting filters of an empty library 2020-12-02 07:42:25 -07:00
crobibero
09b1e571f4 Apply suggestions from review 2020-12-02 07:11:42 -07:00
Joshua M. Boniface
a6199f821b
Merge pull request #4169 from stanionascu/bdiso-playback
Playback (direct-stream/transcode) of BDISO/BDAV containers
2020-12-01 22:36:04 -05:00
crobibero
b5a7a74e89 Use GetParentItem where applicable 2020-12-01 16:16:17 -07:00
crobibero
cd459c51f3 Return NoResult only when request doesn't have a token. 2020-12-01 14:47:42 -07:00
crobibero
f48e47be5f Split nested conditional 2020-12-01 12:10:11 -07:00
crobibero
c083b29e29 Use Guid as API parameter type where possible 2020-12-01 11:07:41 -07:00
crobibero
38b3b4f867 Provide NoResult instead of Fail in CustomAuthenticationHandler 2020-12-01 06:32:46 -07:00
nyanmisaka
ea592d0256 fix trascodeReasons report 2020-11-30 18:41:59 +08:00
Ionut Andrei Oanca
78ea8ef99e Create common interface for SyncPlay requests 2020-11-28 16:03:02 +01:00
Ionut Andrei Oanca
c60714e365 Move query parameters to request body in SyncPlay 2020-11-28 14:20:46 +01:00
cvium
65e6211c03 Remove circular dependency between websocket listeners and manager 2020-11-28 11:21:53 +01:00
cvium
3ae39d44da Revert "Fixed SessionWebSocketListener.OnServerManagerWebSocketConnected." 2020-11-28 09:50:30 +01:00
cvium
1a0d8aef80 Revert "Removed Lazy implementation." 2020-11-28 09:50:16 +01:00
Greenback
5cd5a7d4ce Removed Lazy implementation. 2020-11-28 00:25:20 +00:00
Greenback
a59aeb12e0 Fixed SessionWebSocketListener.OnServerManagerWebSocketConnected. 2020-11-27 23:04:13 +00:00
Joshua M. Boniface
c98c2ab955
Merge branch 'master' into syncplay-enhanced 2020-11-27 09:46:18 -05:00
Joshua M. Boniface
9169a28df1
Merge pull request #4588 from jellyfin/hex
Remove Hex class as the BCL has one now
2020-11-27 01:59:58 -05:00
Bond_009
38932fc7d1 Schedules Direct requires the hex to be lowercase 2020-11-26 13:21:04 +01:00
Bond_009
8c8a71692e Remove Hex class as the BCL has one now 2020-11-25 23:40:31 +01:00
crobibero
1dafd70f51 Don't nest DeviceProfile 2020-11-23 10:50:18 -07:00
crobibero
fafddfc45e Add TODO notice 2020-11-23 09:51:24 -07:00
crobibero
f336d20b06 Fix sending PlaybackInfo 2020-11-23 09:49:42 -07:00
crobibero
3bff1ff8a2 Fix namespace and add attribute 2020-11-22 18:46:55 -07:00
Joshua M. Boniface
2c9e355e42
Merge branch 'master' into NetworkPR2 2020-11-21 23:28:15 -05:00
Joshua M. Boniface
b707d8e09d
Merge pull request #4486 from crobibero/split-api
Remove api client generator errors
2020-11-21 17:19:08 -05:00
Joshua M. Boniface
f6c842e7b3
Merge pull request #4513 from BaronGreenback/LatestPluginSelected
Multi-repository plugins
2020-11-21 17:18:19 -05:00
Joshua M. Boniface
509a4d0900
Merge pull request #4526 from crobibero/mark-played
Fix marking item as played
2020-11-21 17:17:44 -05:00
Claus Vium
fab03942f5
Merge pull request #4537 from crobibero/session-caps-full
Convert ClientCapabilities to a Dto with JsonConverters
2020-11-21 21:34:58 +01:00
Joshua M. Boniface
1e6539d0dc
Merge pull request #4539 from crobibero/nullable-enum-model-binder
Add NullableEnumModelBinder and NullableEnumModelBinderProvider
2020-11-21 15:14:59 -05:00
Greenback
5224200e8c Fixed baseurl in dlna. 2020-11-21 19:50:40 +00:00
crobibero
40531db1ae Add NullableEnumModelBinder and NullableEnumModelBinderProvider 2020-11-21 11:58:35 -07:00
crobibero
c8c5feacb6 Convert ClientCapabilities to a Dto with JsonConverters 2020-11-21 11:37:22 -07:00
Greenback
e41d1773ba changes 2020-11-21 16:14:03 +00:00
Greenback
c4753cec6c Fixed merge. 2020-11-21 14:05:09 +00:00
Greenback
616caca2b7 Added more comments. 2020-11-21 13:27:27 +00:00
Bond_009
f5973d57e8
Remove UTF8 bom from some files 2020-11-21 14:26:03 +01:00
Claus Vium
937e2a84e8
Merge pull request #4533 from Bond-009/nullref3
Fix nullref
2020-11-21 14:14:12 +01:00
BaronGreenback
124bd4c2c0
Networking: 1 - Network Manager (#4124)
* NetworkManager

* Config file with additional options.

* Update Jellyfin.Networking/Manager/INetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/INetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Split function.

* Update Jellyfin.Networking/Manager/INetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* fixed iterations

* Update Jellyfin.Networking.csproj

* Update NetworkManager.cs

* Updated to NetCollection 1.03.

* Update ServerConfiguration.cs

* Update StartupController.cs

* Update INetworkManager.cs

Removed public

* Update INetworkManager.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Updated comment

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/INetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Remove mono code.
Removed forced chromecast option

* Inverted if

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Moved config into a separate container

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Changed sortedList to dictionary.

* Update INetworkManager.cs

Changed UpdateSettings param type

* Update NetworkManager.cs

* Update NetworkManager.cs

* Update NetworkManager.cs

* Update NetworkConfiguration.cs

* Update INetworkManager.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Model/Configuration/ServerConfiguration.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Updated changes github didn't update.

* Fixed compilation.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Removed read locking.

* Update NetworkManager.cs

Changed configuration event to NamedConfigurationUpdated

* updated comment

* removed whitespace

* Updated NetCollection to 1.0.6
Updated DXCopAnalyser to 3.3.1

* removed NetCollection

* Update NetworkManager.cs

* Update NetworkExtensions.cs

* Update NetworkExtensions.cs

Removed function.

* Update NetworkExtensions.cs

* Update NetworkManager.cs

Changed ToString() to AsString() as native collection formats incorrectly.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update NetworkExtensions.cs

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update Jellyfin.Networking/Configuration/NetworkConfiguration.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>

* updated

* Replaced NetCollection with Collection<IPObject>

* Update MediaBrowser.Common/Net/NetworkExtensions.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Model/Configuration/PathSubstitution.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/NetworkExtensions.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPHost.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* Update MediaBrowser.Common/Net/IPObject.cs

Co-authored-by: Cody Robibero <cody@robibe.ro>

* updated comments.

* Updated comments / changes as suggested by @crobibero.

* Split function as suggested

* Fixed null ref.

* Updated comment.

* Updated cs to .net5

* Fixed issue with PublishedServerUrl

* Fixes

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Restored locking

* optimisation

* Added comment

* updates.

* updated.

* updates

* updated.

* Update IPHost.cs

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>

* Update NetworkManager.cs

* Removed whitespace.

* Added debug logging

* Added debug.

* Update Jellyfin.Networking/Manager/NetworkManager.cs

Co-authored-by: Bond-009 <bond.009@outlook.com>

* Replaced GetAddressBytes

Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Co-authored-by: h1dden-da3m0n <33120068+h1dden-da3m0n@users.noreply.github.com>
Co-authored-by: Bond-009 <bond.009@outlook.com>
2020-11-21 13:59:14 +01:00
Bond_009
c01042b355
Fix nullref 2020-11-21 12:28:32 +01:00
BaronGreenback
7a6063ed41
Merge branch 'master' into NetworkPR2 2020-11-21 00:35:53 +00:00
crobibero
b3d322f79f Fix build after merge 2020-11-20 10:50:11 -07:00
crobibero
8f58f63b08 Merge remote-tracking branch 'upstream/master' into split-api 2020-11-20 10:35:46 -07:00
Joshua M. Boniface
7457c4a95d
Merge pull request #4499 from crobibero/more-param
Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids
2020-11-20 12:34:18 -05:00
Joshua M. Boniface
799eb44005
Merge pull request #4514 from Artiume/patch-9
Update FFmpeg log
2020-11-20 12:34:10 -05:00
Joshua M. Boniface
c901f1da41
Merge pull request #4518 from crobibero/livetv-hls
Fix live tv hls playback
2020-11-20 12:33:48 -05:00
crobibero
2f75f84b6f Fix marking item as played 2020-11-20 10:22:40 -07:00
Claus Vium
44ff7a4843
Apply suggestions from code review 2020-11-20 08:06:28 +01:00
nyanmisaka
b4598bd71b Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-20 10:01:17 +08:00
nyanmisaka
ca33ace3e9 rename 2020-11-20 09:57:28 +08:00
artiume
6a751251e7
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-19 19:45:26 -05:00
artiume
a46b70b169
Truncate GUID to 8 char 2020-11-19 19:23:04 -05:00
crobibero
d58e435409 Add response code documentation 2020-11-19 16:16:23 -07:00
crobibero
fe8531f74e Fix live tv hls playback 2020-11-19 16:15:20 -07:00
Fernando Fernández
e21e00cad5 Merge remote-tracking branch 'upstream/master' into no-scaling 2020-11-19 23:18:25 +01:00
artiume
3423bdf53a
Update Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-19 15:51:58 -05:00
Greenback
a3e47f3e4e Updated to latest Unstable. 2020-11-19 18:27:18 +00:00
Fernando Fernández
2deda0437d Review suggestions 2020-11-19 16:36:19 +01:00
nyanmisaka
20d6999d8c minor changes 2020-11-19 23:04:44 +08:00
Nyanmisaka
5ff08338d5
Apply suggestions from code review
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
2020-11-19 15:02:36 +00:00
nyanmisaka
51dab0958d changes per suggestions 2020-11-19 22:46:02 +08:00
Greenback
1df58fbaa0 updated 2020-11-19 14:12:33 +00:00
artiume
e6e7295320
oops 2020-11-19 08:58:16 -05:00
artiume
4e07d9d561
Update FFmpeg log 2020-11-19 08:49:21 -05:00
Greenback
18855a7884 Initialial upload 2020-11-19 13:34:09 +00:00
BaronGreenback
4c394eec90
Update Jellyfin.Api/Controllers/LiveTvController.cs
Co-authored-by: Cody Robibero <cody@robibe.ro>
2020-11-18 14:08:44 +00:00
Greenback
e51ddd326c Fixes spelling. 2020-11-18 13:23:45 +00:00
Fernando Fernández
38c3b6fcd3 Fix build and thread detection logic 2020-11-18 10:20:59 +01:00
dkanada
742966573d
Merge pull request #4503 from jellyfin/cancellation
Pass cancellation where possible
2020-11-18 13:46:13 +09:00
crobibero
f6c6ee2008 Fix Environment authorization policy 2020-11-17 13:44:51 -07:00
Bond_009
4b1c9dc9ea Pass cancellation where possible 2020-11-17 19:43:00 +01:00
crobibero
7bf647bb94 Remove precondition checks 2020-11-17 09:38:50 -07:00
crobibero
3b68ce1183 Fix build 2020-11-16 20:45:09 -07:00
crobibero
2a0578ce1a Add missing manual splits 2020-11-16 20:37:43 -07:00
crobibero
3cc0dd7e12 Reduce RequestHelpers.Split usage and remove RequestHelpers.GetGuids usage. 2020-11-16 20:29:46 -07:00
Greenback
60a6627140 Removing left over edits left from the acceptance of previous PR's. 2020-11-16 19:45:21 +00:00
BaronGreenback
d66f88672c
Merge branch 'master' into NetworkPR2 2020-11-16 16:27:37 +00:00
nyanmisaka
099563cd6b comply with dotnet-5 2020-11-16 12:56:37 +08:00
nyanmisaka
488dbdb31d Merge remote-tracking branch 'upstream/master' into fmp4-hls 2020-11-16 12:36:55 +08:00