Commit graph

449 commits

Author SHA1 Message Date
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
Bond-009 cfad97ff28
Merge pull request #6096 from cvium/saving_private_ram 2021-06-12 00:20:54 +02:00
Stan adf406b182
Fix playback of complex BluRay ISOs (#6166) 2021-06-10 20:07:28 +02:00
cvium 0835b26889 review 2021-05-31 13:55:54 +02:00
Claus Vium 2d5ed7cb95
Apply suggestions from code review
Co-authored-by: Bond-009 <bond.009@outlook.com>
2021-05-28 19:01:08 +02:00
Claus Vium b12f509de3
Merge pull request #5696 from Maxr1998/fix-music-video-metadata-probing 2021-05-27 10:20:22 +02:00
cvium 42a2cc1747 Remove some unnecessary allocations 2021-05-24 00:30:41 +02:00
cvium 81ac11828b Fix ArrayIndexOutOfBounds 2021-05-16 20:16:47 +02:00
cvium 1b49435a0e Reduce some allocations 2021-05-16 14:49:11 +02:00
BaronGreenback e682c230bd
Merge branch 'master' into comparisons 2021-05-05 23:22:54 +01:00
BaronGreenback 2e98de9062
Code Clean up: Convert to null-coalescing operator ?? (#5845)
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2021-05-05 13:51:14 +02:00
BaronGreenback f2c10471bf
Code Clean up: Use Pattern Matching (#5838)
Co-authored-by: Cody Robibero <cody@robibe.ro>
Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
2021-05-05 13:37:36 +02:00
BaronGreenback 107412f2f2
Update FFProbeVideoInfo.cs 2021-04-19 10:23:05 +01:00
BaronGreenback 6b2b484987
Update SubtitleScheduledTask.cs 2021-04-19 10:22:32 +01:00
BaronGreenback 80877aa945 Cleaned up "value assigned is not used in any execution path" 2021-04-17 09:27:58 +01:00
Maxr1998 24ac8a1223
Improve metadata probing to better support music videos 2021-04-06 15:34:29 +02: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
crobibero ca5c20c988 Remove IIsoMounter and IsoMounter 2020-12-03 07:34:15 -07:00
Bond_009 e4fd61411f Minor improvements 2020-12-02 15:38:52 +01:00
Stan 3bb8884e16
Merge branch 'master' into bdiso-playback 2020-10-28 13:18:05 +01:00
Jan-Pieter Baert 6f9beef732
Fix SA1012 and SA1013 warnings 2020-10-12 19:22:33 +02:00
Stanislav Ionascu cd4641dca0 Remove PlayableStreamFileNames as unused
Since ffmpeg can play and transcode ISO files and BDMV folders directly,
there's no use of that property.
2020-10-01 22:20:34 +02:00
Stanislav Ionascu 3ad6232973 Add probe / direct-stream / transcoding support for BluRays
This commit (and ffmpeg built with libbluray support), adds support
for playback of bluray images (bd-iso) and bluray folders.
2020-10-01 21:59:57 +02:00
Bond_009 384ab39f5b Fix some warnings 2020-09-07 13:20:39 +02:00
Bond_009 2b400c99ef Fix warnings 2020-08-19 17:50:50 +02:00
crobibero 1325815182 Remove IHttpClient from Providers 2020-08-17 13:10:02 -06:00
Bond_009 d4092846e4 Optimize Substring and StringBuilder usage 2020-07-29 13:17:01 +02:00
Bond_009 eba488a0f8 Enable TreatWarningsAsErrors in Release for MediaBrowser.Providers 2020-06-19 20:24:13 +02:00
Bond-009 9af6eda0b4
Merge pull request #3343 from telans/comment-stops
Add full stop at end of comments (SA1629)
2020-06-16 11:54:58 +02:00
telans 247f9c61e6
fix SA1513/SA1516 2020-06-16 16:11:30 +12:00
telans 9018f8d8be
Add full stop at end of comments (SA1629) 2020-06-16 10:37:52 +12:00
telans 3d9049ef08
fix SA1508 2020-06-15 10:45:55 +12:00
telans acd4389653
fix SA1005 2020-06-15 10:41:00 +12:00
dkanada 403cd3205f
Merge pull request #3254 from crobibero/ilogger
Use typed logger where possible
2020-06-13 00:29:43 +09:00