Fix episode detection for certain batch formats when "take subdirectory name into account" is enabled#849
Open
Apcty wants to merge 1 commit into
Open
Fix episode detection for certain batch formats when "take subdirectory name into account" is enabled#849Apcty wants to merge 1 commit into
Apcty wants to merge 1 commit into
Conversation
…nabled
When library_full_path is on, _add_show_to_library extracted both series name and episode number from a file's full path, where the directory's episode range could interfere: a library with multiple batch folders ("Series (01-12)[batch]/Series - 07.mkv" and "OtherSeries [batch]/05 - Episode Title.mkv") would require this option, which causes wrong episode detection as the parser picked up the range from the directory name instead of the episode number from the filename.
Fix this by splitting the two concerns: run the parser on the full path to get the show title (benefiting from subdirectory context), but run a second parse on the bare basename to extract the episode number. Only fall back to the full-path parse for the episode number if the basename yields nothing (for a batch like "Series[batch]/07/Episode.mkv".
Note: extracting the basename via os.path.basename is slightly awkward since fullpath is available in add_to_library which calls _add_show_to_library, but this avoids larger changes to the codebase.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #848
When library_full_path is on, _add_show_to_library extracted both series name and episode number from a file's full path, where the directory's episode range could interfere: a library with multiple batch folders ("Series (01-12)[batch]/Series - 07.mkv" and "OtherSeries [batch]/05 - Episode Title.mkv") would require this option, which causes wrong episode detection as the parser picked up the range from the directory name instead of the episode number from the filename.
Fix this by splitting the two concerns: run the parser on the full path to get the show title (benefiting from subdirectory context), but run a second parse on the bare basename to extract the episode number. Only fall back to the full-path parse for the episode number if the basename yields nothing (for a batch like "Series[batch]/07/Episode.mkv".
Note: extracting the basename via os.path.basename is slightly awkward since fullpath is available in add_to_library which calls _add_show_to_library, but this avoids larger changes to the codebase.