konfluks/feed.py

@@ -156,8 +156,7 @@ def parse_enclosures(post_dir, entry):
             print("found enclosed media", e.type)
             if "image/" in e.type:
                 featured_image = grab_media(post_dir, e.href)
-                media_item = urlparse(e.href).path.split('/')[-1]
-                entry["featured_image"] = media_item
+                entry["featured_image"] = featured_image
             else:
                 print("FIXME:ignoring enclosed", e.type)
     return entry
@@ -374,16 +373,16 @@ def main():
 
         data = grab_feed(feed_url)
 
-        if data: #whenever we get a 200
-            if data.feed: #only if it is an actual feed
+        if data:
+
             opds_feed = False
-                if 'links' in data.feed:
             for i in data.feed['links']:
                 if i['rel'] == 'self':
                     if 'opds' in i['type']:
                         opds_feed = True
                         print("OPDS type feed!")
 
+
             for entry in data.entries:
                 # if 'tags' in entry:
                 #     for tag in entry.tags:
@@ -426,14 +425,10 @@ def main():
                         post_name
                     )  # create list of posts which have not been returned by the feed
 
-
             for post in existing_posts:
                 # remove blog posts no longer returned by the RSS feed
-                    post_dir = os.path.join(output_dir, feed_name, post)
-                    shutil.rmtree(post_dir)
-                    print("deleted", post_dir)
-            else:
-                print(feed_url, "is not or no longer a feed!")
+                print("deleted", post)
+                shutil.rmtree(os.path.join(feed_dir, slugify(post)))
 
     end = time.time()