Merge pull request #508 from madeofpendletonwool/0.7.8-finished

0.7.8 finished

Author: madeofpendletonwool

.github/workflows/build-android-app.yml

@@ -1,8 +1,8 @@
 name: Build Android Pinepods App
 
 on:
-  release:
-    types: [published]
+  # release:
+  #   types: [published]
   workflow_dispatch:
     inputs:
       version:

.github/workflows/docker-publish.yml

@@ -98,16 +98,24 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_KEY }}
+
       - name: Create and push Docker manifest for the version tag
         run: |
+          sleep 10
+          # Pull the images first to ensure they're available
+          docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.set-env.outputs.IMAGE_TAG }}-amd64
+          docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.set-env.outputs.IMAGE_TAG }}-arm64
+
+          # Create and push manifest
           docker manifest create ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.set-env.outputs.IMAGE_TAG }} \
             --amend ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.set-env.outputs.IMAGE_TAG }}-amd64 \
             --amend ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.set-env.outputs.IMAGE_TAG }}-arm64
+
           docker manifest push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ needs.set-env.outputs.IMAGE_TAG }}
-      - name: Create and push Docker manifest for the latest tag
-        if: needs.set-env.outputs.CREATE_LATEST == 'true'
-        run: |
-          docker manifest create ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
-            --amend ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-amd64 \
-            --amend ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-arm64
-          docker manifest push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            - name: Create and push Docker manifest for the latest tag
+              if: needs.set-env.outputs.CREATE_LATEST == 'true'
+              run: |
+                docker manifest create ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \
+                  --amend ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-amd64 \
+                  --amend ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-arm64
+                docker manifest push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest

.github/workflows/test-ios-app.yml

@@ -1,8 +1,8 @@
 name: Build IOS Pinepods App
 
 on:
-  release:
-    types: [published]
+  # release:
+  #   types: [published]
   workflow_dispatch:
     inputs:
       version:

clients/clientapi.py

@@ -11,6 +11,36 @@ Major Version:
 - [ ] Fix Virtual Line Spacing on Playlist Page
 - [ ] Update /home/collinp/Documents/github/PinePods/web/src-tauri/com.gooseberrydevelopment.pinepods.metainfo.xml file along with flatpak automation. This must be done on each release
 
+0.7.8
+
+- [x] Add youtube feed retention time setting onto settings for each pod
+- [x] Finish custom pod notifications
+- [x] Validate that mysql and postgres upgrade correctly
+- [] Finish validating every call
+- [x] Weirdly different color trash can on podcast page
+- [x] gpodder pod deletions on local
+- [] validate external pod sync platforms again
+- [x] Fixed issue with time created by timestamps
+- [x] Fix up warnings
+- [x] Fixed up issue with saved search, and queue pages not showing saved and queued status correct in context button sometimes
+- [x] Pinepods news feed not adding at all
+- [x] episode count is being doubled
+- [x] Show youtube feed cutoff only on youtube channels - It should also show a notification when updated
+pinepods-1  | Error creating GPodder tables: 1061 (42000): Duplicate key name 'idx_gpodder_devices_userid'
+pinepods-1  | Error setting up platlists: 1061 (42000): Duplicate key name 'idx_playlists_userid'
+- [x] ^ On mariadb startup
+- [] Maybe fix m1 issues
+
+
+- [] If you click shownotes while on the episode page of the episode that's currently playing it will take you to an empty screen
+- [] After deleting podcasts searching for them in the same session still thinks they're Added. Reloading fixes. So, state BS
+- [] Downloading on certain pages is weirdly skippy - It does download fine though. Just status
+- [] Main podcast page needs to return saved, downloaded, and queued status
+- [] Main Podcast page doesn't display saved, queued, downloaded episode status. This is due to the return function not returning those values
+- [] Need to finish long press finger hold on each episode. Thsi should include fixing highlighting issues
+- [] Episode Count for youtube videos doesn't work (doesn't get updated)
+- [] Categories come over pretty broken from gpodder sync
+
 0.7.7
 
 - [] Updated youtube search results page to be similar to new pod results page

completed_todos.md

