Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for using selected_files from previous downloads #8413

Merged
merged 3 commits into from
Jan 25, 2025
Merged

Fix for using selected_files from previous downloads #8413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dbc546
Fix unique key error in SelectRemotePath
egbertbouman Jan 24, 2025
5889a3f
Fix for using selected_files from previous downloads
egbertbouman Jan 24, 2025
9000c47
Only start downloading metainfo after "Add" is clicked
egbertbouman Jan 24, 2025
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
15 changes: 8 additions & 7 deletions src/tribler/ui/src/components/add-torrent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import { useTranslation } from "react-i18next";
export function AddTorrent() {
const { t } = useTranslation();
const navigate = useNavigate();
const inputRef = useRef<HTMLInputElement | null>(null);
const fileInputRef = useRef<HTMLInputElement | null>(null);
const uriInputRef = useRef<HTMLInputElement | null>(null);

const [urlDialogOpen, setUrlDialogOpen] = useState<boolean>(false);
const [uriInput, setUriInput] = useState('');
Expand Down Expand Up @@ -47,8 +48,8 @@ export function AddTorrent() {
</DropdownMenuItem>
<DropdownMenuItem
onClick={() => {
if (inputRef && inputRef.current) {
inputRef.current.click();
if (fileInputRef && fileInputRef.current) {
fileInputRef.current.click();
}
}}>
<FileIcon className="mr-2 h-4 w-4" />
Expand All @@ -74,10 +75,9 @@ export function AddTorrent() {
{t('MagnetDialogInputLabel')}
<div className="grid grid-cols-6 items-center gap-4">
<Input
ref={uriInputRef}
id="uri"
className="col-span-5 pt-0"
value={uriInput}
onChange={(event) => setUriInput(event.target.value)}
/>
</div>
</div>
Expand All @@ -86,7 +86,8 @@ export function AddTorrent() {
variant="outline"
type="submit"
onClick={() => {
if (uriInput) {
if (uriInputRef.current?.value) {
setUriInput(uriInputRef.current.value);
setTorrent(undefined);
setUrlDialogOpen(false);
(async () => {
Expand Down Expand Up @@ -126,7 +127,7 @@ export function AddTorrent() {

<input
style={{ display: 'none' }}
ref={inputRef}
ref={fileInputRef}
type="file"
accept=".torrent"
onChange={(event) => {
Expand Down
9 changes: 5 additions & 4 deletions src/tribler/ui/src/dialogs/SaveAs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export default function SaveAs(props: SaveAsProps & JSX.IntrinsicAttributes & Di
setMoveCompleted(false);
setError(undefined);
setExists(false);
setFiles([])
setFiles([]);
const newSettings = await triblerService.getSettings();
if (newSettings === undefined) {
setError(`${t("ToastErrorGetSettings")} ${t("ToastErrorGenNetworkErr")}`);
Expand All @@ -133,13 +133,14 @@ export default function SaveAs(props: SaveAsProps & JSX.IntrinsicAttributes & Di
const safeSeeding = !!newSettings?.libtorrent?.download_defaults?.safeseeding_enabled;
const safeDownloading = !!newSettings?.libtorrent?.download_defaults?.anonymity_enabled;
setSettings(newSettings);
setParams({
...params,
setParams(prev => ({
...prev,
destination: newSettings?.libtorrent.download_defaults.saveas ?? '',
completed_dir: newSettings?.libtorrent.download_defaults.completed_dir ?? '',
anon_hops: safeDownloading ? newSettings.libtorrent.download_defaults.number_hops : 0,
safe_seeding: safeSeeding,
});
selected_files: []
}));
setMoveCompleted((newSettings?.libtorrent?.download_defaults.completed_dir ?? '').length > 0);

// Retrieve metainfo
Expand Down
6 changes: 3 additions & 3 deletions src/tribler/ui/src/dialogs/SelectRemotePath.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ export default function SelectRemotePath(props: SelectRemotePathProps & JSX.Intr
<DialogTitle>{selectDir ? t('PleaseSelectDirectory') : t('PleaseSelectFile')}</DialogTitle>
<DialogDescription className="text-base break-all">
{(currentPath || initialPath).split(separator).map((dir, index, array) => {
if (dir.length == 0 && index == 0) return <>{separator}</>
if (dir.length == 0 && index == 0) return <span key={index}>{separator}</span>
else if (dir.length == 0) return
return (
<>
<span key={index}>
<a className="cursor-pointer hover:text-black dark:hover:text-white"
onClick={(event) => {
let path = array.slice(0, index + 1).join(separator) + separator;
Expand All @@ -83,7 +83,7 @@ export default function SelectRemotePath(props: SelectRemotePathProps & JSX.Intr
{dir}
</a>
{dir.endsWith(separator) ? "" : separator}
</>
</span>
)
})}
</DialogDescription>
Expand Down
Loading