Skip to content

magnet bulk add #2994

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

Open
edde746 wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −27
Open

magnet bulk add #2994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,14 @@ span#loadimg {padding: 20px; background: transparent url(../images/ajax-loader.g

/* Custom break point settings for responsiveness */

/* Multiline URL textarea in Add Torrent dialog */
#addtorrenturl textarea#url {
height: 80px;
resize: vertical;
font-family: monospace;
font-size: 0.9em;
}

/* X-Small devices (portrait phones, less than 576px) */
/* No media query for `xs` since this is the default in Bootstrap */
/* Custom rules for medium devices */
Expand Down
4 changes: 2 additions & 2 deletions js/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ function makeContent() {
$("<label>").attr({for: "url"}).text(theUILang.Torrent_URL + ": "),
),
$("<div>").addClass("col-md-6").append(
$("<input>")
.attr({type: "text", id: "url", name: "url", placeholder: theUILang.Torrent_URL})
$("<textarea>")
.attr({id: "url", name: "url", placeholder: theUILang.Torrent_URL_multiline, rows: 4})
.on("input", (ev) => {$('#add_url').prop('disabled', ev.target.value.trim() === '');})
.addClass("flex-grow-1"),
),
Expand Down
1 change: 1 addition & 0 deletions lang/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ var theUILang =
Loading : "Loading...",
Torrent_file : "Torrent file",
Torrent_URL : "Torrent URL",
Torrent_URL_multiline : "Torrent URLs (one per line)",
Torrent_properties : "Torrent Properties",
Trackers : "Trackers",
Bandwidth_sett : "Bandwidth Settings",
Expand Down
56 changes: 31 additions & 25 deletions php/addtorrent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,37 +65,43 @@
{
if(isset($_REQUEST['url']))
{
$url = trim($_REQUEST['url']);
$uploaded_url = array( 'name'=>$url, 'status'=>"Failed" );
if(strpos($url,"magnet:")===0)
$urls = preg_split('/[\r\n]+/', trim($_REQUEST['url']));
foreach($urls as $url)
{
$uploaded_url['status'] = (rTorrent::sendMagnet($url,
!isset($_REQUEST['torrents_start_stopped']),
!isset($_REQUEST['not_add_path']),
$dir_edit,$label,$addition) ? "Success" : "Failed" );
}
else
{
$cli = new Snoopy();
if(@$cli->fetchComplex($url) && $cli->status>=200 && $cli->status<300)
$url = trim($url);
if(empty($url)) continue;

$uploaded_url = array( 'name'=>$url, 'status'=>"Failed" );
if(strpos($url,"magnet:")===0)
{
$name = $cli->get_filename();
if($name===false)
$name = md5($url).".torrent";
$name = FileUtil::getUniqueUploadedFilename($name);
$f = @fopen($name,"w");
if($f!==false)
$uploaded_url['status'] = (rTorrent::sendMagnet($url,
!isset($_REQUEST['torrents_start_stopped']),
!isset($_REQUEST['not_add_path']),
$dir_edit,$label,$addition) ? "Success" : "Failed" );
}
else
{
$cli = new Snoopy();
if(@$cli->fetchComplex($url) && $cli->status>=200 && $cli->status<300)
{
@fwrite($f,$cli->results,strlen($cli->results));
fclose($f);
$uploaded_url['file'] = $name;
$uploaded_url['status'] = "Success";
$name = $cli->get_filename();
if($name===false)
$name = md5($url).".torrent";
$name = FileUtil::getUniqueUploadedFilename($name);
$f = @fopen($name,"w");
if($f!==false)
{
@fwrite($f,$cli->results,strlen($cli->results));
fclose($f);
$uploaded_url['file'] = $name;
$uploaded_url['status'] = "Success";
}
}
else
$uploaded_url['status'] = "FailedURL";
}
else
$uploaded_url['status'] = "FailedURL";
$uploaded_files[] = $uploaded_url;
}
$uploaded_files[] = $uploaded_url;
}
}
}
Expand Down