Merge pull request #10897 from pymedusa/release/release-1.0.7

Release/release 1.0.7
pymedusa · Aug 26, 2022 · d7b29dc · d7b29dc
2 parents 400903a + 523b049
commit d7b29dc
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 1.0.7 (25-08-2022)
+
+#### Improvements
+- Add ffmpeg to docker build for postprocessing
+
+#### Fixes
+- Add encoding when working with plexmatch file
+- Fix anidb cache key causing exceptions
+- Various smaller fixes
+
+-----
+
 ## 1.0.6 (25-07-2022)
 
 #### Improvements

diff --git a/Dockerfile b/Dockerfile
@@ -40,6 +40,7 @@ RUN \
 		mediainfo \
 		tzdata \
 		p7zip \
+		ffmpeg \
 	&& \
 	# Cleanup
 	rm -rf \

diff --git a/medusa/common.py b/medusa/common.py
@@ -39,7 +39,7 @@
 log.logger.addHandler(logging.NullHandler())
 
 INSTANCE_ID = text_type(uuid.uuid1())
-VERSION = '1.0.6'
+VERSION = '1.0.7'
 
 USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
     version=VERSION, system=platform.system(), release=platform.release(),

diff --git a/medusa/generic_update_queue.py b/medusa/generic_update_queue.py
@@ -137,7 +137,7 @@ def __init__(self, update_action):
         self.success = False
 
     def _purge_after_days(self):
-        log.info('Purge shows that have been added more then {days} ago', {'days': app.CACHE_RECOMMENDED_PURGE_AFTER_DAYS})
+        log.info('Purge shows that have been added more than {days} days ago', {'days': app.CACHE_RECOMMENDED_PURGE_AFTER_DAYS})
         if not app.CACHE_RECOMMENDED_PURGE_AFTER_DAYS:
             return
 

diff --git a/medusa/helpers/anidb.py b/medusa/helpers/anidb.py
@@ -62,7 +62,7 @@ def get_release_groups_for_anime(series_name):
     return groups
 
 
-@anidb_cache.cache_on_arguments()
+@anidb_cache.cache_on_arguments(namespace='anidb', function_key_generator=create_key)
 def get_short_group_name(release_group):
     short_group_list = []
 

diff --git a/medusa/logger/__init__.py b/medusa/logger/__init__.py
@@ -264,9 +264,9 @@ def reverse_readlines(file_path, skip_empty=True, append_newline=False,
         mask = slice(-1, 0, -1)
         for line in lines[mask]:
             if line or not skip_empty:
-                yield line.decode(encoding) + (newline if append_newline else empty)
+                yield line.decode(encoding, 'replace') + (newline if append_newline else empty)
     if remainder or not skip_empty:
-        yield remainder.decode(encoding) + (newline if append_newline else empty)
+        yield remainder.decode(encoding, 'replace') + (newline if append_newline else empty)
 
 
 def filter_logline(logline, min_level=None, thread_name=None, search_query=None):
@@ -562,7 +562,7 @@ def filter(self, record):
             record.levelname = logging.getLevelName(record.levelno)
 
         # add exception traceback for errors
-        if record.levelno == ERROR and record.exc_info is not False:
+        if record.levelno in (WARNING, ERROR) and record.exc_info is not False:
             exc_info = sys.exc_info()
             record.exc_info = exc_info if exc_info != (None, None, None) else None
 

diff --git a/medusa/metadata/plex.py b/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) as f:
+        with open(plexmatch_file_path, 'r', encoding='utf-8') 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') as outfile:
+            with open(plexmatch_file_path, 'w', encoding='utf-8') as outfile:
                 outfile.write('\n'.join(data))
 
             helpers.chmod_as_parent(plexmatch_file_path)

diff --git a/themes-default/slim/yarn.lock b/themes-default/slim/yarn.lock
@@ -3096,15 +3096,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001208, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001271:
-  version "1.0.30001272"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001272.tgz"
-  integrity sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw==
-
-caniuse-lite@^1.0.30001280:
-  version "1.0.30001286"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz#3e9debad420419618cfdf52dc9b6572b28a8fff6"
-  integrity sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001208, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001271, caniuse-lite@^1.0.30001280:
+  version "1.0.30001370"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001370.tgz"
+  integrity sha512-3PDmaP56wz/qz7G508xzjx8C+MC2qEm4SYhSEzC9IBROo+dGXFWRuaXkWti0A9tuI00g+toiriVqxtWMgl350g==
 
 capture-exit@^2.0.0:
   version "2.0.0"