Merge pull request #2138 from fbdtemme/master

Add option to create hybrid torrents

plugins/create/action.php

@@ -115,6 +115,10 @@ static public function getTrackerDomain($announce)
 					if($useExternal=="mktorrent")
 						$piece_size = log($piece_size,2);
 					else
+
+					if(isset($_REQUEST['hybrid']))
+						$hybrid = TRUE;
+
 					if($useExternal===false)
 						$useExternal = "inner";
 					$task = new rTask( array
@@ -128,17 +132,21 @@ static public function getTrackerDomain($announce)
 						'source'=>$_REQUEST['source'],
 						'start_seeding'=>$_REQUEST['start_seeding'],
 						'piece_size'=>$_REQUEST['piece_size'],
-						'private'=>$_REQUEST['private']
+						'private'=>$_REQUEST['private'],
+						'hybrid'=>$_REQUEST['hybrid'],
 					) );
 					$commands = array();
+
 					$commands[] = escapeshellarg($rootPath.'/plugins/create/'.$useExternal.'.sh')." ".
-						$task->id." ".
-						escapeshellarg(getPHP())." ".
-						escapeshellarg($pathToCreatetorrent)." ".
-						escapeshellarg($path_edit)." ".
-						$piece_size." ".
-						escapeshellarg(getUser())." ".
-						escapeshellarg(rTask::formatPath($task->id));
+					$task->id." ".
+					escapeshellarg(getPHP())." ".
+					escapeshellarg($pathToCreatetorrent)." ".
+					escapeshellarg($path_edit)." ".
+					$piece_size." ".
+					escapeshellarg(getUser())." ".
+					escapeshellarg(rTask::formatPath($task->id))." ".
+					escapeshellarg($hybrid);
+
 					$commands[] = '{';
 					$commands[] = 'chmod a+r "${dir}"/result.torrent';
 					$commands[] = '}';						

plugins/create/conf.php

@@ -8,6 +8,7 @@
 				// "createtorrent" - use program createtorrent (see http://www.createtorrent.com)
 				// "mktorrent" - use program mktorrent (see http://mktorrent.sourceforge.net)
 				// "buildtorrent" - use program buildtorrent (see http://claudiusmaximus.goto10.org/cm/torrent.html)
+				// "torrenttools" - use program torrenttools (see http://github.com/fbdtemme/torrenttools)
 $pathToCreatetorrent = '';	// Something like /bin/createtorrent, or /bin/transmissioncli. If empty, program will be found in PATH.
 
 $recentTrackersMaxCount = 15;

plugins/create/init.js

@@ -20,7 +20,8 @@ theWebUI.checkCreate = function()
 		"comment" : $.trim($("#comment").val()),
 		"source" : $.trim($("#source").val()),
 		"private" : $('#private').prop('checked') ? 1 : 0,
-		"start_seeding" : $('#start_seeding').prop('checked') ? 1 : 0		
+		"start_seeding" : $('#start_seeding').prop('checked') ? 1 : 0,
+		"hybrid" : $('#hybrid').prop('checked') ? 1 : 0,
 	},
 	{
 	       	noclose: true
@@ -116,6 +117,13 @@ plugin.onLangLoaded = function()
 		if(plugin.hidePieceSize)
 			pieceSize = "";	
 
+		var hybridTorrent = 
+				"<label for='hybrid' id='lbl_hybrid' class='nomargin'>"+
+				"<input type='checkbox' name='hybrid' id='hybrid'/>"+theUILang.HybridTorrent+"</label>";
+
+		if(plugin.hideHybrid)
+			hybridTorrent = "";	
+
 		theDialogManager.make("tcreate",theUILang.CreateNewTorrent,
 			"<div class='cont fxcaret'>"+
 				"<fieldset>"+
@@ -136,7 +144,8 @@ plugin.onLangLoaded = function()
 				"<fieldset>"+
 					"<legend>"+theUILang.Other+"</legend>"+
 					"<label for='start_seeding' id='lbl_start_seeding' class='nomargin'><input type='checkbox' name='start_seeding' id='start_seeding'/>"+theUILang.StartSeeding+"</label>"+
-					"<label class='nomargin'><input type='checkbox' name='private' id='private'/>"+theUILang.PrivateTorrent+"</label><br/>"+
+					"<label class='nomargin'><input type='checkbox' name='private' id='private'/>"+theUILang.PrivateTorrent+"</label>"+
+					hybridTorrent+"<br/>"+
 				"</fieldset>"+
 			"</div>"+
 			"<div class='aright buttons-list'><input type='button' id='recentTrackers' value='"+theUILang.recentTrackers+"...' class='Button menuitem' onclick='theWebUI.showRecentTrackers()'/><input type='button' id='torrentCreate' value='"+theUILang.torrentCreate+"' class='OK Button' onclick='theWebUI.checkCreate()'/><input type='button' class='Cancel Button' value='"+theUILang.Cancel+"'/></div>",true);		

plugins/create/init.php

@@ -12,6 +12,10 @@
 	{
 		if(($useExternal === "transmissioncli") || ($useExternal === "transmissioncreate"))
 			$jResult.="plugin.hidePieceSize = true;";
+
+		if (($useExternal !== "torrenttools"))
+			$jResult.="plugin.hideHybrid = true;";
+
 		$theSettings->registerPlugin($plugin["name"],$pInfo["perms"]);
 	}
 }

