Merge pull request 'light-front' (#4) from light-front into master

Reviewed-on: #4

backend/.env

@@ -0,0 +1,2 @@
+MUSIC_DIR=music/
+NAVIDROME_SCAN_URL=

backend/.gitignore

@@ -0,0 +1,2 @@
+music/
+__pycache__/

backend/Dockerfile

@@ -1,14 +1,37 @@
-FROM python:3.11-slim
+# ---- Base ----
+FROM python:3.11-slim-bookworm
 
-RUN apt update && apt install -y curl ffmpeg && \
+# עדכון מערכת והתקנת FFmpeg (כולל ffprobe)
-    curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp && \
+RUN apt-get update \
-    chmod a+rx /usr/local/bin/yt-dlp
+  && apt-get install -y --no-install-recommends ffmpeg \
+  && rm -rf /var/lib/apt/lists/*
 
+# הגדרות סביבת עבודה בסיסיות
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    PIP_NO_CACHE_DIR=1
+
+# ספריית האפליקציה
 WORKDIR /app
-COPY . .
 
+# התקנת תלויות
+# (משתמש ב־requirements.txt שהבאת)
+COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
-ENV MUSIC_DIR=/music
+# קבצי האפליקציה
+COPY . .
 
-CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
+# תיקיית המוזיקה (הקוד גם יוצר אותה, אבל נגדיר כ־VOLUME לנוחות)
+VOLUME ["/app/music"]
+
+# פורט האפליקציה
+EXPOSE 8000
+
+# ריצה תחת משתמש לא־רות
+RUN useradd -ms /bin/bash appuser && chown -R appuser:appuser /app
+USER appuser
+
+# הפעלה
+# אם תרצה workers: הוסף --workers 2 (או לפי הצורך)
+ENTRYPOINT ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--proxy-headers"]

backend/config.py

@@ -1,12 +1,18 @@
-from pydantic_settings import BaseSettings
+import os
-from pydantic import Field
+from dotenv import load_dotenv
 
-class Settings(BaseSettings):
+load_dotenv()
-    MUSIC_DIR: str = Field(default="/music", description="Path where songs are saved")
-    NAVIDROME_SCAN_URL: str = Field(default="", description="URL to trigger Navidrome rescan")
 
-    class Config:
+class Settings:
-        env_file = ".env"
+    # If MUSIC_DIR is not absolute, make it relative to the project root
-        env_file_encoding = "utf-8"
+    _music_dir = os.getenv("MUSIC_DIR", "music")
+    if not os.path.isabs(_music_dir):
+        # Use the directory where config.py is located as the base
+        BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+        MUSIC_DIR = os.path.abspath(os.path.join(BASE_DIR, _music_dir))
+    else:
+        MUSIC_DIR = _music_dir
+
+    NAVIDROME_SCAN_URL = os.getenv("NAVIDROME_SCAN_URL", "")
 
 settings = Settings()

backend/downloader.py

@@ -1,37 +1,52 @@
-import subprocess
+import yt_dlp
-import os
+from pathlib import Path
 from config import settings
-import requests
+
+def is_playlist(query: str) -> bool:
+    return "playlist" in query or "list=" in query
+
+def is_youtube_url(query: str) -> bool:
+    return query.startswith("http")
+
+def duration_range_filter(min_seconds, max_seconds):
+    def _filter(info, *, incomplete):
+        duration = info.get('duration')
+        if duration:
+            if duration < min_seconds:
+                return f"Skipping: {info.get('title')} is shorter than {min_seconds//60} minutes"
+            if duration > max_seconds:
+                return f"Skipping: {info.get('title')} is longer than {max_seconds//60} minutes"
+    return _filter
 
 def download_song(query: str):
-    output_template = os.path.join(settings.MUSIC_DIR, "%(artist)s/%(album)s/%(title)s.%(ext)s")
+    Path(settings.MUSIC_DIR).mkdir(parents=True, exist_ok=True)
 
+    if is_youtube_url(query):
+        yt_query = query
+        noplaylist = False
+    elif is_playlist(query):
+        yt_query = query
+        noplaylist = False
+    else:
+        yt_query = f"ytsearch10:{query}"  # Always search for 10 results for any artist/song query
+        noplaylist = True
 
-    command = [
+    ydl_opts = {
-        "yt-dlp",
+        'format': 'bestaudio/best',
-        f"ytsearch1:{query}",
+        'outtmpl': f"{settings.MUSIC_DIR}/%(title)s.%(ext)s",
-        "--extract-audio",
+        'postprocessors': [{
-        "--audio-format", "mp3",
+            'key': 'FFmpegExtractAudio',
-        "--output", output_template,
+            'preferredcodec': 'mp3',
-        "--no-playlist",
+        }, {
-        "--quiet"
+            'key': 'FFmpegMetadata',
-    ]
+        }],
-
+        'match_filter': duration_range_filter(2 * 60, 9 * 60),  # 2 to 9 minutes
-    result = subprocess.run(command, capture_output=True, text=True)
+        'noplaylist': noplaylist,
-
+        'quiet': False,
-    if result.returncode != 0:
+        'verbose': True,
-        raise Exception(f"❌ Download failed:\n{result.stderr}")
-
-    # Optional: trigger Navidrome rescan
-    if settings.NAVIDROME_SCAN_URL:
-        try:
-            res = requests.get(settings.NAVIDROME_SCAN_URL, timeout=5)
-            res.raise_for_status()
-        except Exception as e:
-            print(f"⚠️ Failed to trigger Navidrome rescan: {e}")
-
-    return {
-        "status": "success",
-        "query": query,
-        "log": result.stdout + "\n" + result.stderr
     }
+
+    print("yt-dlp options:", ydl_opts)
+    with yt_dlp.YoutubeDL(ydl_opts) as ydl:
+        result = ydl.download([yt_query])
+    return {"downloaded": "Check music folder for downloaded files"}

backend/main.py

@@ -1,18 +1,41 @@
 from fastapi import FastAPI, Query, HTTPException
 from fastapi.responses import JSONResponse
-import uvicorn
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi import APIRouter
+import os
+
 from downloader import download_song
 from config import settings
 
-app = FastAPI(title="Tunedrop")
+os.makedirs(settings.MUSIC_DIR, exist_ok=True)
+print(f"Using MUSIC_DIR: {settings.MUSIC_DIR}")
+
+app = FastAPI(title="Tunedrop", version="1.0.0")
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 
 @app.get("/download")
-def download(query: str = Query(..., description="Song name or YouTube search term")):
+def download(query: str = Query(..., min_length=2)):
     try:
         result = download_song(query)
         return JSONResponse(content={"status": "success", **result})
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
     
+@app.get("/songs", summary="List downloaded songs")
+def list_songs():
+    try:
+        files = os.listdir(settings.MUSIC_DIR)
+        songs = [f for f in files if f.endswith(".mp3")]
+        return {"songs": sorted(songs)}
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"Failed to read songs: {str(e)}")
+    
 if __name__ == "__main__":
-    uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True)
+    import uvicorn
+    uvicorn.run("main:app", host="0.0.0.0", port=8000, log_level="info", reload=True)

backend/requirements.txt

@@ -1,5 +1,5 @@
 fastapi
 uvicorn
+pydantic-settings
+yt-dlp
 requests
-pydantic>=2.0
-pydantic-settings>=2.0

frontend/.dockerignore

@@ -0,0 +1,6 @@
+node_modules
+dist
+.git
+.gitignore
+npm-debug.log
+.DS_Store

frontend/10-generate-env.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+set -eu
+
+TEMPLATE="/etc/env/env.js.template"
+TARGET="/usr/share/nginx/html/env.js"
+
+VITE_API_URL="${VITE_API_URL:-http://localhost:8000}"
+echo "[entrypoint] Generating runtime env -> $TARGET"
+sed "s|\$VITE_API_URL|${VITE_API_URL}|g" "$TEMPLATE" > "$TARGET"
+echo "[entrypoint] Done."

frontend/Dockerfile

@@ -0,0 +1,16 @@
+FROM node:20-alpine AS builder
+WORKDIR /app
+COPY package.json package-lock.json* ./
+RUN npm install --legacy-peer-deps
+COPY . .
+RUN npm run build
+
+FROM nginx:alpine
+RUN apk add --no-cache dos2unix gettext
+COPY --from=builder /app/dist /usr/share/nginx/html
+COPY public/env.js.template /etc/env/env.js.template
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY 10-generate-env.sh /docker-entrypoint.d/10-generate-env.sh
+RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypoint.d/10-generate-env.sh
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]

frontend/index.html

@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React</title>
+    <title>Tunedrop</title>
+    <script src="/env.js"></script>
   </head>
   <body>
     <div id="root"></div>

frontend/nginx.conf

@@ -0,0 +1,16 @@
+server {
+  listen 80;
+  server_name _;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri /index.html;
+  }
+
+  location = /env.js {
+    alias /usr/share/nginx/html/env.js;
+    add_header Cache-Control "no-store";
+  }
+}

frontend/package.json

@@ -17,7 +17,7 @@
     "@eslint/js": "^9.30.1",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
-    "@vitejs/plugin-react-swc": "^3.10.2",
+    "@vitejs/plugin-react": "^4.6.0",
     "eslint": "^9.30.1",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",

frontend/public/env.js.template

@@ -0,0 +1,4 @@
+// Replaced at container start
+window.__ENV = {
+  VITE_API_URL: "$VITE_API_URL"
+};

frontend/src/App.css

@@ -1,35 +1,42 @@
-.app-container {
+#root {
-  max-width: 600px;
+  max-width: 1280px;
   margin: 0 auto;
   padding: 2rem;
-  font-family: sans-serif;
   text-align: center;
 }
 
-.search-form {
+.logo {
-  display: flex;
+  height: 6em;
-  flex-direction: column;
+  padding: 1.5em;
-  gap: 1rem;
+  will-change: filter;
-  margin-top: 2rem;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
 }
 
-input {
+@keyframes logo-spin {
-  padding: 0.75rem;
+  from {
-  font-size: 1.1rem;
+    transform: rotate(0deg);
-  border-radius: 8px;
+  }
-  border: 1px solid #ccc;
+  to {
+    transform: rotate(360deg);
+  }
 }
 
-button {
+@media (prefers-reduced-motion: no-preference) {
-  padding: 0.75rem;
+  a:nth-of-type(2) .logo {
-  font-size: 1.1rem;
+    animation: logo-spin infinite 20s linear;
-  background: #1db954;
+  }
-  color: white;
-  border: none;
-  border-radius: 8px;
-  cursor: pointer;
 }
 
-button:hover {
+.card {
-  background: #1ed760;
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
 }

frontend/src/App.jsx

@@ -1,27 +1,43 @@
-import { useState } from "react";
+import React, { useState, useEffect } from "react";
-import "./App.css";
+import DownloadForm from "./components/DownloadForm";
+import SongList from "./components/SongList";
+import { downloadSong, getDownloadedSongs } from "./services/api";
 
 function App() {
-  const [query, setQuery] = useState("");
+  const [songs, setSongs] = useState([]);
+  const [error, setError] = useState("");
 
-  const handleSearch = (e) => {
+  const loadSongs = async () => {
-    e.preventDefault();
+    try {
-    console.log("Searching for:", query);
+      const res = await getDownloadedSongs();
-    // later: call backend here
+      setSongs(res.songs);
+    } catch (err) {
+      setError("⚠️ Failed to fetch songs");
+    }
   };
 
+  const handleDownload = async (query) => {
+    setError("");
+    try {
+      await downloadSong(query);
+      await loadSongs();
+    } catch (err) {
+      setError(err.message || "❌ Failed to download");
+    }
+  };
+
+  useEffect(() => {
+    loadSongs();
+  }, []);
+
   return (
-    <div className="app-container">
+    <div style={{ maxWidth: "600px", margin: "2rem auto", padding: "1rem" }}>
-      <h1>Tunedrop 🎵</h1>
+      <h2>
-      <form onSubmit={handleSearch} className="search-form">
+        Tunedrop <span role="img" aria-label="music">🎵</span>
-        <input
+      </h2>
-          type="text"
+      <DownloadForm onDownload={handleDownload} />
-          placeholder="Search for a song..."
+      {error && <p style={{ color: "red" }}>{error}</p>}
-          value={query}
+      <SongList songs={songs} />
-          onChange={(e) => setQuery(e.target.value)}
-        />
-        <button type="submit">Search</button>
-      </form>
     </div>
   );
 }

frontend/src/components/DownloadForm.jsx

@@ -0,0 +1,33 @@
+import React, { useState } from "react";
+
+function DownloadForm({ onDownload }) {
+  const [query, setQuery] = useState("");
+  const [loading, setLoading] = useState(false);
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    if (!query.trim()) return;
+
+    setLoading(true);
+    await onDownload(query);
+    setQuery("");
+    setLoading(false);
+  };
+
+  return (
+    <form onSubmit={handleSubmit}>
+      <input
+        type="text"
+        placeholder="Enter artist name or YouTube link"
+        value={query}
+        onChange={(e) => setQuery(e.target.value)}
+        style={{ width: "100%", padding: "8px", marginBottom: "1rem" }}
+      />
+      <button type="submit" disabled={loading} style={{ width: "100%", padding: "10px" }}>
+        {loading ? "Downloading..." : "Download"}
+      </button>
+    </form>
+  );
+}
+
+export default DownloadForm;

frontend/src/components/SongCard.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-
-function SongCard({ song }) {
-  return (
-    <div className="rounded-lg shadow-md p-4 bg-white dark:bg-gray-800 flex flex-col items-center text-center">
-      <img
-        src={song.cover || '/default-cover.jpg'}
-        alt={song.title}
-        className="w-24 h-24 object-cover rounded"
-      />
-      <h3 className="mt-2 text-sm font-semibold text-gray-800 dark:text-white">{song.title}</h3>
-      <p className="text-xs text-gray-500 dark:text-gray-300">{song.artist}</p>
-      <button className="mt-2 px-3 py-1 text-sm bg-blue-500 text-white rounded hover:bg-blue-600">
-        Play
-      </button>
-    </div>
-  );
-}
-
-export default SongCard;

frontend/src/components/SongList.jsx

@@ -0,0 +1,15 @@
+import React from "react";
+
+function SongList({ songs }) {
+  if (!songs.length) return <p>No songs yet</p>;
+
+  return (
+    <ul style={{ marginTop: "2rem", listStyle: "none", padding: 0 }}>
+      {songs.map((song, idx) => (
+        <li key={idx} style={{ marginBottom: "8px" }}>{song}</li>
+      ))}
+    </ul>
+  );
+}
+
+export default SongList;

frontend/src/pages/Home.jsx

@@ -1,47 +0,0 @@
-import { useState } from "react";
-import { downloadSong } from "../services/api";
-
-function Home() {
-  const [query, setQuery] = useState("");
-  const [status, setStatus] = useState("");
-  const [loading, setLoading] = useState(false);
-
-  const handleSearch = async () => {
-    if (!query.trim()) return;
-
-    setLoading(true);
-    setStatus("");
-    try {
-      const result = await downloadSong(query);
-      setStatus(`✅ Success: Downloaded "${result.query}"`);
-    } catch (error) {
-      setStatus(`❌ Error: ${error.message}`);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  return (
-    <div className="p-4 max-w-md mx-auto">
-      <h1 className="text-2xl font-bold mb-4">🎵 Tunedrop</h1>
-      <input
-        type="text"
-        value={query}
-        onChange={(e) => setQuery(e.target.value)}
-        placeholder="Search for a song..."
-        className="w-full p-2 border rounded mb-2"
-      />
-      <button
-        onClick={handleSearch}
-        className="w-full bg-blue-500 text-white py-2 px-4 rounded hover:bg-blue-600"
-        disabled={loading}
-      >
-        {loading ? "Downloading..." : "Search & Download"}
-      </button>
-
-      {status && <p className="mt-4 text-center">{status}</p>}
-    </div>
-  );
-}
-
-export default Home;

frontend/src/services/api.js

@@ -1,16 +1,19 @@
-const API_BASE_URL = import.meta.env.VITE_API_BASE_URL || "http://localhost:8000";
+const runtimeBase = typeof window !== "undefined" && window.__ENV && window.__ENV.VITE_API_URL;
+const buildTimeBase = import.meta.env?.VITE_API_URL;
+const BASE_URL = runtimeBase || buildTimeBase || "http://localhost:8000";
 
-// 📥 הורדת שיר לפי שם
 export async function downloadSong(query) {
-  try {
+  const res = await fetch(`${BASE_URL}/download?query=${encodeURIComponent(query)}`);
-    const res = await fetch(`${API_BASE_URL}/download?query=${encodeURIComponent(query)}`);
   if (!res.ok) {
-      const err = await res.json();
+    let detail = "Unknown error";
-      throw new Error(err.detail || "Download failed");
+    try { detail = (await res.json()).detail || detail; } catch {}
+    throw new Error(detail);
   }
-    return await res.json();
+  return res.json();
-  } catch (error) {
-    console.error("❌ Error downloading song:", error);
-    throw error;
 }
+
+export async function getDownloadedSongs() {
+  const res = await fetch(`${BASE_URL}/songs`);
+  if (!res.ok) throw new Error("Failed to fetch songs");
+  return res.json();
 }

frontend/vite.config.js

@@ -1,5 +1,5 @@
 import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react-swc'
+import react from '@vitejs/plugin-react'
 
 // https://vite.dev/config/
 export default defineConfig({