I hacked this up to make it work in TF
2.3, here is the patch file that should be run from the
torrentflux root dir, i.e.:
user@host:/var/www/torrentflux$ patch
-p0 < savePatch.patch
You also need to make
the mysql change mentioned in the first post of this
topic
-
Now creates the directory you specify, or gives an error
on the popup page if it couldn't create the
directory
- Now works with the queue manager.
Note that the directory is created immediately, not when
the torrent actually starts
Let me know if you run into any problems
using this patch and thanks to coldfire for the
original!
diff -ur html.old/admin.php
html/admin.php
--- html.old/admin.php
2006-12-12
19:29:56.000000000 -0800
+++ html/admin.php
2007-05-03
21:00:29.000000000 -0700
@@ -1230,6 +1230,10
@@
msg = msg + "* Port Range is not
valid.\n";
document.theForm.minport.focus();
}
+
if
(isNumber(document.theForm.maxdepth.value) ==
false)
+ {
+
msg = msg + "* Max Depth must be a valid
number.\n" ;
+
}
if (msg
!= "")
{
@@
-1661,6 +1665,34 @@
<input
name="sharekill" type="Text" maxlength="3"
value="<?php echo($cfg["sharekill"]);
?>" size="3">%
</td>
</tr>
+
<tr>
+
<td align="left"
width="350" valign="top"><strong>Show Directory
Tree</strong><br>
+
Show Directory Tree when you are
going to start a torrent,
+
allowing you to select the path
where you want
+
to download the file(s).
+
</td>
+
<td valign="top">
+
<select name="showdirtree">
+
<option
value="1">true</option>
+
<option value="0" <?php
+
if (!$cfg["showdirtree"])
+
{
+
echo "selected";
+
}
+
?>>false</option>
+
</select>
+
</td>
+
</tr>
+
<tr>
+
<td align="left" width="350"
valign="top"><strong>Max Depth in Directory
Tree</strong><br>
+
Set the max depth of subfolders in
your user directory when
+
displaying directory tree. Set it to 0 if
you want to
+
display all subfolders.
+
</td>
+
<td valign="top">
+
<input name="maxdepth" type="Text"
maxlength="1" value="<?php echo
($cfg["maxdepth"]); ?>" size="1">
+
</td>
+
</tr>
</table>
<br>
<input type="Submit" value="Update
Settings">
diff -ur html.old/functions.php
html/functions.php
--- html.old/functions.php
2006-12-11
21:07:57.000000000 -0800
+++ html/functions.php
2007-05-03
21:00:30.000000000 -0700
@@ -1922,10 +1922,11
@@
}
//**************************************************************************
-function
writeQinfo($fileName,$command)
+function
writeQinfo($fileName,$command,$savepath)
{
$fp =
fopen($fileName.".Qinfo","w");
-
fwrite($fp, $command);
+ fwrite($fp,
$command."\n");
+ fwrite($fp,
$savepath);
fflush($fp);
fclose($fp);
}
@@ -2188,7 +2189,8
@@
if (checkQManager()
== 0)
{
- $cmd1 =
"cd " . $cfg["path"] . "TFQUSERNAME";
+
//$cmd1 = "cd " . $cfg["path"] .
"TFQUSERNAME";
+ $cmd1 = "cd " .
"TFQSAVEPATH";
if (!
array_key_exists("pythonCmd",$cfg))
{
@@ -2200,14 +2202,14 @@
insertSetting("debugTorrents",false);
}
-
if (!$cfg["debugTorrents"])
-
{
-
$pyCmd = $cfg["pythonCmd"] . " -OO";
-
}
-
else
- {
-
$pyCmd =
$cfg["pythonCmd"];
-
}
+ if
(!$cfg["debugTorrents"])
+ {
+
$pyCmd = $cfg["pythonCmd"] .
" -OO";
+ }
+
else
+ {
+
$pyCmd = $cfg["pythonCmd"];
+
}
$btphp
= "'" . $cmd1. "; HOME=".$cfg["path"]."; export HOME;
nohup " . $pyCmd . " " .$cfg["btphpbin"] . "
'";
$command =
$pyCmd . " " . $cfg["tfQManager"] . "
".$cfg["torrent_file_path"]."queue/
".escapeshellarg($maxServerThreads)."
".escapeshellarg($maxUserThreads)."
".escapeshellarg($sleepInterval)." ".$btphp." >
/dev/null &";
@@ -2668,4 +2670,76 @@
}
}
}
+
+function dirTree2($dir,
$maxdepth)
+{
+ echo
"<option
value=\"".$dir."\">".$dir."</option>\n"
;
+ if (is_numeric
($maxdepth))
+
{
+
if ($maxdepth == 0)
+
{
+
$last = exec ("du ".$dir." | cut -f 2- |
sort", $retval) ;
+
for ($i
= 1; $i < (count ($retval) - 1); $i++)
+
{
+
echo "<option
value=\"".$retval[$i]."\">".$retval[$i]."</option>\n"
;
+
}
+
}
+
else if
($maxdepth > 0)
+
{
+
$last = exec ("du --max-depth=".$maxdepth."
".$dir." | cut -f 2- | sort", $retval) ;
+
for ($i = 1; $i < (count
($retval) - 1); $i++)
+
{
+
echo "<option
value=\"".$retval[$i]."\">".$retval[$i]."</option>\n"
;
+
}
+
}
+
else
+
{
+
echo
"<option
value=\"".$dir."\">".$dir."</option>\n"
;
+
}
+ }
+
else
+
{
+
echo "<option
value=\"".$dir."\">".$dir."</option>\n"
;
+ }
+
return $retval
;
+}
+
+//*********************************************************
+//
ensureDownloadDir()
+function
ensureDownloadDir($path)
+{
+ $plen =
strlen($path)-1;
+ $lpos =
strrpos($path,"/");
+ if ($lpos ===
false)
+ return false;
+
if($lpos == $plen) {
+ $path =
substr($path,0,$plen);
+ $lpos =
strrpos($path,"/");
+ }
+ $parent_dir
= substr($path,0,$lpos);
+ if
(!is_dir($path))
+ {
+
if (is_writable($parent_dir))
+
{
+
mkdir($path,
0777);
+
return true;
+
}
+ else if
(is_dir($parent_dir)) // is a dir but can't write to
it
+
{
+
return false;
+
}
+
else
+
{
+
if (ensureDownloadDir($parent_dir))
+
{
+
mkdir($path,
0777);
+
return true;
+
}
+
else
+
return false;
+
}
+ }
+ return
true;
+}
+
?>
diff -ur
html.old/index.php html/index.php
---
html.old/index.php
2006-12-11 21:48:54.000000000 -0800
+++
html/index.php
2007-05-03 21:00:30.000000000 -0700
@@ -198,29
+198,39 @@
$alias =
getAliasName($torrent);
$owner = getOwner($torrent);
+
$savepath =
getRequestVar('savepath') ;
+
if
(empty($savepath))
+
{
+
$savepath = $cfg['path'].$owner
;
+
}
+
// The following lines of code were
suggested by Jody Steele jmlsteele@stfu.ca
// This is to help manage
user downloads by their user names
//if the user's path doesnt exist,
create it
- if
(!is_dir($cfg["path"]."/".$owner))
-
{
-
if (is_writable($cfg["path"]))
-
{
-
mkdir($cfg["path"]."/".$owner, 0777);
-
}
-
else
-
{
-
AuditAction($cfg["constants"]["error"], "Error -- " .
$cfg["path"] . " is not writable.");
-
if
(IsAdmin())
-
{
-
header("location:
admin.php?op=configSettings");
-
exit();
-
}
-
else
-
{
-
$messages .= "<b>Error</b> TorrentFlux
settings are not correct (path is not writable) --
please contact an admin.<br>";
-
}
-
}
-
}
+ if
(!ensureDownloadDir($savepath))
+
{
+
AuditAction($cfg["constants"]["error"], "Error -- " .
$cfg["path"] . " is not writable.");
+
if
($cfg['path'].$owner == $savepath)
+
{
+
if
(IsAdmin())
+
{
+
header("location:
admin.php?op=configSettings");
+
exit();
+
}
+
else
+
{
+
$messages .=
"<b>Error</b> TorrentFlux settings are not
correct (path is not writable) -- please contact an
admin.<br>";
+
header("location:
startpop.php?torrent=".$torrent."&messages=".$messages);
+
exit();
+
}
+
}
+
else
+
{
+
$messages
.= "<b>Error</b> -- ".$savepath." is not
writable<br>";
+
header("location:
startpop.php?torrent=".$torrent."&messages=".$messages);
+
exit();
+
}
+
}
// create AliasFile object and write out the stat
file
$af = new
AliasFile($cfg["torrent_file_path"].$alias.".stat",
$owner);
@@ -278,7 +288,8 @@
$pyCmd =
escapeshellarg($cfg["pythonCmd"]);
}
-
$command = "cd " . $cfg["path"] .
$owner . "; HOME=".$cfg["path"]."; export HOME; nohup "
. $pyCmd . " " .escapeshellarg($cfg["btphpbin"]) . " " .
$command;
+
//$command = "cd " . $cfg["path"] . $owner
. "; HOME=".$cfg["path"]."; export HOME; nohup " .
$pyCmd . " " .escapeshellarg($cfg["btphpbin"]) . " " .
$command;
+
$command =
"cd " . $savepath . "; HOME=".$cfg["path"]."; export
HOME; nohup " . $pyCmd . " "
.escapeshellarg($cfg["btphpbin"]) . " " .
$command;
}
}
@@ -295,7 +306,7 @@
if($af->running ==
"3")
{
-
writeQinfo($cfg["torrent_file_path"]."queue/".$alias.".stat",$command);
+
writeQinfo($cfg["torrent_file_path"]."queue/".$alias.".stat",$command,$savepath);
AuditAction($cfg["constants"]["queued_torrent"],
$torrent."<br>Die:".$runtime.",
Sharekill:".$sharekill.", MaxUploads:".$maxuploads.",
DownRate:".$drate.", UploadRate:".$rate.",
Ports:".$minport."-".$maxport.",
SuperSeed:".$superseeder.", Rerequest
Interval:".$rerequest);
AuditAction($cfg["constants"]["queued_torrent"],
$command);
}
@@
-677,7 +688,7 @@
}
function
StartTorrent(name_file)
{
-
myWindow = window.open
(name_file,'_blank','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no,width=700,height=530')
+
myWindow = window.open
(name_file,'_blank','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=no,width=700,height=<?php
echo
($cfg["showdirtree"]?'670':'530')?>')
}
function
ConfirmDelete(file)
{
diff -ur
html.old/setpriority.php html/setpriority.php
---
html.old/setpriority.php
2006-10-19 06:54:26.000000000 -0700
+++
html/setpriority.php
2007-05-03 21:00:30.000000000 -0700
@@ -53,8
+53,9 @@
$fileName
=
$cfg["torrent_file_path"].$alias.".prio";
$result = array();
-
$files = array();
-
$files =
array_filter(getRequestVar('files'),"getFile");
+
$files =
getRequestVar('files');
+
if ($files !=
'')
+
$files =
array_filter($files,"getFile");
// if there are files to get
then process and create a prio file.
if (count($files) > 0)
diff
-ur html.old/startpop.php html/startpop.php
---
html.old/startpop.php
2006-12-11 19:29:46.000000000 -0800
+++
html/startpop.php
2007-05-03 21:00:30.000000000 -0700
@@ -163,6
+163,19 @@
<body bgcolor="<?php echo
$cfg["body_data_bg"];
?>">
<div
align="center">
+<?php
+$messages =
$_REQUEST["messages"];
+if ($messages !=
"")
+{
+?>
+<table border="1"
cellpadding="10"
bgcolor="#ff9b9b">
+<tr>
+
<td><div align="center"><?php echo
$messages
?></div></td>
+</tr>
+</table><br><br>
+<?php
+}
+?>
<strong><?php
echo $displayName
?></strong><br>
<table
width="98%" border="0" cellpadding="0"
cellspacing="0">
<tr><form
name="theForm" target="_parent" action="index.php"
method="POST">
@@ -233,7 +246,29 @@
<tr>
<td colspan="4"
align="center"><div ID="sharekiller"
align="center" style="visibility:hidden;">Keep
seeding until Sharing is: <input type="Text"
name="sharekill" maxlength="4" size="4" value="<?php
echo $cfg["sharekill"]; ?>">%<font
class="tiny"> (0% will keep
seeding)</font> </div></td>
</tr>
+
<?php
+
if ($cfg["showdirtree"])
+
{ ?>
+
<tr>
+
<td colspan="4" align="center">
+
<table>
+
<tr>
+
<td aligh="right">Save
Path:</td>
+
<td colspan="3"><input type="text"
name="savepath" size="45" value="<?php echo
$cfg["path"].getOwner($torrent).'/'
;?>"></td>
+
</tr>
+
<tr>
+
<td align="right">Or use this
path:</td>
+
<td colspan="3">
+
<select style="width:300px;"
onChange="savepath.value=
this.options[this.selectedIndex].value">
+
<?php $arDirTree = dirTree2
($cfg["path"].getOwner($torrent).'/', $cfg["maxdepth"])
; ?>
+
</select>
+
</td>
+
</tr>
+
</table>
+ <?php
} ?>
</table>
+
</td>
+
</tr>
<br>
Torrent Meta Data /
Priority Selection:
</td>
diff -ur
html.old/TF_BitTornado/tfQManager.py
html/TF_BitTornado/tfQManager.py
---
html.old/TF_BitTornado/tfQManager.py
2006-11-15
20:23:45.000000000 -0800
+++
html/TF_BitTornado/tfQManager.py
2007-05-03
21:00:30.000000000 -0700
@@ -10,7 +10,7
@@
from time import time,
strftime
import thread, threading,
time
-DEBUG = False
+DEBUG =
True
if __debug__:
LOGFILE=open(argv[1]+"tfQManager.log","w")
@@
-113,6 +113,7 @@
cmdToRun =
getCommandToRun(currentFile)
#if __debug__: traceMsg(" Cmd
:" + cmdToRun)
+
dirToRunIn =
getDirToRunIn(currentFile)
if
(re.search(currentUser,cmdToRun) == 0):
if
__debug__: traceMsg("Incorrect User found in Cmd")
@@
-124,8 +125,9 @@
cmdToRun = execPath +
cmdToRun
cmdToRun = cmdToRun.replace('TFQUSERNAME',
currentUser)
-
#if __debug__: traceMsg(" Cmd :" +
cmdToRun)
-
+
cmdToRun = cmdToRun.replace('TFQSAVEPATH',
dirToRunIn)
+
if __debug__: traceMsg(" Cmd :" +
cmdToRun)
+
if cmdToRun != "":
#PrepStatsFile
updateStats(statsFile,
'1')
@@ -346,6 +348,24 @@
return
cmdToExec
+def
getDirToRunIn(currentFile):
+
+ if __debug__:
traceMsg("->getDirToRunIn (" + currentFile +
")")
+
+ #Open the File and return
the Dir.
+ dirToRunIn =
""
+
+ try:
+
f=open(currentFile,'r')
+
f.readline()
+
dirToRunIn = f.readline()
+
f.close
+
+
except:
+ dirToRunIn =
""
+
+ return
dirToRunIn
+
def
getFileList(fDirectory):
Author