diff --git a/client/package.json b/client/package.json index 713d1ef..c521b62 100644 --- a/client/package.json +++ b/client/package.json @@ -16,6 +16,7 @@ "@mui/icons-material": "^5.15.10", "@mui/material": "^5.15.10", "axios": "^1.8.3", + "jszip": "^3.10.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.22.1" diff --git a/client/src/Pages/ProcessingPage.tsx b/client/src/Pages/ProcessingPage.tsx index 5ee8734..df2e7c8 100644 --- a/client/src/Pages/ProcessingPage.tsx +++ b/client/src/Pages/ProcessingPage.tsx @@ -4,10 +4,11 @@ import { Typography, Container, Paper, Box, LinearProgress } from "@mui/material import StepperComponent from "../components/StepperComponent"; import { useMediaContext } from "../contexts/MediaContext"; import axios from "axios"; +import JSZip from "jszip"; function ProcessingPage() { const navigate = useNavigate(); - const { mediaFile, response } = useMediaContext(); + const { mediaFile, response, setExtractedFiles, setDownloadedFileURL } = useMediaContext(); const [progress, setProgress] = useState(0); const [statusText, setStatusText] = useState("Analyzing media..."); @@ -39,6 +40,67 @@ function ProcessingPage() { } }; + const fetchZipDownload = async () => { + try { + setStatusText("Fetching Results..."); + + const res = await axios.get(`/api/download?file_uuid=${response.file_uuid}`, { + responseType: "blob", + }); + + if (res.status === 200) { + console.log("Download successful"); + await handleDownload(res.data); + } else { + console.log("Failed to download the file"); + } + } catch (error) { + console.error("Error fetching download:", error); + } + }; + + const fetchDownload = async () => { + try { + setStatusText("Fetching Results..."); + + const res = await axios.get(`/api/download?file_uuid=${response.file_uuid}`, { + responseType: "blob", + }); + + if (res.status === 200) { + console.log("Download successful"); + const blob = new Blob([res.data], { type: "audio/wav" }); + const fileURL = URL.createObjectURL(blob); + + setDownloadedFileURL( fileURL ); + setProgress(100); + + } else { + console.log("Failed to download the file"); + } + } catch (error) { + console.error("Error fetching download:", error); + } + }; + + + const handleDownload = async (downloadData: Blob) => { + const zipBlob = new Blob([downloadData], { type: "application/zip" }); + const zip = await JSZip.loadAsync(zipBlob); + + const fileURLs = []; + + for (const [filename, fileData] of Object.entries(zip.files)) { + if (!fileData.dir) { + const fileBlob = await fileData.async("blob"); + const fileURL = URL.createObjectURL(fileBlob); + fileURLs.push({ name: filename, url: fileURL }); + } + } + setExtractedFiles(fileURLs); + setProgress(100); + }; + useEffect(() => { if (!mediaFile) { navigate("/upload"); @@ -51,10 +113,10 @@ function ProcessingPage() { processStep("/api/trim", () => { if (response.audio_class === "Music") { processStep("/api/resample", () => { - processStep("/api/separate", () => setProgress(100), 100, "Separating music into vocals, bass, drums and other..."); + processStep("/api/separate", () => fetchZipDownload(), 90, "Separating music into vocals, bass, drums and other..."); }, 75, "Resampling audio to 44100Hz...", { sr: "44100" }); } else { - processStep("/api/noisereduce", () => setProgress(100), 100, "Reducing background noise from the audio..."); + processStep("/api/noisereduce", () => fetchDownload(), 90, "Reducing background noise from the audio..."); } }, 50, "Trimming silent parts from the audio..."); }, 25, "Normalizing audio frequency..."); diff --git a/client/src/Pages/ResultsPage.tsx b/client/src/Pages/ResultsPage.tsx index 031328f..36988ba 100644 --- a/client/src/Pages/ResultsPage.tsx +++ b/client/src/Pages/ResultsPage.tsx @@ -21,11 +21,33 @@ import { useMediaContext } from '../contexts/MediaContext'; function ResultsPage() { const navigate = useNavigate(); - const { mediaFile, response } = useMediaContext(); + const { mediaFile, response, extractedFiles, downloadedFileURL } = useMediaContext(); + console.log("Extracted files are", extractedFiles); // const [isPlaying, setIsPlaying] = useState(false); const audioRefs = [useRef(null), useRef(null), useRef(null),useRef(null)]; + const mediaFileRef = useRef(null); const audioClass = response.audio_class const isVideo = mediaFile?.type.includes('video'); + + const handleDownloadAll = () => { + if (audioClass === 'Music') { + extractedFiles.forEach(({ name, url }) => { + const link = document.createElement('a'); + link.href = url; + link.download = name; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + }); + } else { + const link = document.createElement('a'); + link.href = downloadedFileURL; + link.download = mediaFile?.name ?? 'downloaded_file'; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + }; useEffect(() => { if (!mediaFile) { @@ -70,31 +92,62 @@ function ResultsPage() { controls /> ) : ( - + - {mediaFile.name} (Processed) + {mediaFile.name} (Original) + + + {mediaFile.name} + + {audioClass === "Music" ? ( - audioRefs.map((ref, index) => ( + <> + + + Processed Files + + + {extractedFiles.map((file, index) => ( + + {file.name} + - )) + ))} + ) : ( - - + <> + + + Processed File + + + + + {mediaFile?.name} + + + )} )} @@ -108,7 +161,7 @@ function ResultsPage() { File Details - Name: {mediaFile.name} (Processed) + Name: {mediaFile.name} Type: {mediaFile.type} @@ -118,17 +171,23 @@ function ResultsPage() { - + - + ); } -export default ResultsPage; +export default ResultsPage; \ No newline at end of file diff --git a/client/src/contexts/MediaContext.tsx b/client/src/contexts/MediaContext.tsx index 7ad877d..985d5e4 100644 --- a/client/src/contexts/MediaContext.tsx +++ b/client/src/contexts/MediaContext.tsx @@ -5,6 +5,10 @@ interface MediaContextType { setMediaFile: (file: { name: string; url: string; type: string }) => void; response: { file_uuid: string; sr: number; audio_class: string }; setResponse: (response: { file_uuid: string; sr: number; audio_class: string }) => void; + extractedFiles: { name: string; url: string }[]; + setExtractedFiles: (files: {name: string; url: string }[]) => void; + downloadedFileURL: string; + setDownloadedFileURL: ( file: string) => void; } @@ -17,10 +21,12 @@ export const MediaProvider: React.FC<{ children: React.ReactNode }> = ({ childre file_uuid: "", sr: 0, }); + const [extractedFiles, setExtractedFiles] = useState([]); + const [downloadedFileURL, setDownloadedFileURL] = useState(""); return ( - + {children} );