From 98f53545d173920260530151fb43f91b5ec21ef3 Mon Sep 17 00:00:00 2001 From: P0psicles Date: Fri, 14 Aug 2020 07:24:13 +0200 Subject: [PATCH 1/3] Remove forcing the scene option, when a show has scene numbering available on thexem. * Replaced with a ui notification, to just make the user aware, when adding the show. --- medusa/show_queue.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/medusa/show_queue.py b/medusa/show_queue.py index 085ec83608..5d8c043833 100644 --- a/medusa/show_queue.py +++ b/medusa/show_queue.py @@ -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}', @@ -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 From 9b1cd655e21467c9b3c388b5da1caf91b7ce74dc Mon Sep 17 00:00:00 2001 From: P0psicles Date: Fri, 14 Aug 2020 07:42:35 +0200 Subject: [PATCH 2/3] Update changelog Also update for previous PR's --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2bba3acd8..c653eac561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,14 @@ #### Improvements - Vueified Home page (Poster, small poster, banner, simple layouts) ([5345](https://github.com/pymedusa/Medusa/pull/5345)) - Vueified Snatch Selection page ([7345](https://github.com/pymedusa/Medusa/pull/7345)) +- 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)) #### Fixes +- Disable forcing of the scene option when adding shows ([8316](https://github.com/pymedusa/Medusa/pull/8316)) +- Fix associated files matching more files than wanted ([8152](https://github.com/pymedusa/Medusa/pull/8152)) ----- From 998ccf1ac524df95563785c2686cf995a2279ec0 Mon Sep 17 00:00:00 2001 From: p0ps Date: Fri, 14 Aug 2020 07:44:41 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c653eac561..9c9d661b39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,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))