Merge pull request #10956 from pymedusa/release/release-1.0.9

Release/release 1.0.9

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.0.9 (11-10-2022)
+
+#### Improvements
+- Always get current version on startup ([10925](https://github.com/pymedusa/Medusa/pull/10925))
+- Remove copy fallback when hardlink failed ([10952](https://github.com/pymedusa/Medusa/pull/10952))
+- Change log level to info for episodes not in DVD order ([10872](https://github.com/pymedusa/Medusa/pull/10872))
+- Update M-net logo ([10937](https://github.com/pymedusa/Medusa/pull/10937))
+
+#### Fixes
+- Normalize the imdb_id ([10923](https://github.com/pymedusa/Medusa/pull/10923))
+- Replace non-UTF8 chars instead of error for Plexmatch file ([10948](https://github.com/pymedusa/Medusa/pull/10948))
+- Fix Download Handler log filter ([10953](https://github.com/pymedusa/Medusa/pull/10953))
+
+-----
+
 ## 1.0.8 (05-09-2022)
 
 #### Fixes

medusa/__main__.py

@@ -1096,10 +1096,9 @@ def initialize(self, console_logging=True):
             except Exception:
                 pass
 
-            if app.VERSION_NOTIFY:
-                updater = CheckVersion().updater
-                if updater and updater.current_version:
-                    app.APP_VERSION = updater.current_version
+            updater = CheckVersion().updater
+            if updater and updater.current_version:
+                app.APP_VERSION = updater.current_version
 
             # initialize the static NZB and TORRENT providers
             app.providerList = providers.make_provider_list()

medusa/common.py

@@ -39,7 +39,7 @@
 log.logger.addHandler(logging.NullHandler())
 
 INSTANCE_ID = text_type(uuid.uuid1())
-VERSION = '1.0.8'
+VERSION = '1.0.9'
 
 USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
     version=VERSION, system=platform.system(), release=platform.release(),

medusa/helpers/__init__.py

@@ -353,26 +353,14 @@ def hardlink_file(src_file, dest_file):
         link(src_file, dest_file)
         fix_set_group_id(dest_file)
     except OSError as msg:
-        if msg.errno == errno.EEXIST:
-            # File exists. Don't fallback to copy
-            log.warning(
-                u'Failed to create hardlink of {source} at {destination}.'
-                u' Error: {error!r}', {
-                    'source': src_file,
-                    'destination': dest_file,
-                    'error': msg
-                }
-            )
-        else:
-            log.warning(
-                u'Failed to create hardlink of {source} at {destination}.'
-                u' Error: {error!r}. Copying instead', {
-                    'source': src_file,
-                    'destination': dest_file,
-                    'error': msg,
-                }
-            )
-            copy_file(src_file, dest_file)
+        log.warning(
+            u'Failed to create hardlink of {source} at {destination}.'
+            u' Error: {error!r}.', {
+                'source': src_file,
+                'destination': dest_file,
+                'error': msg,
+            }
+        )
 
 
 def symlink(src, dst):

medusa/indexers/tvdbv2/api.py

@@ -340,7 +340,7 @@ def _parse_episodes(self, tvdb_id, episode_data):
                     flag_dvd_numbering = True
 
             if self.config['dvdorder'] and not flag_dvd_numbering:
-                log.warning(
+                log.info(
                     'No DVD order available for episode (season: {0}, episode: {1}). Skipping this episode. '
                     'If you want to have this episode visible, please change it on the TheTvdb site, '
                     'or consider disabling DVD order for the show: {2}({3})',

medusa/indexers/tvmaze/api.py

@@ -466,9 +466,17 @@ def _get_show_data(self, tvmaze_id, language='en'):
         # Get external ids.
         # As the external id's are not part of the shows default response, we need to make an additional call for it.
         # Im checking for the external value. to make sure only externals with a value get in.
-        self._set_show_data(tvmaze_id, 'externals', {external_id: text_type(getattr(self.shows[tvmaze_id], external_id, None))
-                                                     for external_id in ['tvdb_id', 'imdb_id', 'tvrage_id']
-                                                     if getattr(self.shows[tvmaze_id], external_id, None)})
+        externals = {
+            external_id: text_type(getattr(self.shows[tvmaze_id], external_id, None))
+            for external_id in ['tvdb_id', 'imdb_id', 'tvrage_id']
+            if getattr(self.shows[tvmaze_id], external_id, None)
+        }
+
+        # Normalize the imdb_id
+        if 'imdb_id' in externals:
+            externals['imdb_id'] = ImdbIdentifier(externals['imdb_id']).series_id
+
+        self._set_show_data(tvmaze_id, 'externals', externals)
 
         # get episode data
         if self.config['episodes_enabled']:

medusa/metadata/plex.py

@@ -194,7 +194,7 @@ def write_ep_file(self, ep_obj):
         plexmatch_file_path = self.get_show_file_path(ep_obj.series)
         plexmatch_file_dir = os.path.dirname(plexmatch_file_path)
 
-        with open(plexmatch_file_path, 'r', encoding='utf-8') as f:
+        with open(plexmatch_file_path, 'r', encoding='utf-8', errors='replace') as f:
             current_content = f.readlines()
 
         data = self._ep_data(current_content, ep_obj)
@@ -216,7 +216,7 @@ def write_ep_file(self, ep_obj):
             log.debug('Writing episode plexmatch file to {location}',
                       {'location': plexmatch_file_path})
 
-            with open(plexmatch_file_path, 'w', encoding='utf-8') as outfile:
+            with open(plexmatch_file_path, 'w', encoding='utf-8', errors='replace') as outfile:
                 outfile.write('\n'.join(data))
 
             helpers.chmod_as_parent(plexmatch_file_path)

medusa/server/api/v2/log.py

@@ -45,7 +45,7 @@
     'EPISODEUPDATER',
     'THREAD',
     'TORNADO',
-    'downloadHandler',
+    'DOWNLOADHANDLER',
     'TRAKTCHECKER',
 ]
 

medusa/tv/series.py

@@ -1368,6 +1368,8 @@ def _save_externals_to_db(self):
 
         for external in self.externals:
             if external in reverse_mappings and self.externals[external]:
+                if external == 'imdb_id':
+                    self.externals[external] = ImdbIdentifier(self.externals[external]).series_id
                 sql_l.append(['INSERT OR IGNORE '
                               'INTO indexer_mapping (indexer_id, indexer, mindexer_id, mindexer) '
                               'VALUES (?,?,?,?)',

themes-default/slim/src/components/config-post-processing.vue

@@ -45,7 +45,7 @@
                                                            :min="postprocessing.downloadHandler.minFrequency" :step="1"
                                                            v-model.number="postprocessing.downloadHandler.frequency"
                                                            label="Download handler frequency" id="download_handler_frequency">
-                                        <p>Frequency to check on the download clients (default: 60)</p>
+                                        <p>Time in minutes to check on the download clients (min 5, default: 60)</p>
                                     </config-textbox-number>
 
                                     <config-textbox-number

themes-default/slim/test/specs/__snapshots__/config-post-processing.spec.js.snap

@@ -279,7 +279,7 @@ exports[`ConfigPostProcessing.test.js renders 1`] = `
                           />
                             
                           <p>
-                            Frequency to check on the download clients (default: 60)
+                            Time in minutes to check on the download clients (min 5, default: 60)
                           </p>
                         </div>
                       </div>