Commit graph

2176 commits

Author SHA1 Message Date
Bond-009 2b1a915ead Merge pull request #7604 from Jellifi007/fixes-diactritics
Co-authored-by: Cody Robibero <cody@robibe.ro>
(cherry picked from commit 8d1d973438)
Signed-off-by: crobibero <cody@robibe.ro>
2022-05-20 18:30:56 -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
dependabot[bot] d90983c311
Bump PlaylistsNET from 1.1.3 to 1.2.1 (#7728)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-09 15:24:39 +02:00
dependabot[bot] 812841d01e
Bump StyleCop.Analyzers from 1.2.0-beta.406 to 1.2.0-beta.435 (#7726)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-09 15:24:09 +02:00
Cody Robibero 97bf6c7364 Merge pull request #7521 from 1337joe/image-mime-fallback
Add fallback for image downloads with bad reported MediaType

(cherry picked from commit bf1ccf7493)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
2022-04-17 15:45:10 -04:00
Cody Robibero 0d0a5c2edf Merge pull request #7551 from cvium/fix_trailertype
fix: remove (incorrect) negation of bool expression
(cherry picked from commit fec2cf5060)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-07 12:54:58 -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 cec9befbed Merge pull request #7507 from crobibero/studio-image-plugin
Fix StudioImageProvider

(cherry picked from commit 5de2db9f52)
Signed-off-by: crobibero <cody@robibe.ro>
2022-04-07 12:54:57 -04:00
Joe Rogers b03f56c3d6
Remove warnings 2022-04-03 23:36:32 +02:00
Joe Rogers 6e4710d048
Fix review comment
Co-authored-by: Cody Robibero <cody@robibe.ro>
2022-04-03 23:36:32 +02:00
Joe Rogers ac675318f8
Simplify RefreshSingleItem 2022-04-03 23:36:32 +02:00
Joe Rogers bdce435b09
Reorder and flatten provider filtering 2022-04-03 23:36:30 +02:00
Joe Rogers a7c009e2eb
Pass TypeOptions instead of full LibraryOptions 2022-04-03 23:34:49 +02:00
Joe Rogers e7df72de49
Improve metadata provider sorting
Extract configured order up front instead of for each provider
Non-IHasOrder providers default to middle, not beginning
Merge image and metadata sort helper methods
2022-04-03 23:34:49 +02:00
Joe Rogers 11c7c24f0e
Clarify naming, minor method ordering improvement 2022-04-03 23:34:49 +02:00
Joe Rogers 6221991c63
Add nullable annotations 2022-04-03 23:34:48 +02:00
Joe Rogers 8515e8fbd1
Improve image provider sorting
Remove irrelevant check for ILocalImageProvider
Providers that are not IHasOrder default to middle, not beginning
2022-04-03 23:34:48 +02:00
Joe Rogers 4ace7f5c53
Fix unused var, log typo 2022-04-03 23:34:47 +02:00
Joe Rogers 2e2a594e19
Move Get*Providers definitions to interface 2022-04-03 23:34:47 +02: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
dependabot[bot] dde984bd0e
Bump StyleCop.Analyzers from 1.2.0-beta.376 to 1.2.0-beta.406
Bumps [StyleCop.Analyzers](https://github.com/DotNetAnalyzers/StyleCopAnalyzers) from 1.2.0-beta.376 to 1.2.0-beta.406.
- [Release notes](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/releases)
- [Commits](https://github.com/DotNetAnalyzers/StyleCopAnalyzers/compare/1.2.0-beta.376...1.2.0-beta.406)

---
updated-dependencies:
- dependency-name: StyleCop.Analyzers
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-21 12:22:11 +00:00
Cody Robibero 0e2b20e6d6 tmdb - update available series end status 2022-03-18 18:49:12 -06:00
Joshua M. Boniface 6e80c9b25f
Merge pull request #6528 from oledfish/additional-episode-orders 2022-03-11 14:35:29 -05:00
Claus Vium 53209830e7
Merge pull request #7346 from Bond-009/guid
Optimize Guid comparisons
2022-03-11 08:15:12 +01: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
Bill Thornton c5ca29d2e2
Remove unused poster support from StudiosImageProvider (#7423) 2022-03-08 16:36:05 +01:00
Cody Robibero 4791d56f6c
Merge pull request #7403 from 1337joe/fix-external-file-prefix-check 2022-03-05 12:43:29 -07:00
Joshua M. Boniface e3d9c53baa
Merge pull request #7396 from thornbill/update-artwork-repository 2022-03-05 14:30:21 -05: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
Bill Thornton 46ef68d589 Update artwork repository urls 2022-03-04 01:39:21 -05: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
Bond_009 f50a250cd9 Optimize Guid comparisons
* Use Guid.Equals(Guid) instead of the == override
* Ban the usage of Guid.Equals(Object) to prevent accidental boxing
* Compare to default(Guid) instead of Guid.Empty
2022-02-21 14:15:09 +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
Cody Robibero b6489e73ab
Merge pull request #7241 from Bond-009/async5 2022-02-06 15:25:48 -07:00
Claus Vium 488ce51032
Remove some allocations (#7246) 2022-01-28 12:21:40 +01:00
Matthew Jones 91d143d6ee Changed boolean options to enums 2022-01-26 16:09:05 +00:00
Cody Robibero ea3d79c0eb
Merge pull request #7235 from Bond-009/async4 2022-01-22 15:52:12 -07:00
Bond_009 e7be01d7a5 Flush to disk async where possible 2022-01-22 23:36:42 +01:00
Joe Rogers fbd243e315
Make ffprobe consistent with MetadataService.MergeData 2022-01-22 21:59:17 +01:00
Bond_009 2dcb2f8a9f Ban the usage of Task.Result
If the calling function can't be made async easily you can still use
.GetAwaiter().GetResult(), which is way easier to find in the future
2022-01-22 16:48:31 +01:00
Cody Robibero a4246648f4
Merge pull request #7219 from 1337joe/tmdb-image-provider-logo 2022-01-20 08:54:07 -07:00
Joe Rogers 375903b215
Bump TMDbLib version 2022-01-20 11:43:26 +01:00
Bond-009 3aeae150f8
Merge pull request #7176 from dmitrylyzo/fix-trailers-1 2022-01-19 22:47:08 +01:00
Joe Rogers 239b516659
Add TMDb logo handling 2022-01-19 09:54:52 +01:00
oledfish 47269d5ec6 Add all TMDB episode orders 2022-01-18 01:02:45 -03:00
oledfish 3b075a5802
Merge branch 'jellyfin:master' into additional-episode-orders 2022-01-16 21:33:18 -03:00
Bond-009 ef0708d876
Merge pull request #7078 from 1337joe/metadata-merge-data 2022-01-16 23:17:40 +01:00
Joe Rogers f87e780fb5
Address review comments
Co-authored-by: Bond-009 <bond.009@outlook.com>
2022-01-16 13:21:24 +01:00
Dmitry Lyzo 112db30ff2 Fix duplication of remote trailers 2022-01-14 22:53:54 +03: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
SenorSmartyPants c32db3ea26 Fix build error 2022-01-13 22:51:38 -06:00
SenorSmartyPants a19b6a7f61 Config option to import season name from TMDB 2022-01-13 22:31:37 -06:00
Joe Rogers b43f46d5c9
Make identify flag describe purpose, not source 2022-01-08 14:03:59 +01:00
Cody Robibero 9b1965b48a
Merge pull request #7101 from Bond-009/imagejpg
Remove incorrect mime type image/jpg
2022-01-08 04:45:58 -07:00
Joe Rogers 3eb4bbbb86
Respect lock state when updating season 0 name 2022-01-04 16:58:14 +01:00
Joe Rogers b17fe35e2e
Clean up list handling
Co-authored-by: Cody Robibero <cody@robibe.ro>
2022-01-04 16:25:36 +01:00
Bond_009 dc222b75c5 Remove incorrect mime type image/jpg 2022-01-04 10:40:16 +01:00
Joe Rogers 1dfbeae045
Embed ProviderUtils into MetadataService 2022-01-04 00:44:03 +01:00
Joe Rogers 19164378f2
Clean up warnings 2022-01-04 00:21:45 +01:00
Joe Rogers c81d2e9dec
Remove existing images when applying identify 2022-01-03 23:41:13 +01:00
Joe Rogers ce66df2c92
Clean up warnings, simplify 2022-01-03 22:59:58 +01:00
Joe Rogers 853ef727da
Add refresh flag to remove existing data/images
Fixes #7040
2022-01-02 22:21:05 +01:00
Joe Rogers 76e640b0b9
Add tests and documentation for ProviderUtils 2021-12-31 00:10:35 +01:00
Joe Rogers e3a7c9238d
Pull default MergeData implementation to parent 2021-12-28 15:12:09 +01:00
Cody Robibero 7bfc6b5679 Remove more warnings 2021-12-27 07:38:06 -07:00
Bond_009 cbfa355e31 Update StyleCop 2021-12-24 18:28:27 +01:00
Bond_009 ec2645c0c0 Fix build 2021-12-24 16:35:57 +01:00
Cody Robibero 634ce40c2f
Merge branch 'master' into comparisons 2021-12-24 02:41:50 +00:00
Cody Robibero 932c2c6665 Fix config.html 2021-12-23 19:40:24 -07:00
Cody Robibero a04ab6b876 Merge branch 'master' into studios-images-plugin
# Conflicts:
#	MediaBrowser.Providers/MediaBrowser.Providers.csproj
2021-12-23 19:38:10 -07:00
Cody Robibero 076a13abeb
Merge pull request #7029 from cvium/allocations_maybe 2021-12-24 01:59:25 +00:00
cvium c86b064f80 Catch HttpRequestException when saving images from local provider 2021-12-21 12:29:09 +01:00
cvium b880dc8a4a Use our own Contains extension 2021-12-20 13:31:07 +01: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
Cody Robibero 9cea773d29
Merge pull request #6874 from 1337joe/tmdb-image-size-options 2021-12-03 07:03:02 -07: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 e778462955
Use SSL for tmdb images 2021-11-30 14:31:32 +01:00
Bond-009 2a09d4244c
Merge pull request #6923 from cvium/query_a_bit_less 2021-11-29 13:00:38 +01:00
cvium beef6f0855 Don't query series twice 2021-11-28 19:56:31 +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 0af5e60094
Address review comments
Store null instead of calculating scaled image sizes.
Add endpoint to provide TMDb image size options.
2021-11-22 21:08:07 +01:00
Cody Robibero b2b4bd82d7
Merge pull request #6862 from 1337joe/query-instead-of-filtering 2021-11-20 08:50:39 -07:00
cvium 71a0abe211 Remove unnecessary N/A checks (converter changes them to null) 2021-11-20 08:32:07 +01:00
cvium d8c3b8e7f8 Don't use AppendFormat 2021-11-20 08:24:52 +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 6d3b129666
Add image scaling options for tmdb 2021-11-19 22:21:21 +01:00
cvium 96ea865681 Refactor omdb providers 2021-11-19 15:32:07 +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
Cody Robibero fa366f0099
Merge pull request #6860 from cvium/fix_xml_endless_loops 2021-11-17 08:39:49 -07:00
cvium 61b75c82ce Read past empty elements 2021-11-17 14:49:30 +01:00
cvium 24024706bf Fix release build 2021-11-16 12:55:35 +01:00
cvium 93fd1c7075 Fix 2021-11-16 12:27:27 +01:00
cvium b50c3852ef Remove unused dependencies 2021-11-16 12:24:17 +01:00
Cody Robibero 4cfe8fe588
Merge pull request #6831 from 1337joe/image-provider-cleanup 2021-11-15 15:45:33 -07: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
Cody Robibero 14c072dd32 Fix filtering images without dimensions 2021-11-12 07:21:46 -07:00
Joe Rogers de9bf327c6
Merge similar tests with Theories 2021-11-12 13:44:48 +01:00
Bond_009 5726535a26 Fix some warnings
609 left
2021-11-09 13:14:31 +01:00
Cody Robibero 64652b6392 Fix and disable new dotnet6 warnings 2021-11-08 12:40:52 -07:00
Cody Robibero 40045d2147 Update to full dotnet 6 2021-11-08 09:40:12 -07:00