Skip to content
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

Remove forcing the scene option, when a show has scene numbering avai… #8316

Merged
merged 5 commits into from
Aug 15, 2020
Merged

Remove forcing the scene option, when a show has scene numbering avai… #8316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98f5354
Remove forcing the scene option, when a show has scene numbering avai…
p0psicles Aug 14, 2020
9b1cd65
Update changelog
p0psicles Aug 14, 2020
998ccf1
Update CHANGELOG.md
p0psicles Aug 14, 2020
ee7188f
Merge remote-tracking branch 'remotes/origin/develop' into feature/re…
p0psicles Aug 15, 2020
ca7efb9
Merge branch 'feature/remove-auto-scene' of https://github.com/pymedu…
p0psicles Aug 15, 2020
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- Add the save path option for qBittorrent version > 3.2 ([8304](https://github.com/pymedusa/Medusa/pull/8304))
- show-header: mark indexer used for adding show with star ([8286](https://github.com/pymedusa/Medusa/pull/8286))
- Utilize season search results from cache ([8281](https://github.com/pymedusa/Medusa/pull/8281))
- Improve season scene name handling for non-anime shows ([8155](https://github.com/pymedusa/Medusa/pull/8281))
- Improve season scene name handling for non-anime shows ([8155](https://github.com/pymedusa/Medusa/pull/8155))

#### Fixes
- Disable forcing of the scene option when adding shows ([8316](https://github.com/pymedusa/Medusa/pull/8316))
Expand Down
21 changes: 11 additions & 10 deletions medusa/show_queue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,14 +521,6 @@ def run(self):
if self.whitelist:
self.show.release_groups.set_white_keywords(self.whitelist)

# # be smartish about this
# if self.show.genre and "talk show" in self.show.genre.lower():
# self.show.air_by_date = 1
# if self.show.genre and "documentary" in self.show.genre.lower():
# self.show.air_by_date = 0
# if self.show.classification and "sports" in self.show.classification.lower():
# self.show.sports = 1

except IndexerException as error:
log.error(
'Unable to add show due to an error with {indexer}: {error}',
Expand Down Expand Up @@ -640,9 +632,18 @@ def run(self):
scene_numbering.xem_refresh(self.show, force=True)

# check if show has XEM mapping so we can determine if searches
# should go by scene numbering or indexer numbering.
# should go by scene numbering or indexer numbering. Warn the user.
if not self.scene and scene_numbering.get_xem_numbering_for_show(self.show):
self.show.scene = 1
log.warning(
'{id}: while adding the show {title} we noticed thexem.de has an episode mapping available'
'\nyou might want to consider enabling the scene option for this show.',
{'id': self.show.series_id, 'title': self.show.name}
)
ui.notifications.message(
'consider enabling scene for this show',
'for show {title} you might want to consider enabling the scene option'
.format(title=self.show.name)
)

# After initial add, set to default_status_after.
self.show.default_ep_status = self.default_status_after
Expand Down