Improved handling of cover/art filenames, functions now behave the same.

Dropped 'folder.ext' in favor of sha512 hash of url when no filename is available.

Author: E.S. Rosenberg a.k.a. Keeper of the Keys

src/gpodder/coverart.py

@@ -88,27 +88,10 @@ def get_cover(self, podcast, download=False, episode=None):
             try:
                 extension = None
 
-                fname, ext = os.path.splitext(filename)
-
-                # Check if an extension is part of the filename and that it matches the filetype
-                if ext:
-                    ext_unchanged = ext
-                    # Assume last part of filename parts is extension
-                    ext = ext.lower()
-                    # Deal with alternative extensions for supported format,
-                    # should more cases need to be added a mapping dictionary can be created.
-                    if ext == '.jpeg':
-                        ext = '.jpg'
-                    if ext in self.SUPPORTED_EXTENSIONS:
-                        if self.SUPPORTED_EXTENSIONS[ext](data):
-                            filename = fname
-                            extension = ext_unchanged
-                # Filename did not include an extension or the extension did not match the filetype
-                if not extension:
-                    for filetype, check in list(self.SUPPORTED_EXTENSIONS.items()):
-                        if check(data):
-                            extension = filetype
-                            break
+                for filetype, check in list(self.SUPPORTED_EXTENSIONS.items()):
+                    if check(data):
+                        extension = filetype
+                        break
 
                 if not extension:
                     msg = 'Unknown file type: %s (%r)' % (cover_url, data[:6])

src/gpodder/model.py

@@ -151,6 +151,7 @@ class __minidb_defaults__:
         current_position = 0
         current_position_updated = 0
         last_playback = 0
+        episode_art_url = ''
 
     def __init__(self, channel):
         self._parent = channel
@@ -468,12 +469,10 @@ def update_from_dict(self, episode_dict):
     @property
     def art_file(self):
         if self.episode_art_url:
-            filename = self.guid
-            try:
-                url = urlparse(self.episode_art_url)
-                filename = os.path.basename(url.path)
-            except Exception:
-                logger.debug('urlparse failed for episode_art_url: %s', self.episode_art_url)
+            filename, extension = util.filename_from_url(self.episode_art_url)
+
+            if not filename:
+                filename = hashlib.sha512(self.episode_art_url.encode('utf-8')).hexdigest()
 
             return os.path.join(self.podcast.save_dir, filename)
         return None
@@ -569,16 +568,14 @@ def check_download_folder(self):
 
                 known_files.add(filename)
 
-        if self.cover_file != 'folder':
-            known_files.add(os.path.join(self.save_dir, self.cover_file))
-        else:
-            known_files.update(os.path.join(self.save_dir, 'folder' + ext)
-                               for ext in coverart.CoverDownloader.EXTENSIONS)
+        known_files.update(os.path.join(self.cover_file + ext)
+                           for ext in coverart.CoverDownloader.EXTENSIONS)
 
         for episode in self.episodes:
             filename = episode.art_file
             if filename:
-                known_files.add(os.path.join(self.save_dir, filename))
+                known_files.update(os.path.join(episode.art_file + ext)
+                                   for ext in coverart.CoverDownloader.EXTENSIONS)
 
         existing_files = {filename for filename in
                           glob.glob(os.path.join(self.save_dir, '*'))
@@ -949,14 +946,12 @@ def remove_downloaded(self):
 
     @property
     def cover_file(self):
-        filename = 'folder'
-        try:
-            url = urlparse(self.cover_url)
-            filename = os.path.basename(url.path)
-        except:
-            logger.debug('urlparse failed for cover_url: %s', self.cover_url)
-
-        return os.path.join(self.save_dir, filename)
+        if self.cover_url:
+            filename, extension = util.filename_from_url(self.cover_url)
+            if not filename:
+                filename = hashlib.sha512(self.cover_url.encode('utf-8')).hexdigest()
+            return os.path.join(self.save_dir, filename)
+        return None
 
 
 class Model(object):