Merge pull request #6 from shellord/dev

fix: s3 file upload title issue

Author: shellord

README.md

@@ -264,3 +264,7 @@ docker exec infra-k3s-server-1 kubectl get pvc -n notepod
 # Check notepod-ai logs
 kubectl -n notepod logs -f -l app=notepod-ai --all-containers --prefix --tail=1000
 ```
+
+### SSH port forward for rds
+
+ssh -L 5432:notepod-postgres.cnmw0e08ykfs.ap-south-1.rds.amazonaws.com:5432 -i ~/.ssh/notepod-key.pem ubuntu@notepod.saheen.dev

mobile/src/app/(home)/index.tsx

@@ -68,8 +68,13 @@ const PodcastList = ({
 );
 
 export default function HomeScreen() {
-  const { currentPodcast, stopPlayback, togglePlayback, isPlaying } =
-    usePlayer();
+  const {
+    currentPodcast,
+    stopPlayback,
+    togglePlayback,
+    isPlaying,
+    currentTime,
+  } = usePlayer();
   const { data: podcastsResponse, isLoading, error } = useGetPodcasts();
   const deletePodcastMutation = useDeletePodcast();
   const router = useRouter();
@@ -166,6 +171,7 @@ export default function HomeScreen() {
           onClosePress={handleClose}
           isPlaying={isPlaying}
           onTogglePlay={togglePlayback}
+          currentTime={currentTime}
         />
       )}
       <BlurView

mobile/src/components/NowPlaying.tsx

@@ -5,19 +5,22 @@ import PlayButton from "./PlayButton";
 import { router } from "expo-router";
 import { Podcast } from "~/lib/api";
 import { typeIcon } from "./PodcastIcon";
+import { formatTime } from "~/lib/utils";
 
 type Props = {
   podcast: Podcast;
   onClosePress: () => void;
   isPlaying?: boolean;
   onTogglePlay: () => void;
+  currentTime: number;
 };
 
 const NowPlaying = ({
   podcast,
   onClosePress,
   isPlaying,
   onTogglePlay,
+  currentTime = 0,
 }: Props) => {
   return (
     <Pressable
@@ -35,18 +38,23 @@ const NowPlaying = ({
         </View>
 
         <View className="flex-row items-center gap-4">
-          <PlayButton
-            onPress={onTogglePlay}
-            size={32}
-            iconSize={16}
-            isPlaying={isPlaying}
-          />
-          <Pressable
+          <View className="flex-row items-center">
+            <Font className="text-sm text-gray-400">
+              {formatTime(currentTime)}
+            </Font>
+            <PlayButton
+              onPress={onTogglePlay}
+              size={32}
+              iconSize={16}
+              isPlaying={isPlaying}
+            />
+          </View>
+          {/* <Pressable
             onPress={onClosePress}
             className="w-8 h-8 items-center justify-center"
           >
             <Ionicons name="close" size={20} color="white" />
-          </Pressable>
+          </Pressable> */}
         </View>
       </View>
     </Pressable>

mobile/src/components/PlayButton.tsx

@@ -17,6 +17,7 @@ const PlayButton = ({
   iconSize = 20,
   className = "",
   isPlaying = false,
+  color = "white",
 }: PlayButtonProps) => {
   return (
     <Button
@@ -27,7 +28,7 @@ const PlayButton = ({
       <Ionicons
         name={isPlaying ? "pause" : "play"}
         size={iconSize}
-        color="white"
+        color={color}
       />
     </Button>
   );

mobile/src/components/PodcastCard.tsx

@@ -37,7 +37,7 @@ const PodcastCard = ({ podcast, onDelete }: Props) => {
   const shimmerOpacity = useSharedValue(0.3);
 
   // Determine if podcast is playable (completed and has audio)
-  const isPlayable = podcast.status === "COMPLETED" && podcast.audioUrl;
+  const isPlayable = podcast.status === "COMPLETED" && !!podcast.audioUrl;
 
   // Determine if podcast can be deleted (not currently processing)
   const isDeletable =
@@ -229,7 +229,7 @@ const PodcastCard = ({ podcast, onDelete }: Props) => {
       {/* Main Card */}
       <GestureDetector gesture={panGesture}>
         <Animated.View style={cardStyle}>
-          <Button onPress={handleCardPress}>
+          <Button onPress={handleCardPress} disabled={!isPlayable}>
             <View className="flex-row items-center py-4 bg-white/5 rounded-xl h-16">
               {/* TYPE ICON */}
               <View className="w-16 h-16 bg-white/10 items-center justify-center mr-4">
@@ -267,9 +267,13 @@ const PodcastCard = ({ podcast, onDelete }: Props) => {
                   isPlaying={playing}
                 />
               ) : (
-                <View className="w-10 h-10 rounded-full bg-white/10 items-center justify-center">
-                  <Ionicons name="play" size={16} color="#ffffff40" />
-                </View>
+                <PlayButton
+                  onPress={handlePlay}
+                  iconSize={20}
+                  size={40}
+                  isPlaying={playing}
+                  color="gray"
+                />
               )}
             </View>
           </Button>

mobile/src/components/Slider.tsx

@@ -1,5 +1,6 @@
 import { View, Animated, PanResponder } from "react-native";
 import React, { useRef, useState, useEffect } from "react";
+import { formatTime } from "~/lib/utils";
 
 interface SliderProps {
   currentTime?: number;
@@ -12,14 +13,6 @@ const Slider: React.FC<SliderProps> = ({
   totalDuration = 296,
   onTimeChange,
 }) => {
-  const formatTime = (seconds: number) => {
-    if (isNaN(seconds) || seconds < 0) seconds = 0;
-    const totalSeconds = Math.floor(seconds);
-    const mins = Math.floor(totalSeconds / 60);
-    const secs = totalSeconds % 60;
-    return `${mins}:${secs.toString().padStart(2, "0")}`;
-  };
-
   const [sliderWidth, setSliderWidth] = useState(0);
   const [isDragging, setIsDragging] = useState(false);
   const [internalTime, setInternalTime] = useState(currentTime);

mobile/src/hooks/usePlayer.tsx

@@ -77,8 +77,10 @@ export const PlayerProvider = ({ children }: PlayerProviderProps) => {
   useEffect(() => {
     if (audioPlayerStatus.didJustFinish) {
       setIsPlaying(false);
+      // Reset to beginning when audio finishes
+      player.seekTo(0);
     }
-  }, [audioPlayerStatus.didJustFinish]);
+  }, [audioPlayerStatus.didJustFinish, player]);
 
   const playPodcast = useCallback((podcast: Podcast) => {
     if (!podcast.audioUrl) return;
@@ -89,8 +91,14 @@ export const PlayerProvider = ({ children }: PlayerProviderProps) => {
 
   const togglePlayback = useCallback(() => {
     if (!currentPodcast) return;
+    
+    // If audio finished playing, reset to beginning before playing
+    if (!isPlaying && currentTime >= duration && duration > 0) {
+      player.seekTo(0);
+    }
+    
     setIsPlaying((prev) => !prev);
-  }, [currentPodcast]);
+  }, [currentPodcast, isPlaying, currentTime, duration, player]);
 
   const stopPlayback = useCallback(() => {
     setIsPlaying(false);

mobile/src/lib/utils.ts

@@ -0,0 +1,9 @@
+const formatTime = (seconds: number) => {
+  if (isNaN(seconds) || seconds < 0) seconds = 0;
+  const totalSeconds = Math.floor(seconds);
+  const mins = Math.floor(totalSeconds / 60);
+  const secs = totalSeconds % 60;
+  return `${mins}:${secs.toString().padStart(2, "0")}`;
+};
+
+export { formatTime };

podcast-ai/app.py

@@ -93,7 +93,8 @@ async def handle_podcast_generation(data: Dict[str, Any]) -> None:
                 duration=request.duration,
                 language=request.language,
                 start_page=start_page,
-                end_page=end_page
+                end_page=end_page,
+                podcast_id=request.id
             )
 
         # Step 3: Publish COMPLETED status with results
@@ -165,7 +166,8 @@ async def generate_podcast(request: PodcastRequest):
             duration=request.duration,
             language=request.language,
             start_page=start_page,
-            end_page=end_page
+            end_page=end_page,
+            podcast_id=request.id
         )
         return PodcastResponse(
             id=request.id,

podcast-ai/services/podcast.py

@@ -49,7 +49,7 @@ def _duration_to_minutes(self, duration: PodcastDuration) -> int:
         }
         return duration_mapping[duration]
 
-    def generate_podcast_from_pdf(self, pdf_url: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english", start_page: Optional[int] = None, end_page: Optional[int] = None) -> Podcast:
+    def generate_podcast_from_pdf(self, pdf_url: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english", start_page: Optional[int] = None, end_page: Optional[int] = None, podcast_id: Optional[str] = None) -> Podcast:
         """
         Generate a podcast for a given PDF file and speakers.
         
@@ -106,11 +106,11 @@ def generate_podcast_from_pdf(self, pdf_url: str, speakers: list[SpeakerWithVoic
         elif end_page:
             title += f" (Up to Page {end_page})"
 
-        url = self._s3_storage_service.upload_podcast_audio(audio, title)
+        url = self._s3_storage_service.upload_podcast_audio(audio, title, podcast_id)
 
         return Podcast(title=title, duration_minutes=self.calculate_audio_duration(audio), audio_url=url, script=script_response.script)
 
-    def generate_podcast_from_image(self, image_url: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english") -> Podcast:
+    def generate_podcast_from_image(self, image_url: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english", podcast_id: Optional[str] = None) -> Podcast:
         """
         Generate a podcast for a given image and speakers.
         
@@ -164,11 +164,11 @@ def generate_podcast_from_image(self, image_url: str, speakers: list[SpeakerWith
 
         # Use AI-generated title or create a fallback
         title = script_response.title if script_response.title else "Image Analysis Podcast"
-        url = self._s3_storage_service.upload_podcast_audio(audio, title)
+        url = self._s3_storage_service.upload_podcast_audio(audio, title, podcast_id)
 
         return Podcast(title=title, duration_minutes=self.calculate_audio_duration(audio), audio_url=url, script=script_response.script)
 
-    def generate_podcast_from_topic(self, topic: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english") -> Podcast:
+    def generate_podcast_from_topic(self, topic: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english", podcast_id: Optional[str] = None) -> Podcast:
         """
         Generate a podcast for a given topic and speakers.
         """
@@ -195,11 +195,11 @@ def generate_podcast_from_topic(self, topic: str, speakers: list[SpeakerWithVoic
             ))
 
         audio = self._elevenlabs_client.generate_podcast_audio(conversations)
-        url = self._s3_storage_service.upload_podcast_audio(audio, topic)
+        url = self._s3_storage_service.upload_podcast_audio(audio, topic, podcast_id)
 
         return Podcast(title=topic, duration_minutes=self.calculate_audio_duration(audio), audio_url=url, script=script.script)
 
-    def generate_podcast_from_website(self, website_url: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english") -> Podcast:
+    def generate_podcast_from_website(self, website_url: str, speakers: list[SpeakerWithVoiceId], duration: PodcastDuration = PodcastDuration.SHORT, language: str = "english", podcast_id: Optional[str] = None) -> Podcast:
         """
         Generate a podcast for a given website and speakers.
         
@@ -245,7 +245,7 @@ def generate_podcast_from_website(self, website_url: str, speakers: list[Speaker
 
         # Use the website URL as title
         title = website_url
-        url = self._s3_storage_service.upload_podcast_audio(audio, title)
+        url = self._s3_storage_service.upload_podcast_audio(audio, title, podcast_id)
 
         return Podcast(title=title, duration_minutes=self.calculate_audio_duration(audio), audio_url=url, script=script.script)
 
@@ -255,15 +255,18 @@ def generate_podcast(self,
                          duration: PodcastDuration = PodcastDuration.SHORT,
                          language: str = "english",
                          start_page: Optional[int] = None,
-                         end_page: Optional[int] = None) -> Podcast:
+                         end_page: Optional[int] = None,
+                         podcast_id: Optional[str] = None) -> Podcast:
         if type == PodcastType.TOPIC:
-            return self.generate_podcast_from_topic(source_content, speakers, duration, language)
+            return self.generate_podcast_from_topic(source_content, speakers, duration, language, podcast_id)
         elif type == PodcastType.PDF_DOCUMENT:
-            return self.generate_podcast_from_pdf(source_content, speakers, duration, language, start_page, end_page)
+            return self.generate_podcast_from_pdf(source_content, speakers, duration, language, start_page, end_page, podcast_id)
         elif type == PodcastType.PHOTO:
-            return self.generate_podcast_from_image(source_content, speakers, duration, language)
+            return self.generate_podcast_from_image(source_content, speakers, duration, language, podcast_id)
         elif type == PodcastType.WEBSITE_LINK:
-            return self.generate_podcast_from_website(source_content, speakers, duration, language)
+            return self.generate_podcast_from_website(source_content, speakers, duration, language, podcast_id)
+        else:
+            raise ValueError(f"Unsupported podcast type: {type}")
 
     def calculate_audio_duration(self, audio: bytes) -> int:
         """