plugins/create/lang/cs.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/da.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/de.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
  theUILang.source			= "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/el.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "Η λειτουργία τερματίστηκε.";
  theUILang.recentTrackers		= "Πρόσφατοι trackers";
  theUILang.source			= "Πηγή";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/en.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
  theUILang.source			= "Source";
+ theUILang.HybridTorrent        	= "Hybrid torrent";
 
-thePlugins.get("create").langLoaded();
+thePlugins.get("create").langLoaded();

plugins/create/lang/es.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "El proceso fue detenido.";
  theUILang.recentTrackers		= "Recent trackers";
  theUILang.source			= "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/fi.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
  theUILang.source			= "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/fr.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "Le processus a été interrompu.";
  theUILang.recentTrackers		= "Trackers récents";
  theUILang.source			= "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/hu.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "Folyamat leállt.";
  theUILang.recentTrackers		= "Recent trackers";
  theUILang.source			= "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/it.js

@@ -26,5 +26,6 @@
  theUILang.torrentKilled		= "Il processo è stato arrestato.";
  theUILang.recentTrackers		= "Tracker recenti";
  theUILang.source			= "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/ko.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "중지";
  theUILang.torrentKilled		= "프로세스가 중지되었습니다.";
  theUILang.recentTrackers		= "최근 트래커";
- theUILang.source			= "원본";
+ theUILang.source			    = "원본";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/lv.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/nl.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "proces is gestopt.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/no.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stopp";
  theUILang.torrentKilled		= "Prosessen ble stoppet.";
  theUILang.recentTrackers		= "Siste trackere";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/pl.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Proces został zatrzymany.";
  theUILang.recentTrackers		= "Ostatnie trackery";
- theUILang.source			= "Źródło";
+ theUILang.source			    = "Źródło";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/pt.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/ru.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Остановить";
  theUILang.torrentKilled		= "Процесс остановлен.";
  theUILang.recentTrackers		= "Недавние трекеры";
- theUILang.source			= "Источник";
+ theUILang.source			    = "Источник";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/sk.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/sr.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/sv.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stoppa";
  theUILang.torrentKilled		= "Processen stoppades.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/tr.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source		    	= "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/uk.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Зупинити";
  theUILang.torrentKilled		= "Процес зупинено.";
  theUILang.recentTrackers		= "Недавні трекери";
- theUILang.source			= "Джерело";
+ theUILang.source			    = "Джерело";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/vi.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Dừng";
  theUILang.torrentKilled		= "Quá trình tạo torrent đã ngừng lại.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/zh-cn.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "停止";
  theUILang.torrentKilled		= "进程已停止.";
  theUILang.recentTrackers		= "最近的 trackers";
- theUILang.source			= "源";
+ theUILang.source			    = "源";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
 thePlugins.get("create").langLoaded();

plugins/create/lang/zh-tw.js

@@ -25,6 +25,7 @@
  theUILang.torrentKill			= "Stop";
  theUILang.torrentKilled		= "Process was stopped.";
  theUILang.recentTrackers		= "Recent trackers";
- theUILang.source			= "Source";
+ theUILang.source			    = "Source";
+ theUILang.HybridTorrent        = "Hybrid torrent";
 
-thePlugins.get("create").langLoaded();
+ thePlugins.get("create").langLoaded();

plugins/create/torrenttools.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $1 - taskNo
+# $2 - php
+# $3 - torrenttools
+# $4 - path
+# $5 - piecesize
+# $6 - user
+# $7 - dir
+# $8 - hybrid
+
+if [ ${8} ] ; then
+	protocol="hybrid"
+else
+	protocol="v1"
+fi
+
+"${3}" create -l ${5} -o "${7}/temp.torrent" --protocol "${protocol}" "${4}"
+
+last=$? 
+chmod a+r "${7}/temp.torrent"
+
+if [ $last -eq 0 ] ; then
+	echo 'Try to correct torrent file...'
+	cd "$(dirname $0)"
+	"${2}" ./correct.php ${1} "${6}"
+	last=$?
+	if [ $last -eq 0 ] ; then
+		echo 'Done.'
+	else
+		echo 'Error.'
+	fi
+fi
+exit $last