Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 0 additions & 88 deletions app/components/DualDownloadButton.jsx

This file was deleted.

21 changes: 11 additions & 10 deletions app/components/DualSearchResultsList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ export default function DualSearchResultsList({
}

// Download button component - matching search button style with icon
const hasWedges = userStats?.flWedges > 0;
const showBookWedge = hasWedges && selectedBook?.freeleech === false && !selectedBook?.vip && !selectedBook?.snatched;
const showAudiobookWedge = hasWedges && selectedAudiobook?.freeleech === false && !selectedAudiobook?.vip && !selectedAudiobook?.snatched;
const showWedges = showBookWedge || showAudiobookWedge;

const downloadButton = (
<button
onClick={onDownload}
Expand Down Expand Up @@ -136,20 +141,20 @@ export default function DualSearchResultsList({

{/* Row 2: FL Wedge toggles + Separator + Combined Info (only when both selected) */}
{bothSelected && (
<div className="flex items-center justify-between text-sm mt-4">
<div className="flex items-center text-sm mt-4 gap-4">
{/* FL Wedge toggles */}
{userStats?.flWedges > 0 && (selectedBook?.freeleech === false || selectedAudiobook?.freeleech === false) ? (
{showWedges && (
<div className="flex items-center gap-3">
<span className="text-gray-600 dark:text-zinc-400 font-medium">Use FL Wedge:</span>
{!selectedBook?.freeleech && (
{showBookWedge && (
<WedgeToggleButton
active={useBookWedge}
onClick={onToggleBookWedge}
label="Book"
size="large"
/>
)}
{!selectedAudiobook?.freeleech && (
{showAudiobookWedge && (
<WedgeToggleButton
active={useAudiobookWedge}
onClick={onToggleAudiobookWedge}
Expand All @@ -158,16 +163,11 @@ export default function DualSearchResultsList({
/>
)}
</div>
) : (
<div></div>
)}

{/* Center Separator */}
<div className="h-5 w-px bg-gray-300 dark:bg-zinc-600"></div>

{/* Combined info */}
{combinedInfo && (
<div className="flex items-center gap-4 text-gray-700 dark:text-zinc-300">
<div className="flex items-center gap-4 text-gray-700 dark:text-zinc-300 ml-auto">
<span className="flex items-center gap-1.5">
<span className="text-base">📦</span>
<span className="font-semibold text-gray-900 dark:text-zinc-100">{combinedInfo.totalSize}</span>
Expand Down Expand Up @@ -250,6 +250,7 @@ const resultShape = PropTypes.shape({
torrentUrl: PropTypes.string.isRequired,
downloadUrl: PropTypes.string.isRequired,
vip: PropTypes.bool,
freeleech: PropTypes.bool,
snatched: PropTypes.bool
});

Expand Down
4 changes: 2 additions & 2 deletions app/components/MobileBottomSheet.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default function MobileBottomSheet({
const disabled = !bothSelected || loading;
const hasWedges = userStats?.flWedges > 0;
const stepText = currentStep === 1 ? 'a Book' : 'an Audiobook';
const showBookWedge = selectedBook && !selectedBook.freeleech;
const showAudiobookWedge = selectedAudiobook && !selectedAudiobook.freeleech;
const showBookWedge = selectedBook && !selectedBook.freeleech && !selectedBook.vip && !selectedBook.snatched;
const showAudiobookWedge = selectedAudiobook && !selectedAudiobook.freeleech && !selectedAudiobook.vip && !selectedAudiobook.snatched;

return (
<>
Expand Down
20 changes: 12 additions & 8 deletions app/components/SearchResultItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import { parseSizeToBytes, calculateNewRatio, calculateRatioDiff } from '@/src/l
import WedgeToggleButton from './WedgeToggleButton';

export default function SearchResultItem({ result, onAddItem, selectable = false, selected = false, onSelect, userStats, useWedge = false, onToggleWedge }) {
const isSnatched = result.snatched;

const handleClick = () => {
if (selectable && onSelect) {
if (selectable && onSelect && !isSnatched) {
onSelect(result);
}
};
Expand Down Expand Up @@ -39,18 +41,20 @@ export default function SearchResultItem({ result, onAddItem, selectable = false
}

const borderClasses = selectable
? selected
? 'border-3 border-pink-300 dark:border-pink-600 cursor-pointer'
: 'border-2 border-gray-100 dark:border-zinc-700 hover:border-pink-200 dark:hover:border-pink-700 cursor-pointer'
? isSnatched
? 'border-2 border-gray-100 dark:border-zinc-700 opacity-50 cursor-not-allowed'
: selected
? 'border-3 border-pink-300 dark:border-pink-600 cursor-pointer'
: 'border-2 border-gray-100 dark:border-zinc-700 hover:border-pink-200 dark:hover:border-pink-700 cursor-pointer'
: 'border-2 border-gray-100 dark:border-zinc-700 hover:border-pink-200 dark:hover:border-pink-700';

return (
<li
className={`px-4 py-3 rounded-md ${borderClasses} mb-4 transition-colors duration-200 relative`}
onClick={selectable ? handleClick : undefined}
role={selectable ? 'button' : undefined}
tabIndex={selectable ? 0 : undefined}
onKeyDown={selectable ? (e) => {
onClick={selectable && !isSnatched ? handleClick : undefined}
role={selectable && !isSnatched ? 'button' : undefined}
tabIndex={selectable && !isSnatched ? 0 : undefined}
onKeyDown={selectable && !isSnatched ? (e) => {
if (e.key === 'Enter' || e.key === ' ') {
e.preventDefault();
handleClick();
Expand Down
1 change: 1 addition & 0 deletions app/components/SequentialSearchResults.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ const resultShape = PropTypes.shape({
torrentUrl: PropTypes.string.isRequired,
downloadUrl: PropTypes.string.isRequired,
vip: PropTypes.bool,
freeleech: PropTypes.bool,
snatched: PropTypes.bool
});

Expand Down
17 changes: 12 additions & 5 deletions app/page.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -328,12 +328,14 @@ function SearchPage() {

// Dual-mode selection handlers
const handleSelectAudiobook = useCallback((item) => {
if (item?.snatched) return;
setSelectedAudiobook(prev =>
prev?.id === item?.id ? null : item
);
}, []);

const handleSelectBook = useCallback((item) => {
if (item?.snatched) return;
setSelectedBook(prev =>
prev?.id === item?.id ? null : item
);
Expand All @@ -342,6 +344,11 @@ function SearchPage() {
// Dual download handler
const handleDualDownload = useCallback(async () => {
if (!selectedAudiobook || !selectedBook) return;
if (selectedAudiobook.snatched || selectedBook.snatched) return;

// Derive effective wedge values (only use wedge if item is actually eligible)
const effectiveAudiobookWedge = useAudiobookWedge && !selectedAudiobook.freeleech && !selectedAudiobook.vip && !selectedAudiobook.snatched;
const effectiveBookWedge = useBookWedge && !selectedBook.freeleech && !selectedBook.vip && !selectedBook.snatched;

setDualDownloadLoading(true);
setMessage(null);
Expand All @@ -357,7 +364,7 @@ function SearchPage() {
downloadUrl: selectedAudiobook.downloadUrl,
torrentId: selectedAudiobook.id,
category: 'audiobooks',
useWedge: useAudiobookWedge
useWedge: effectiveAudiobookWedge
})
}),
fetch('/api/add', {
Expand All @@ -368,7 +375,7 @@ function SearchPage() {
downloadUrl: selectedBook.downloadUrl,
torrentId: selectedBook.id,
category: 'books',
useWedge: useBookWedge
useWedge: effectiveBookWedge
})
})
]);
Expand All @@ -383,15 +390,15 @@ function SearchPage() {
const bookSuccess = bookRes.ok && bookData.ok;

// Refresh stats if any wedge was used
if ((useAudiobookWedge && audiobookSuccess) || (useBookWedge && bookSuccess)) {
if ((effectiveAudiobookWedge && audiobookSuccess) || (effectiveBookWedge && bookSuccess)) {
fetchUserStats();
}

if (audiobookSuccess && bookSuccess) {
// Both succeeded
const wedgeInfo = [];
if (useAudiobookWedge) wedgeInfo.push('audiobook FL');
if (useBookWedge) wedgeInfo.push('book FL');
if (effectiveAudiobookWedge) wedgeInfo.push('audiobook FL');
if (effectiveBookWedge) wedgeInfo.push('book FL');
const wedgeText = wedgeInfo.length > 0 ? ` (${wedgeInfo.join(', ')} applied)` : '';

setMessage({
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"email": "masonfox22@gmail.com"
},
"private": true,
"version": "2.5.2",
"version": "2.5.3",
"scripts": {
"dev": "next dev",
"build": "next build",
Expand Down