@@ -141,45 +141,40 @@ def get_podcast_values(feed_url, user_id, username: Optional[str] = None, passwo
 
     # Use requests to fetch the feed content
     try:
+        # Simpler headers that worked in the original version
         headers = {
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3',
             'Accept-Language': 'en-US,en;q=0.9',
-            'Accept-Encoding': 'gzip, deflate, br',
-            'Connection': 'keep-alive',
-            'Upgrade-Insecure-Requests': '1',
-            'Sec-Fetch-Dest': 'document',
-            'Sec-Fetch-Mode': 'navigate',
-            'Sec-Fetch-Site': 'none',
-            'Sec-Fetch-User': '?1'
         }
         print(f"Fetching URL: {feed_url}")
-        print(f"Headers: {headers}")
+
         if username and password:
             print(f"Using auth for user: {username}")
             response = requests.get(feed_url, headers=headers, auth=HTTPBasicAuth(username, password))
         else:
             response = requests.get(feed_url, headers=headers)
 
-        response.raise_for_status()  # Raise an exception for HTTP errors
+        response.raise_for_status()
+        # Use binary content which worked in the original version
         feed_content = response.content
+
     except requests.RequestException as e:
         try:
-            # Only try to access response if it exists
             if 'response' in locals():
                 print(f"Response headers: {response.headers}")
-                print(f"Response content: {response.content}")
+                print(f"Response content: {response.content[:500]}")
         except:
             pass
         raise ValueError(f"Error fetching the feed: {str(e)}")
 
     # Parse the feed
     d = feedparser.parse(feed_content)
+    print(f"Feed parsed - title: {d.feed.get('title', 'Unknown')}")
 
-    # Initialize podcast_values as a dictionary
+    # Initialize podcast_values as in the original version that worked
     podcast_values = {
         'pod_title': d.feed.title if hasattr(d.feed, 'title') else None,
-        'pod_artwork': d.feed.image.href if hasattr(d.feed, 'image') and hasattr(d.feed.image, 'href') else None,
+        'pod_artwork': None,  # We'll set this with multiple checks below
         'pod_author': d.feed.author if hasattr(d.feed, 'author') else None,
         'categories': [],
         'pod_description': d.feed.description if hasattr(d.feed, 'description') else None,
@@ -190,39 +185,76 @@ def get_podcast_values(feed_url, user_id, username: Optional[str] = None, passwo
         'user_id': user_id
     }
 
+    # Enhanced image URL extraction combining both approaches
+    if hasattr(d.feed, 'image'):
+        if hasattr(d.feed.image, 'href'):
+            podcast_values['pod_artwork'] = d.feed.image.href
+        elif hasattr(d.feed.image, 'url'):  # Added for news feed format
+            podcast_values['pod_artwork'] = d.feed.image.url
+        elif isinstance(d.feed.image, dict):
+            if 'href' in d.feed.image:
+                podcast_values['pod_artwork'] = d.feed.image['href']
+            elif 'url' in d.feed.image:
+                podcast_values['pod_artwork'] = d.feed.image['url']
+
+    # iTunes image fallback
     if not podcast_values['pod_artwork'] and hasattr(d.feed, 'itunes_image'):
-        podcast_values['pod_artwork'] = d.feed.itunes_image['href']
+        if hasattr(d.feed.itunes_image, 'href'):
+            podcast_values['pod_artwork'] = d.feed.itunes_image.href
+        elif isinstance(d.feed.itunes_image, dict) and 'href' in d.feed.itunes_image:
+            podcast_values['pod_artwork'] = d.feed.itunes_image['href']
 
+    # Author fallback
     if not podcast_values['pod_author'] and hasattr(d.feed, 'itunes_author'):
         podcast_values['pod_author'] = d.feed.itunes_author
 
-    # Extracting categories, primarily from iTunes
-    if hasattr(d.feed, 'itunes_category'):
-        for cat in d.feed.itunes_category:
-            podcast_values['categories'].append(cat['text'])
-            if 'itunes_category' in cat:
-                for subcat in cat['itunes_category']:
-                    podcast_values['categories'].append(subcat['text'])
+    # Description fallbacks
+    if not podcast_values['pod_description']:
+        if hasattr(d.feed, 'subtitle'):
+            podcast_values['pod_description'] = d.feed.subtitle
+        elif hasattr(d.feed, 'itunes_summary'):
+            podcast_values['pod_description'] = d.feed.itunes_summary
+
+    # Category extraction with robust error handling
+    try:
+        if hasattr(d.feed, 'itunes_category'):
+            if isinstance(d.feed.itunes_category, list):
+                for cat in d.feed.itunes_category:
+                    if isinstance(cat, dict) and 'text' in cat:
+                        podcast_values['categories'].append(cat['text'])
+                    elif hasattr(cat, 'text'):
+                        podcast_values['categories'].append(cat.text)
+            elif isinstance(d.feed.itunes_category, dict) and 'text' in d.feed.itunes_category:
+                podcast_values['categories'].append(d.feed.itunes_category['text'])
+    except Exception as e:
+        print(f"Error extracting categories: {e}")
 
-    # Now, check if categories list is empty after attempting to populate it
+    # Handle empty categories
     if not podcast_values['categories']:
-        podcast_values['categories'] = ""  # Set to empty string if no categories found
+        podcast_values['categories'] = {'1': 'Podcasts'}  # Default category
     else:
         categories_dict = {str(i): cat for i, cat in enumerate(podcast_values['categories'], start=1)}
-        podcast_values['categories'] = json.dumps(categories_dict)  # Serialize populated categories dict
+        podcast_values['categories'] = categories_dict
 
-    if not podcast_values['pod_description'] and hasattr(d.feed, 'itunes_summary'):
-        podcast_values['pod_description'] = d.feed.itunes_summary
+    # Add explicit check with robust handling
+    try:
+        if hasattr(d.feed, 'itunes_explicit'):
+            if isinstance(d.feed.itunes_explicit, str):
+                podcast_values['pod_explicit'] = d.feed.itunes_explicit.lower() in ('yes', 'true', '1')
+            elif isinstance(d.feed.itunes_explicit, bool):
+                podcast_values['pod_explicit'] = d.feed.itunes_explicit
+    except Exception as e:
+        print(f"Error checking explicit flag: {e}")
 
-    # Check for explicit content
-    if hasattr(d.feed, 'itunes_explicit'):
-        podcast_values['pod_explicit'] = d.feed.itunes_explicit == 'yes'
+    # Print values for debugging
+    print("Extracted podcast values:")
+    for key, value in podcast_values.items():
+        print(f"{key}: {value}")
 
     return podcast_values
 
 
 
-
 def check_valid_feed(feed_url: str, username: Optional[str] = None, password: Optional[str] = None):
     """
     Check if the provided URL points to a valid podcast feed.