Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-09 15:20:34 +02:00
Code Issues Packages Projects Releases Wiki Activity
25432 commits 30 branches 75 tags 1.3 GiB
Commit graph

482 commits

Author SHA1 Message Date
Negulici-R. Barnabas e977aade77
Merge branch 'jellyfin:master' into master 2022-11-26 10:56:23 +02:00
Negulici-R. Barnabas 7db1813cc8 changed ChapterImageResolution in model to enum type; 
added 144p to the ImageResolution enum;
updated chapters limit comment inside FFProbeVideoInfo.cs;
 2022-11-13 16:23:21 +02:00
Negulici-R. Barnabas b7aa5ed862
Merge branch 'jellyfin:master' into master 2022-11-13 15:29:16 +02:00
Jendrik Weise 21072310e7 Sort external files when scanning 
Sorts files such as external subtitles or audio as well as metadata
Useful for deterministic display in the UI.
 2022-11-04 15:16:27 +01:00
Joe Rogers dd41fb9a61
Update embedded image names to match docs 2022-10-08 23:20:10 -04:00
Claus Vium b137d0cc2b
Merge pull request #7514 from Shadowghost/music-extend 2022-10-07 15:21:00 +02:00
Shadowghost 9b2e9640be Apply review suggestions 2022-10-07 14:41:00 +02:00
Shadowghost 6c6f89acc3 Apply review suggestions 2022-10-07 14:14:21 +02:00
Joe Rogers 2e4db18ebe
Add hearing impaired subtitle stream indicator (#7379) 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2022-10-07 12:38:05 +02:00
Shadowghost 4649e0e425 Add xiph tag parsing 2022-10-03 13:20:54 +02:00
Shadowghost fa9820b1fd Add apple tag parsing 2022-10-03 13:05:57 +02:00
Shadowghost 12cf98b4e3 Update taglibsharp, add audible tag parsing 2022-10-01 20:26:08 +02:00
Shadowghost 42fc02cab6 Add xmldocs 2022-09-13 17:20:22 +02:00
Shadowghost e6c6482b9e Rename providers to be more generic 2022-09-13 17:20:22 +02:00
Shadowghost 61fa325ef0 Extend music parsing 2022-09-13 17:20:22 +02:00
Negulici-R. Barnabas 12ec0e285d Chapter Images: 
- chapter image extraction intervals, limit count and resolutions can be set by the user from the server general settings;
 2022-07-18 17:50:52 +03:00
Bond-009 d771205544 Merge pull request #7988 from jellyfin/external-streams-exceptions 
(cherry picked from commit a71b190142)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
 2022-06-29 01:26:38 -04:00
Cody Robibero 3a95d4b04e Merge pull request #7802 from jellyfin/external 
(cherry picked from commit 9954cbd550)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-06-06 09:16:11 -04:00
Cody Robibero efcdab116f Merge pull request #7529 from Shadowghost/strm-ffprobe-external-fix 
(cherry picked from commit 60affd0965)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-05-20 18:30:56 -04:00
Cody Robibero 9e380768dd Merge pull request #7527 from Shadowghost/mediaresolver-fix 
(cherry picked from commit aa1b1c6bbb)
Signed-off-by: crobibero <cody@robibe.ro>
 2022-04-07 12:54:58 -04:00
Cody Robibero 8056b0e961
Merge pull request #7443 from whiteowl3/strm-probe 2022-03-25 13:33:10 -06:00
whiteowl3 669029595b
Update MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2022-03-23 13:18:34 -04:00
whiteowl3 6f25291931 allow strm probe to succeed 2022-03-11 06:54:25 +00:00
Joe Rogers ac83effd44
Match external sub/audio stream adding logic 2022-03-10 22:02:46 +01:00
Joe Rogers f7118bebfd
Fix external file check for shorter names 2022-03-05 12:39:03 +01:00
Joe Rogers dad7a6fdf6
Switch to using spans for string comparison 2022-03-04 15:58:01 +01:00
Joe Rogers 3205e97e1e
Strip out external file fuzzy matching 
Convert MediaFlagDelimiter back to char
 2022-03-04 10:52:21 +01:00
Cody Robibero 1b3e56bae3 Split DirectoryExists and FileExists 2022-03-02 19:55:44 -07:00
Cody Robibero fc5c6c0404 Use IFileSystem 2022-02-28 17:14:33 -07:00
Cody Robibero c9d5cfff1d
Update MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs 
Co-authored-by: Joe Rogers <1337joe@users.noreply.github.com>
 2022-02-28 09:58:11 -07:00
Cody Robibero 40e413d575 Only add internal files if the internal metadata path exists 
Signed-off-by: Cody Robibero <cody@robibe.ro>
 2022-02-28 08:22:52 -07:00
Joe Rogers cf033b25f8
Require delimiter immediately after filename match 2022-02-21 22:27:28 +01:00
Joe Rogers 15053516f8
Rewrite tests for coverage and less duplication 
Address minor warnings
Revert making GetInternalMetadataPath mockable
 2022-02-21 22:25:58 +01:00
Shadowghost bbb3117f83
Update MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs 
Co-authored-by: Bond-009 <bond.009@outlook.com>
 2022-02-19 23:47:11 +01:00
Shadowghost a36e34fbd2 fix(external-media): implement review suggestions 2022-02-18 22:19:33 +01:00
Shadowghost 719b707281 feat(external-media): refactor to generic provider, extend tests and file recognition, consolidate and extend NamingOptions 2022-02-18 22:19:33 +01:00
Shadowghost ca5112f45a feat(external-media): refactor external subtitle and audio provider 2022-02-18 22:19:24 +01:00
Bond_009 5732e6188c Fix some warnings 2022-02-15 18:59:46 +01:00
Bond_009 1c14c86b20 Fix some warnings 2022-02-14 14:46:04 +01:00
Cody Robibero 603b6fe173
Merge pull request #7054 from matthew-jones-uk/disable-embedded-subs 2022-02-11 13:20:37 -07:00
Matthew Jones 91d143d6ee Changed boolean options to enums 2022-01-26 16:09:05 +00:00
Joe Rogers fbd243e315
Make ffprobe consistent with MetadataService.MergeData 2022-01-22 21:59:17 +01:00
Matthew Jones 61d8d40a4a Added type options to disable embedded subs 2022-01-14 11:25:08 +00:00
Matt 126274c4ea Add video path to DisableEmbeddedSubtitles log 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2022-01-14 11:25:08 +00:00
Matthew Jones 3f7bd7b63e Changed DisableEmbeddedSubtitles logging to debug 2022-01-14 11:25:08 +00:00
Matthew Jones 4df7590e52 Add DisableEmbeddedSubtitles setting 
Disables embedded subs being added to metadata
 2022-01-14 11:25:08 +00:00
Cody Robibero 634ce40c2f
Merge branch 'master' into comparisons 2021-12-24 02:41:50 +00:00
Cody Robibero 32629cd7da Use BaseItemKind where possible 2021-12-12 06:11:27 -07:00
Jonas Resch 03b3f08354
Format code in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-08 18:55:28 +01:00
Jonas Resch 65833076db
Add "Async" suffix to AddExternalAudio method 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-08 16:49:27 +01:00
Jonas Resch e18d966874
Add "Async" suffix to AddExternalAudio method 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-12-08 16:49:20 +01:00
Jonas Resch 4cdb590291 Exclude .strm files when searching for external audio files 2021-12-08 10:18:09 +01:00
Jonas Resch 01a0a4a87c Add audioResolver argument to FFProbeVideoInfo initialization 2021-12-08 10:16:48 +01:00
Jonas Resch 87a6fdf847 Merge branch 'support-external-audio-files' of github.com:jonas-resch/jellyfin into support-external-audio-files 2021-12-08 09:55:16 +01:00
Claus Vium a327b43ab7
Update MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs 2021-12-07 20:28:51 +01:00
Claus Vium 3f69eeab27
Merge branch 'master' into support-external-audio-files 2021-12-07 20:16:32 +01:00
cvium 5535b9c01f Reduce allocations 2021-12-02 11:21:59 +01:00
Jonas Resch 180e2dc329 Prevent crashes in specific scenarios 2021-12-01 21:05:43 +01:00
Jonas Resch 6bbfcf1906 Add documentation to AudioResolver class 2021-11-30 21:05:43 +01:00
Jonas Resch 7b50048020
Add ConfigureAwait true in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:45:47 +01:00
Jonas Resch a9a53dc657
Add ConfigureAwait true in MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:45:21 +01:00
Jonas Resch 0d8170cedb
Move variable in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:44:57 +01:00
Jonas Resch 1a35690834
Don't disable warnings in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 20:44:16 +01:00
Jonas Resch c61b9ef05a Fix warning due to new line after opening bracket 2021-11-30 19:52:44 +01:00
Jonas Resch b5b994b22f Fix compiler warning due to missing EnumeratorCancellation attribute 2021-11-30 19:31:46 +01:00
Jonas Resch 0894a6193f Implement coding standards from 2nd code feedback 2021-11-30 19:31:46 +01:00
Jonas Resch 9d34d6339a Change return type from List<string> to IEnumerable<string> in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch bbf1399826 Check language for null or empty instead of only null in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch d016d483ae Change return type from Task<List<MediaStream>> to Task<IAsyncEnumerable<MediaStream>> in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch 61b191d345 Fix indentation in MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
If statement which checks if filename of audio and video file match or if audio file starts with video filename

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch 9433072f90 Only search in video folder for external audio files 
Don't search in video metadata folder since audio files won't be stored there

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch a3c5afa443 Add ConfigureAwait false MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2021-11-30 19:31:46 +01:00
Jonas Resch f1862f9b1a Add ConfigureAwait false to MediaBrowser.Providers/MediaInfo/AudioResolver.cs 
Co-authored-by: Cody Robibero <cody@robibe.ro>
 2021-11-30 19:31:46 +01:00
Jonas Resch a68e58556c Implement code feedback 
- Rewrite AudioResolver
- Use async & await instead of .Result
- Add support for audio containers with multiple audio streams (e.g.
  mka)
- Fix bug when using external subtitle and external audio streams at the
  same time
 2021-11-30 19:31:46 +01:00
Jonas Resch c1a8385c9c Shorten calculation of audio startIndex in MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-30 19:31:46 +01:00
Jonas Resch 9978164438 Add support for external audio files 2021-11-30 19:31:46 +01:00
Joe Rogers 1df5b5034b
Address suppressed warnings 2021-11-27 20:35:18 +01:00
Joe Rogers 4a20ae6cb4
Allow default/forced tag without setting language 2021-11-27 20:13:21 +01:00
Joe Rogers 88baff5693
Apply suggestions from code review 
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-11-19 22:40:42 +01:00
Joe Rogers 9ba7bf96ef
Query MediaSourceManager directly in image providers 
Add doc comments/minor tweaks to AudioImageProvider
 2021-11-18 15:11:50 +01:00
Joe Rogers 7cf5767949
Query media streams by type instead of filtering 2021-11-17 22:34:04 +01:00
Joe Rogers f059be8e4d
Add logging and fast return 2021-11-15 15:30:43 +01:00
Joe Rogers 370b7f8e12
Handle unexpected case more gracefully 2021-11-14 23:13:45 +01:00
Joe Rogers 1d729b2b0f
Use codec to determine image format 2021-11-12 16:30:30 +01:00
Joe Rogers f73a7a6ed8
Use ImageFormat instead of string for extension 2021-11-12 16:22:11 +01:00
Joe Rogers de9bf327c6
Merge similar tests with Theories 2021-11-12 13:44:48 +01:00
Cody Robibero 64652b6392 Fix and disable new dotnet6 warnings 2021-11-08 12:40:52 -07:00
Bond_009 f5ca9cbc3b Enable nullable for MediaBrowser.Providers 2021-10-26 15:49:01 +02:00
Claus Vium 768ec60e11
Merge pull request #6689 from 1337joe/expand-image-extraction 2021-10-21 23:05:32 +02:00
Joe Rogers 31baea072a
Address review comments 
Clean up style
Fix references in class summaries
Combine Where+FirstOrDefault queries
Break up large method, long lines
Add validation on file extension
Apply test naming conventions
Extract mock of Movie class, comment on why not mocking interface

Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
 2021-10-20 14:10:16 +02:00
MBR-0001 ade3afad41 Add IsAutomated to SubtitleSearchRequest 2021-10-19 21:06:05 +02:00
Joe Rogers e3eee10d05
Add image provider tests and clean up 2021-10-11 14:09:02 +02:00
Joe Rogers 8d70cc2dde
Add support for non-jpg image extractions 2021-10-11 14:09:02 +02:00
Joe Rogers 6ce8cce12c
Add handling for embedded background and logo 2021-10-11 14:09:01 +02:00
Joe Rogers be9ed29f63
Split EmbeddedImage extracting to new provider 2021-10-11 14:09:01 +02:00
Fernando Fernández 3d0b1ccae6
Remove all unused usings 2021-09-06 21:15:30 +02:00
Bond_009 6f405dc36d Clean up VideoImageProvider 2021-09-01 18:47:24 +02:00
boolemancer 2345646ff1 Fix explicit stream selection in MediaEncoder.ExtractImageInternal 2021-08-14 02:55:51 -07:00
Rich Lander 927b003143 Fix remaining MediaBrowser.Providers warnings 2021-07-22 20:16:38 -07:00
BaronGreenback 6648b7d7da
Merge branch 'master' into comparisons 2021-06-19 15:04:30 +01:00