Merge pull request #10751 from pymedusa/release/release-1.0.3

Release/release 1.0.3

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.3 (10-06-2022)
+
+#### Improvements
+- Change log to debug when metadata image can't be retrieved
+- Update MediaInfo for Windows and MacOSX
+- Update Docker image to Python version 3.10
+
+#### Fixes
+- Fix NullReferenceError on testRename page when postprocessing method is symlink
+- Fix a specific guessit test
+
 ## 1.0.2 (31-05-2022)
 
 #### Fixes

Dockerfile

@@ -1,4 +1,25 @@
-FROM python:3.7-alpine3.9
+# Need this image for the /bin/start-build script.
+# Build unrar.  It has been moved to non-free since Alpine 3.15.
+# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.15.0#unrar_moved_to_non-free
+FROM jlesage/alpine-abuild:3.15 AS unrar
+WORKDIR /tmp
+RUN \
+    mkdir /tmp/aport && \
+    cd /tmp/aport && \
+    git init && \
+    git remote add origin https://github.com/alpinelinux/aports && \
+    git config core.sparsecheckout true && \
+    echo "non-free/unrar/*" >> .git/info/sparse-checkout && \
+    git pull origin 3.15-stable && \
+    PKG_SRC_DIR=/tmp/aport/non-free/unrar && \
+    PKG_DST_DIR=/tmp/unrar-pkg && \
+    mkdir "$PKG_DST_DIR" && \
+    /bin/start-build -r && \
+    rm /tmp/unrar-pkg/*-doc-* && \
+    mkdir /tmp/unrar-install && \
+    tar xf /tmp/unrar-pkg/unrar-*.apk -C /tmp/unrar-install
+
+FROM python:3.10.4-alpine3.15
 LABEL maintainer="pymedusa"
 
 ARG GIT_BRANCH
@@ -18,7 +39,7 @@ RUN \
 	apk add --no-cache \
 		mediainfo \
 		tzdata \
-		unrar \
+		p7zip \
 	&& \
 	# Cleanup
 	rm -rf \
@@ -27,6 +48,9 @@ RUN \
 # Install app
 COPY . /app/medusa/
 
+# Copy unrar bin
+COPY --from=unrar /tmp/unrar-install/usr/bin/unrar /usr/bin/
+
 # Ports and Volumes
 EXPOSE 8081
 VOLUME /config /downloads /tv /anime

medusa/common.py

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

medusa/helper/metadata.py

@@ -32,7 +32,7 @@ def get_image(url, img_no=None):
     # TODO: SESSION: Check if this needs exception handling.
     image_data = meta_session.get(temp_url)
     if not image_data:
-        log.warning(u'There was an error trying to retrieve the image, aborting')
+        log.debug(u'There was an error trying to retrieve the image, aborting')
         return
 
     return image_data.content

medusa/server/api/v2/guessit.py

@@ -36,6 +36,7 @@ def get(self):
 
         result = {'error': None}
         show = None
+        parse_result = None
 
         try:
             parse_result = NameParser().parse(release)

medusa/subtitle_providers/addic7ed.py

@@ -287,7 +287,7 @@ def list_subtitles(self, video, languages):
             if subtitles:
                 return subtitles
         else:
-            logger.error('No show id found for %r (%r)', video.series, {'year': video.year})
+            logger.info('No show id found for %r (%r)', video.series, {'year': video.year})
 
         return []
 

runscripts/init.docker

@@ -2,21 +2,40 @@
 
 PUID=${PUID:-0}
 PGID=${PGID:-0}
+DEFAULT_GROUP="abc"
+DEFAULT_USER="abc"
 
 if [[ $PUID != "0" ]] && [[ $PGID != "0" ]]
 then
-  addgroup -g "$PGID" abc
-  adduser -u "$PUID" --ingroup abc --disabled-password abc
+  EXISTING_GROUP=$(getent group $PGID | awk -F ":" '{ print $1 }')
+  if [[ -z $EXISTING_GROUP ]]
+  then
+    echo "Group does not exist, adding $DEFAULT_GROUP"
+    addgroup -g "$PGID" $DEFAULT_GROUP
+  else
+    echo "Group already exists, re-using group $EXISTING_GROUP"
+    DEFAULT_GROUP=$EXISTING_GROUP
+  fi
+
+  EXISTING_USER=$(getent passwd $PUID | awk -F ":" '{ print $1 }')
+  if [[ -z $EXISTING_USER ]]
+  then
+    echo "User does not exist, adding $EXISTING_USER"
+    adduser -u "$PUID" --ingroup $DEFAULT_GROUP --disabled-password $DEFAULT_USER
+  else
+    echo "User already exists, re-using user $EXISTING_USER"
+    DEFAULT_USER=$EXISTING_USER
+  fi
 
   echo "
-  User uid:    $(id -u abc)
-  User gid:    $(id -g abc)
+  User uid:    $(id -u $DEFAULT_USER)
+  User gid:    $(id -g $DEFAULT_USER)
   -------------------------------------
   "
-  chown -R abc:abc /app
-  chown -R abc:abc /config
+  chown -R $DEFAULT_USER:$DEFAULT_GROUP /app
+  chown -R $DEFAULT_USER:$DEFAULT_GROUP /config
 
-  exec su abc -s /bin/sh -c "python start.py --nolaunch --datadir /config"
+  exec su $DEFAULT_USER -s /bin/sh -c "python start.py --nolaunch --datadir /config"
 else
   echo "Starting medusa as root"
   python start.py --nolaunch --datadir /config

themes-default/slim/src/components/test-rename.vue

@@ -97,7 +97,7 @@ export default {
     computed: {
         ...mapState({
             postprocessing: state => state.config.postprocessing,
-            seedLocation: state => state.clients.torrents.seedLocation,
+            seedLocation: state => state.config.clients.torrents.seedLocation,
             layout: state => state.config.layout,
             client: state => state.auth.client
         }),