michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
25,938 Commits 2 Branches 79 Tags 73 MiB
0d984b5162
Commit Graph

498 Commits

Author SHA1 Message Date
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
aled
299e49f39d Fix a small number of compile warnings 2020-06-09 23:12:53 +01:00
aled
22a860a806 Fix a small number of compile warnings 2020-06-06 20:17:49 +01:00
crobibero
44957c5a9a Use typed logger where possible 2020-06-05 18:15:56 -06:00
Bond_009
6b7517e506 Fix indentation 2020-04-11 15:37:24 +02:00
Bond_009
d8a7462205 DvdLib: remove dependency on MediaBrowser.Model 2020-04-11 12:33:23 +02:00
Bond_009
3ab50f5a3f Address comments 2020-04-01 19:05:41 +02:00
Bond_009
787049f35f Merge branch 'master' into minor 2020-04-01 18:53:22 +02:00
ferferga
a9759f6a80 Rename translation keys 2020-03-29 23:46:19 +02:00
ferferga
a2a53ec879 Same with SubtitleScheduledTasks 2020-03-26 22:49:54 +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
Bond_009
a07ee65365 Minor improvements 2020-02-23 10:53:51 +01:00
Bond_009
87d2479b78 Fix warnings 2020-01-31 22:26:53 +01:00
Bond_009
8a0ef41036 Minor improvements 2020-01-08 01:24:12 +09:00
dkanada
aca31457c0 merge branch master into media-attachments 2020-01-08 01:21:09 +09: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
Andrew Mahone
03ecf57548 Store MediaAttachments in DB. 2019-10-22 10:32:40 -04:00
Bond_009
1616f24cee Fix more warnings 2019-09-01 18:39:23 +02:00
Bond-009
6032f31aa6 Use CultureInvariant string conversion for Guids 2019-08-09 23:17:54 +02:00
Bond_009
37ea50a572 Reduce the amount of exceptions thrown 2019-03-07 21:42:56 +01:00
Joshua M. Boniface
56dcc45dc0
Merge pull request #732 from Bond-009/locale 
Reworked LocalizationManager to load data async
 2019-02-03 22:08:20 -05:00
dkanada
9faa68b26f update subtitle task to match the other scheduled tasks 2019-02-03 19:40:55 +09:00
Bond-009
2a1f6361a5
Merge branch 'master' into locale 2019-01-31 18:44:36 +01:00
Bond-009
1ea219bf3f
Merge branch 'master' into culture 2019-01-30 16:57:15 +01:00
Erwin de Haan
450f246f95 Unwrapped GetFileNameWithoutExtension 2019-01-28 22:10:51 +01:00
Erwin de Haan
581a7fe078 Unwrapped MoveDirectory, DirectoryExists, FileExists & removed MoveFile 2019-01-28 22:10:00 +01:00
Erwin de Haan
a430568082 Unwrapped OpenRead and CopyFile 2019-01-28 22:09:58 +01:00
Erwin de Haan
d7c6d16250 Unwrapped CreateDirectory and DeleteDirectory 2019-01-28 22:09:56 +01:00
Erwin de Haan
3a831994f6 Unwrapped GetDirectoryName and DirectorySeperatorChar 2019-01-28 22:06:34 +01:00
Bond_009
a709cbdc64 Fix more analyzer warnings 2019-01-27 12:12:44 +01:00
Bond_009
51edd5d067 Reworked LocalizationManager to load data async 2019-01-27 10:36:05 +01:00
Claus Vium
64b6cfa3dc Add Size to TypedBaseItem 2019-01-26 21:59:06 +01:00
Erwin de Haan
38f96af079 Reformat JustAMan review pt2 changes 
Refs #575
 2019-01-17 20:24:39 +01:00
Erwin de Haan
e867446437 ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Erwin de Haan
a36658f6f0 ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
Erwin de Haan
b062577d81 Find+Sed BOM removal *.cs: MediaBrowser.Providers-SocketHttpListener 2019-01-13 21:03:10 +01:00
Erwin de Haan
587bb85b41 Visual Studio Reformat: MediaBrowser.Providers 2019-01-13 20:26:31 +01:00
Erwin de Haan
e2751d42e8 Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Erwin de Haan
ec1f5dc317 Mayor code cleanup 
Add Argument*Exceptions now use proper nameof operators.

Added exception messages to quite a few Argument*Exceptions.

Fixed rethorwing to be proper syntax.

Added a ton of null checkes. (This is only a start, there are about 500 places that need proper null handling)

Added some TODOs to log certain exceptions.

Fix sln again.

Fixed all AssemblyInfo's and added proper copyright (where I could find them)

We live in *current year*.

Fixed the use of braces.

Fixed a ton of properties, and made a fair amount of functions static that should be and can be static.

Made more Methods that should be static static.

You can now use static to find bad functions!

Removed unused variable. And added one more proper XML comment.
 2019-01-10 20:38:53 +01:00
hawken
bd169e4fd4 remove trailing whitespace 2019-01-07 23:27:46 +00:00
Bond_009
ea4c914123 Fix exception logging 2018-12-30 22:44:39 +01:00
Bond_009
0f8b3c6347 Use Microsoft.Extensions.Logging abstraction 2018-12-30 22:44:38 +01:00
stefan
48facb797e Update to 3.5.2 and .net core 2.1 2018-09-12 19:26:21 +02:00
Luke Pulverenti
70b0dd968f Improve support for embedded metadata; support external subtitles with strm files 2017-12-03 17:12:46 -05:00
Luke Pulverenti
5cb7469028 support track selection before playback 2017-11-05 16:51:23 -05:00
Luke Pulverenti
7174ee66d5 allow separate image extractions for each audio book 2017-11-02 12:00:58 -04:00
Luke Pulverenti
0a0303ca64 normalize strm file contents 2017-11-01 15:50:16 -04:00
Luke Pulverenti
ac09136a3d restore GetImageSize method 2017-10-22 17:38:03 -04:00
Luke Pulverenti
0351c968c3 reduce file checks during library scan 2017-10-13 15:22:24 -04:00
Luke Pulverenti
66ad10348f update translations 2017-10-13 01:43:11 -04:00
Luke Pulverenti
cdd79ec7e2 update owned items 2017-09-18 12:52:22 -04:00
Luke Pulverenti
fe10df6935 improve queries from scheduled tasks 2017-09-09 23:18:23 -04:00