packages/backend/src/routes/playlists.ts

@@ -69,10 +69,8 @@ router.get('/structure', async (req: Request, res: Response) => {
 // Save playlists in batch (replacing all existing ones)
 router.post('/batch', async (req, res) => {
   try {
-    // Replace all playlists atomically
-    await Playlist.deleteMany({});
-    const payload = Array.isArray(req.body) ? req.body : [];
-    const playlists = await Playlist.insertMany(payload, { ordered: false });
+    await Playlist.deleteMany({}); // Clear existing playlists
+    const playlists = await Playlist.create(req.body);
     res.json(playlists);
   } catch (error) {
     console.error('Error saving playlists:', error);

packages/frontend/src/App.tsx

@@ -1,4 +1,4 @@
-import { Box, Button, Flex, Heading, Spinner, Text, useBreakpointValue, IconButton, Drawer, DrawerBody, DrawerHeader, DrawerOverlay, DrawerContent, useDisclosure, Modal, ModalOverlay, ModalContent, ModalHeader, ModalBody, ModalFooter, VStack, useToast } from "@chakra-ui/react";
+import { Box, Button, Flex, Heading, Spinner, Text, useBreakpointValue, IconButton, Drawer, DrawerBody, DrawerHeader, DrawerOverlay, DrawerContent, useDisclosure, Modal, ModalOverlay, ModalContent, ModalHeader, ModalBody, ModalFooter, VStack } from "@chakra-ui/react";
 import { ChevronLeftIcon, ChevronRightIcon, SettingsIcon, DownloadIcon } from "@chakra-ui/icons";
 import React, { useState, useRef, useEffect, useCallback } from "react";
 import { useNavigate, useLocation, Routes, Route } from "react-router-dom";
@@ -76,7 +76,6 @@ const RekordboxReader: React.FC = () => {
   const [isDatabaseInitialized, setIsDatabaseInitialized] = useState(false);
   const [isSwitchingPlaylist, setIsSwitchingPlaylist] = useState(false);
   const { currentSong, playSong, closePlayer } = useMusicPlayer();
-  const toast = useToast();
   
   // Memoized song selection handler to prevent unnecessary re-renders
   const handleSongSelect = useCallback((song: Song) => {
@@ -232,66 +231,31 @@ const RekordboxReader: React.FC = () => {
   };
 
   const handleAddSongsToPlaylist = async (songIds: string[], playlistName: string) => {
-    // Fetch FULL playlists to avoid losing tracks (structure view strips them)
-    const fullTree = await api.getPlaylists();
-
-    const applyAdd = (nodes: PlaylistNode[]): PlaylistNode[] => {
-      return nodes.map(node => {
-        if (node.type === 'playlist' && node.name === playlistName) {
-          const current = Array.isArray(node.tracks) ? node.tracks : [];
-          const merged = Array.from(new Set([...current, ...songIds]));
-          return { ...node, tracks: merged };
-        }
-        if (node.type === 'folder' && node.children) {
-          return { ...node, children: applyAdd(node.children) };
-        }
-        return node;
-      });
-    };
-
-    const updatedFullTree = applyAdd(fullTree);
-    await api.savePlaylists(updatedFullTree);
-
-    // Reload structure for UI counters
-    const structure = await api.getPlaylistStructure();
-    setPlaylists(structure);
-  };
-
-  // Handle drop from song list into playlist (with duplicate check and user choice)
-  const handleDropSongsToPlaylist = async (playlistName: string, songIds: string[]) => {
-    // Find target playlist current tracks
-    const findNode = (nodes: PlaylistNode[]): PlaylistNode | null => {
-      for (const n of nodes) {
-        if (n.name === playlistName && n.type === 'playlist') return n;
-        if (n.type === 'folder' && n.children) {
-          const found = findNode(n.children);
-          if (found) return found;
-        }
+    const updatedPlaylists = playlists.map(node => {
+      if (node.name === playlistName && node.type === 'playlist') {
+        return {
+          ...node,
+          tracks: [...new Set([...(node.tracks || []), ...songIds])]
+        };
       }
-      return null;
-    };
-    const target = findNode(playlists);
-    if (!target) return;
-    const existing = new Set(target?.tracks || []);
-    const dupes = songIds.filter(id => existing.has(id));
-
-    let proceedMode: 'skip' | 'allow' = 'skip';
-    if (dupes.length > 0) {
-      // Simple confirm flow: OK = allow duplicates, Cancel = skip duplicates
-      const allow = window.confirm(`${dupes.length} duplicate${dupes.length>1?'s':''} detected in "${playlistName}". Press OK to add anyway (allow duplicates) or Cancel to skip duplicates.`);
-      proceedMode = allow ? 'allow' : 'skip';
-    }
-
-    const finalIds = proceedMode === 'skip' ? songIds.filter(id => !existing.has(id)) : songIds;
-    if (finalIds.length === 0) return;
-    await handleAddSongsToPlaylist(finalIds, playlistName);
-    toast({
-      title: 'Songs Added',
-      description: `${finalIds.length} song${finalIds.length === 1 ? '' : 's'} added to "${playlistName}"`,
-      status: 'success',
-      duration: 3000,
-      isClosable: true,
+      if (node.type === 'folder' && node.children) {
+        return {
+          ...node,
+          children: node.children.map(child => {
+            if (child.name === playlistName && child.type === 'playlist') {
+              return {
+                ...child,
+                tracks: [...new Set([...(child.tracks || []), ...songIds])]
+              };
+            }
+            return child;
+          })
+        };
+      }
+      return node;
     });
+    const savedPlaylists = await api.savePlaylists(updatedPlaylists);
+    setPlaylists(savedPlaylists);
   };
 
   const handleRemoveFromPlaylist = async (songIds: string[]) => {
@@ -460,7 +424,6 @@ const RekordboxReader: React.FC = () => {
       onPlaylistDelete={handlePlaylistDelete}
       onFolderCreate={handleCreateFolder}
       onPlaylistMove={handleMovePlaylist}
-      onDropSongs={handleDropSongsToPlaylist}
     />
   );
 

packages/frontend/src/components/BackgroundJobProgress.tsx

@@ -98,7 +98,7 @@ export const BackgroundJobProgress: React.FC<BackgroundJobProgressProps> = ({
       clearInterval(intervalRef.current);
     }
 
-    const tick = async () => {
+    intervalRef.current = setInterval(async () => {
       try {
         // Always reload job list to detect newly started jobs
         const jobsData = await api.getAllJobs();
@@ -116,23 +116,13 @@ export const BackgroundJobProgress: React.FC<BackgroundJobProgressProps> = ({
       } catch (err) {
         // ignore transient polling errors
       }
-    };
-
-    // Adaptive interval: 2s if active jobs, else 10s
-    const schedule = async () => {
-      await tick();
-      const hasActive = (jobs || []).some(j => j.status === 'running');
-      const delay = hasActive ? 2000 : 10000;
-      intervalRef.current = setTimeout(schedule, delay) as any;
-    };
-
-    schedule();
+    }, 2000);
   };
 
   // Stop polling
   const stopPolling = () => {
     if (intervalRef.current) {
-      clearTimeout(intervalRef.current as any);
+      clearInterval(intervalRef.current);
       intervalRef.current = null;
     }
   };

packages/frontend/src/components/PaginatedSongList.tsx

@@ -49,8 +49,7 @@ const SongItem = memo<{
   onToggleSelection: (songId: string) => void;
   showCheckbox: boolean;
   onPlaySong?: (song: Song) => void;
-  onDragStart: (e: React.DragEvent, songIdsFallback: string[]) => void;
-}>(({ song, isSelected, isHighlighted, onSelect, onToggleSelection, showCheckbox, onPlaySong, onDragStart }) => {
+}>(({ song, isSelected, isHighlighted, onSelect, onToggleSelection, showCheckbox, onPlaySong }) => {
   // Memoize the formatted duration to prevent recalculation
   const formattedDuration = useMemo(() => formatDuration(song.totalTime || ''), [song.totalTime]);
   const handleClick = useCallback(() => {
@@ -84,10 +83,6 @@ const SongItem = memo<{
       _hover={{ bg: isHighlighted ? "blue.800" : "gray.700" }}
       onClick={handleClick}
       transition="background-color 0.2s"
-      draggable
-      onDragStart={(e) => {
-        onDragStart(e, [song.id]);
-      }}
     >
       {showCheckbox && (
         <Checkbox
@@ -151,8 +146,6 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
   onPlaySong
 }) => {
   const [selectedSongs, setSelectedSongs] = useState<Set<string>>(new Set());
-  const dragSelectionRef = useRef<string[] | null>(null);
-  const [isDragging, setIsDragging] = useState(false);
   const [localSearchQuery, setLocalSearchQuery] = useState(searchQuery);
   const { isOpen: isPlaylistModalOpen, onOpen: onPlaylistModalOpen, onClose: onPlaylistModalClose } = useDisclosure();
   const observerRef = useRef<IntersectionObserver | null>(null);
@@ -234,22 +227,6 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
   // Memoized search handler with debouncing
   // Search handled inline via localSearchQuery effect
 
-  // Provide drag payload: if multiple selected, drag all; else drag the single item
-  const handleDragStart = useCallback((e: React.DragEvent, songIdsFallback: string[]) => {
-    const ids = selectedSongs.size > 0 ? Array.from(selectedSongs) : songIdsFallback;
-    dragSelectionRef.current = ids;
-    setIsDragging(true);
-    const payload = { type: 'songs', songIds: ids, count: ids.length };
-    e.dataTransfer.setData('application/json', JSON.stringify(payload));
-    e.dataTransfer.setData('text/plain', JSON.stringify(payload));
-    e.dataTransfer.effectAllowed = 'copyMove';
-  }, [selectedSongs]);
-
-  const handleDragEnd = useCallback(() => {
-    setIsDragging(false);
-    dragSelectionRef.current = null;
-  }, []);
-
   // Memoized song items to prevent unnecessary re-renders
   const songItems = useMemo(() => {
     return songs.map(song => (
@@ -262,10 +239,9 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
         onToggleSelection={toggleSelection}
         showCheckbox={selectedSongs.size > 0 || depth === 0}
         onPlaySong={onPlaySong}
-        onDragStart={handleDragStart}
       />
     ));
-  }, [songs, selectedSongs, selectedSongId, toggleSelection, depth, onPlaySong, handleDragStart]); // Removed handleSongSelect since it's already memoized
+  }, [songs, selectedSongs, selectedSongId, toggleSelection, depth, onPlaySong]); // Removed handleSongSelect since it's already memoized
 
   // Use total playlist duration if available, otherwise calculate from current songs
   const totalDuration = useMemo(() => {
@@ -333,12 +309,6 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
 
   return (
     <Flex direction="column" height="100%">
-      {/* Global drag badge for selected count */}
-      {isDragging && (
-        <Box position="fixed" top={3} right={3} zIndex={2000} bg="blue.600" color="white" px={3} py={1} borderRadius="md" boxShadow="lg">
-          Dragging {dragSelectionRef.current?.length || 0} song{(dragSelectionRef.current?.length || 0) === 1 ? '' : 's'}
-        </Box>
-      )}
       {/* Sticky Header */}
       <Box
         position="sticky"
@@ -440,7 +410,7 @@ export const PaginatedSongList: React.FC<PaginatedSongListProps> = memo(({
         id="song-list-container"
       >
         <Flex direction="column" gap={2}>
-          <Box onDragEnd={handleDragEnd}>{songItems}</Box>
+          {songItems}
           
           {/* Loading indicator for infinite scroll or playlist switching */}
           {(loading || isSwitchingPlaylist) && (

packages/frontend/src/components/PlaylistManager.tsx

@@ -17,7 +17,7 @@ import {
   MenuList,
   MenuItem,
   Text,
-  // HStack,
+  HStack,
   Collapse,
   MenuDivider,
   MenuGroup,
@@ -36,7 +36,6 @@ interface PlaylistManagerProps {
   onPlaylistDelete: (name: string) => void;
   onFolderCreate: (name: string) => void;
   onPlaylistMove: (playlistName: string, targetFolderName: string | null) => void;
-  onDropSongs?: (playlistName: string, songIds: string[]) => void;
 }
 
 // Memoized button styles to prevent unnecessary re-renders
@@ -92,7 +91,6 @@ interface PlaylistItemProps {
   onPlaylistDelete: (name: string) => void;
   onPlaylistMove: (playlistName: string, targetFolderName: string | null) => void;
   allFolders: { name: string }[];
-  onDropSongs?: (playlistName: string, songIds: string[]) => void;
 }
 
 const PlaylistItem: React.FC<PlaylistItemProps> = React.memo(({
@@ -103,10 +101,8 @@ const PlaylistItem: React.FC<PlaylistItemProps> = React.memo(({
   onPlaylistDelete,
   onPlaylistMove,
   allFolders,
-  onDropSongs,
 }) => {
   const [isOpen, setIsOpen] = useState(false);
-  const [isDragOver, setIsDragOver] = useState(false);
   
   // Memoize click handlers to prevent recreation
   const handlePlaylistClick = useCallback(() => {
@@ -141,30 +137,6 @@ const PlaylistItem: React.FC<PlaylistItemProps> = React.memo(({
                 />
               </Box>
             }
-            onDragOver={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              const types = Array.from((e.dataTransfer.types || []) as any);
-              const hasOurType = types.includes('application/json') || types.includes('text/plain');
-              if (hasOurType) {
-                try { e.dataTransfer.dropEffect = 'copy'; } catch {}
-                setIsDragOver(true);
-              }
-            }}
-            onDragLeave={() => setIsDragOver(false)}
-            onDrop={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              try {
-                const json = e.dataTransfer.getData('application/json') || e.dataTransfer.getData('text/plain');
-                const parsed = json ? JSON.parse(json) : null;
-                if (parsed?.type === 'songs' && Array.isArray(parsed.songIds) && onDropSongs) {
-                  onDropSongs(node.name, parsed.songIds);
-                }
-              } catch {}
-              setIsDragOver(false);
-            }}
-            boxShadow={isDragOver ? 'inset 0 0 0 1px var(--chakra-colors-blue-400)' : 'none'}
           >
             {level > 0 && (
               <Box
@@ -204,7 +176,6 @@ const PlaylistItem: React.FC<PlaylistItemProps> = React.memo(({
                 onPlaylistDelete={onPlaylistDelete}
                 onPlaylistMove={onPlaylistMove}
                 allFolders={allFolders}
-                onDropSongs={onDropSongs}
               />
             ))}
           </VStack>
@@ -225,36 +196,6 @@ const PlaylistItem: React.FC<PlaylistItemProps> = React.memo(({
         borderRight="1px solid"
         borderRightColor="whiteAlpha.200"
         position="relative"
-        border={selectedItem === node.name ? '1px solid' : undefined}
-        borderColor={selectedItem === node.name ? 'blue.800' : undefined}
-        onDragOver={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          const types = Array.from((e.dataTransfer.types || []) as any);
-          const hasOurType = types.includes('application/json') || types.includes('text/plain');
-          if (hasOurType) {
-            try { e.dataTransfer.dropEffect = 'copy'; } catch {}
-            setIsDragOver(true);
-          }
-        }}
-        onDragLeave={() => setIsDragOver(false)}
-        onDrop={(e) => {
-          e.preventDefault();
-          e.stopPropagation();
-          try {
-            let json = e.dataTransfer.getData('application/json');
-            if (!json) json = e.dataTransfer.getData('text/plain');
-            let parsed: any = null;
-            if (json && json.trim().length > 0) {
-              parsed = JSON.parse(json);
-            }
-            if (parsed?.type === 'songs' && Array.isArray(parsed.songIds) && onDropSongs) {
-              onDropSongs(node.name, parsed.songIds);
-            }
-          } catch {}
-          setIsDragOver(false);
-        }}
-        boxShadow={isDragOver ? 'inset 0 0 0 1px var(--chakra-colors-blue-400)' : 'none'}
       >
         {level > 0 && (
           <Box
@@ -347,7 +288,6 @@ export const PlaylistManager: React.FC<PlaylistManagerProps> = ({
   onPlaylistDelete,
   onFolderCreate,
   onPlaylistMove,
-  onDropSongs,
 }) => {
   const { isOpen: isPlaylistModalOpen, onOpen: onPlaylistModalOpen, onClose: onPlaylistModalClose } = useDisclosure();
   const { isOpen: isFolderModalOpen, onOpen: onFolderModalOpen, onClose: onFolderModalClose } = useDisclosure();
@@ -438,7 +378,6 @@ export const PlaylistManager: React.FC<PlaylistManagerProps> = ({
             onPlaylistDelete={onPlaylistDelete}
             onPlaylistMove={onPlaylistMove}
             allFolders={allFolders}
-            onDropSongs={onDropSongs}
           />
         ))}
       </VStack>