Skip to content

fix: only treat the documented episode range syntax as a range #893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arabcoders merged 2 commits into from
Sep 21, 2026
Merged

fix: only treat the documented episode range syntax as a range #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8901e3f
fix: only treat the documented episode range syntax as a range
Jellyfrog Sep 18, 2026
de1bfed
refactor: state the episode range grammar once
Jellyfrog Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
287 changes: 102 additions & 185 deletions src/Libs/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,18 +1626,107 @@ function parse_episode_range(string $file): array
return $failed;
}

/**
/*
* Every tail below is all or nothing. It is taken only when it ends on a clean
* boundary, so a tag that starts with digits, such as .1080p, .10bit or -123group,
* drops the whole tail instead of being read as the end of the range.
*
* Plex and jellyfin both document a range as sXXeYY-eZZ, a hyphen with the second
* number carrying an E. A number without an E is only taken after a hyphen, so the
* documented S01E01-02 still reads as a range while a bare number after any other
* separator is treated as a release tag. A number with an E is taken after any
* separator, which keeps S01E01.S01E02 and S01E01_E02 working.
*
* The hyphen rule leaves one case open. A year written straight after a hyphen,
* as in S01E01-2019, still reads as a range. A four digit number cannot be told
* apart from an episode there, and absolute numbering does reach that far, so the
* hyphen is taken at its word. Write S01E01-E2019 to be explicit.
*/
static $patterns = (static function (): array {
$tailWithSeason = '(?:(?:(?:[._-](?:S\d{1,3})?)?E\d{1,4}|-\d{1,4})+(?![\dA-Z]))?';
$tailWithE = '(?:(?:[._-]?E\d{1,4}|-\d{1,4})+(?![\dA-Z]))?';
$tailHyphenOnly = '(?:(?:-\d{1,4})+(?![\dA-Z]))?';

return [
/*
* 1. Standard season/episode notation:
* S01E20, S01E20-E21, S01E20-21, S01E20E21, S01E20-E21-E22, S01E20.S01E21
* The tail must be contiguous. This is what prevents later filename fragments
* from being consumed.
*/
'/
(?<![A-Z0-9])
S(?<season>\d{1,3})
E(?<start>\d{1,4})
(?<tail>' . $tailWithSeason . ')
/ix',

/*
* 2. Textual season/episode notation:
* Season 01 Episode 20, Season 01 Episode 20-21, Season 1 Ep 20-21
*/
'/
(?<![A-Z0-9])
Season[\s._-]*
(?<season>\d{1,3})
[\s._-]+
(?:Episode|Ep)[\s._-]*
(?<start>\d{1,4})
(?<tail>' . $tailWithE . ')
/ix',

/*
* 3. NxM notation:
* 1x20, 1x20-21, 01x020-021
* There is no E form here, because 1x01E02 is not a notation any backend writes.
*/
'/
(?<!\d)
(?<season>\d{1,3})
x
(?<start>\d{1,4})
(?<tail>' . $tailHyphenOnly . ')
(?!\d)
/ix',

/*
* 4. Seasonless explicit episode notation:
* E000, E020, E020-E021, E020-021, E020E021
* A separator or start-of-string must precede E. This avoids matching the
* E inside XXE2020, FOOE40536, WEBRip, and similar filename fragments.
*/
'/
(?:
^
|
[\s._\-[\(]
)
E(?<start>\d{1,4})
(?<tail>' . $tailWithE . ')
/ix',

/*
* 5. Seasonless textual notation:
* Episode 20, Episode 20-21, Episode 20-20, Ep 020-021
*/
'/
(?<![A-Z0-9])
(?:Episode|Ep)[\s._-]*
(?<start>\d{1,4})
(?<tail>' . $tailWithE . ')
/ix',
];
})();

/**
* Convert an episode expression into episode numbers.
*
* The tail was already validated by the pattern that captured it, so every number
* left in it is an episode once a repeated season has been removed.
* Examples:
* 20 => [20]
* 20.S01E21|20-21|20-E21 => [20, 21]
* 20E21E22 => [20, 21, 22]
* 20, '' => [20]
* 20, '.S01E21'|'-21'|'-E21' => [20, 21]
* 20, 'E21E22' => [20, 21, 22]
*
* @return list<int>
*/
Expand All @@ -1648,198 +1737,26 @@ function parse_episode_range(string $file): array
return $episodes;
}

preg_match_all('/ E(?<repeated>\d{1,4}) | [.-] (?:S\d{1,3})? E? (?<delimited>\d{1,4}) /ix', $tail, $matches, PREG_SET_ORDER);

foreach ($matches as $match) {
$value = '';

if (isset($match['repeated']) && '' !== $match['repeated']) {
$value = $match['repeated'];
} elseif (isset($match['delimited']) && '' !== $match['delimited']) {
$value = $match['delimited'];
}
preg_match_all('/\d+/', preg_replace('/S\d{1,3}/i', '', $tail), $matches);

if ('' !== $value) {
$episodes[] = (int) $value;
}
foreach ($matches[0] as $episode) {
$episodes[] = (int) $episode;
}

return array_values(array_unique($episodes));
};

/**
* 1. Standard season/episode notation:
* S01E20, S01E20-E21, S01E20-21, S01E20E21, S01E20-E21-E22, S01E20.S01E21
* The tail must be contiguous. This is what prevents later filename fragments from being consumed.
*/
if (preg_match(
'/
(?<![A-Z0-9])
S(?<season>\d{1,3})
E(?<start>\d{1,4})
(?<tail>
(?:
(?:
E\d{1,4}
|
[.-](?:S\d{1,3})?E?\d{1,4}
)+
(?![\dA-Z])
)?
)
/ix',
$file,
$match,
)) {
$episodes = $parseEpisodes(start: $match['start'], tail: $match['tail'] ?? '');

return [
'status' => true,
'multi' => count($episodes) > 1,
'season' => (int) $match['season'],
'start' => min($episodes),
'end' => max($episodes),
];
}

/**
* 2. Textual season/episode notation:
* Season 01 Episode 20, Season 01 Episode 20-21, Season 1 Ep 20-21
*/
if (preg_match(
'/
(?<![A-Z0-9])
Season[\s._-]*
(?<season>\d{1,3})
[\s._-]+
(?:Episode|Ep)[\s._-]*
(?<start>\d{1,4})
(?<tail>
(?:
(?:
E\d{1,4}
|
[.-](?:E)?\d{1,4}
)+
(?![\dA-Z])
)?
)
/ix',
$file,
$match,
)) {
$episodes = $parseEpisodes(start: $match['start'], tail: $match['tail'] ?? '');

return [
'status' => true,
'multi' => count($episodes) > 1,
'season' => (int) $match['season'],
'start' => min($episodes),
'end' => max($episodes),
];
}

/**
* 3. NxM notation:
* 1x20, 1x20-21, 01x020-021
*/
if (preg_match(
'/
(?<!\d)
(?<season>\d{1,3})
x
(?<start>\d{1,4})
(?<tail>
(?:
(?:
[.-]\d{1,4}
)+
(?![\dA-Z])
)?
)
(?!\d)
/ix',
$file,
$match,
)) {
$episodes = $parseEpisodes(start: $match['start'], tail: $match['tail'] ?? '');

return [
'status' => true,
'multi' => count($episodes) > 1,
'season' => (int) $match['season'],
'start' => min($episodes),
'end' => max($episodes),
];
}

/**
* 4. Seasonless explicit episode notation:
* E000, E020, E020-E021, E020-021, E020E021
* A separator or start-of-string must precede E. This avoids matching the
* E inside XXE2020, FOOE40536, WEBRip, and similar filename fragments.
*/
if (preg_match(
'/
(?:
^
|
[\s._\-[\(]
)
E(?<start>\d{1,4})
(?<tail>
(?:
(?:
E\d{1,4}
|
[.-]E?\d{1,4}
)+
(?![\dA-Z])
)?
)
/ix',
$file,
$match,
)) {
$episodes = $parseEpisodes(start: $match['start'], tail: $match['tail'] ?? '');
return [
'status' => true,
'multi' => count($episodes) > 1,
'season' => 0,
'start' => min($episodes),
'end' => max($episodes),
];
}
foreach ($patterns as $pattern) {
if (1 !== preg_match($pattern, $file, $match)) {
continue;
}

/*
* 5. Seasonless textual notation:
* Episode 20, Episode 20-21, Episode 20-20, Ep 020-021
*/
if (preg_match(
'/
(?<![A-Z0-9])
(?:Episode|Ep)[\s._-]*
(?<start>\d{1,4})
(?<tail>
(?:
(?:
E\d{1,4}
|
[.-]E?\d{1,4}
)+
(?![\dA-Z])
)?
)
/ix',
$file,
$match,
)) {
$episodes = $parseEpisodes(start: $match['start'], tail: $match['tail'] ?? '');
$episodes = $parseEpisodes(start: $match['start'], tail: $match['tail']);

return [
'status' => true,
'multi' => count($episodes) > 1,
'season' => 0,
'season' => (int) ($match['season'] ?? 0),
'start' => min($episodes),
'end' => max($episodes),
];
Expand Down
Loading