Refactor extras and movie multi-part parsing #6956
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cvium
commented
Dec 7, 2021
|
No changes to OpenAPI specification found. See history of this comment for previous changes. |
cvium
force-pushed
the
what_could_go_wrong
branch
from
1c8c0f2
to
fde84a1
Compare
cvium
commented
Dec 7, 2021
| } | ||
|
|
||
| if (includeDirectories) | ||
| var files = directoryService.GetFileSystemEntries(path).OrderBy(i => Array.IndexOf(BaseItem.SupportedImageExtensions, i.Extension ?? string.Empty)); |
There was a problem hiding this comment.
These changes are somewhat unrelated to the extras, but related to the slowness of #6906
1337joe
reviewed
Dec 7, 2021
Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
Outdated
Show resolved
Hide resolved
| SetVideoType(video, videoInfo); | ||
| } | ||
|
|
||
| Set3DFormat(video, videoInfo); |
There was a problem hiding this comment.
Does moving this out of the loop also fix #6609?
crobibero
approved these changes
Dec 9, 2021
IDisposable
reviewed
Dec 9, 2021
IDisposable
reviewed
Dec 9, 2021
IDisposable
reviewed
Dec 10, 2021
| /// <param name="isNumerical">Whether the file stack rule uses numerical or alphabetical numbering.</param> | ||
| public FileStackRule(string token, bool isNumerical) | ||
| { | ||
| _tokenRegex = new Regex(token, RegexOptions.IgnoreCase); |
There was a problem hiding this comment.
Worth doing .Compiled here?
There was a problem hiding this comment.
NamingOptions is a Singleton so it doesn't matter much
cvium
changed the title
crobibero
approved these changes
Dec 11, 2021
Bond-009
requested changes
Dec 13, 2021
There was a problem hiding this comment.
I think your usage of RegexOptions.Compiled is wrong
https://docs.microsoft.com/en-us/dotnet/standard/base-types/regular-expression-options#compiled-regular-expressions
Co-authored-by: Bond-009 <bond.009@outlook.com>
1337joe
reviewed
Dec 14, 2021
Co-authored-by: Joe Rogers <1337joe@users.noreply.github.com>
jellyfin-bot
added
the
merge conflict
jellyfin-bot
removed
the
merge conflict
Bond-009
approved these changes
Dec 15, 2021
1337joe
approved these changes
Dec 15, 2021
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Tried to consolidate the extras parsing instead of having multiple methods doing the same things.
Removed support for extras in flat file structures (they will be outright ignored).
Issues
Fixes #6906