From 471911750439620d675a5d7fd507d6e4ad773b0a Mon Sep 17 00:00:00 2001
From: William Mantly <wmantly@gmail.com>
Date: Mon, 17 Nov 2025 13:34:35 -0500
Subject: [PATCH] Private session

---
 conf/base.js               |   1 +
 controller/torrent.js      |  10 +---
 models/sql/torrent.js      |   4 +-
 public/partial/header.html | 120 ++++++++++++++++++-------------------
 4 files changed, 63 insertions(+), 72 deletions(-)

diff --git a/conf/base.js b/conf/base.js
index 75fae2a..9cd61b9 100644
--- a/conf/base.js
+++ b/conf/base.js
@@ -22,5 +22,6 @@ module.exports = {
 		port: 9091,
 		username: 'william',
 		password: '__IN SRECREST FILE__',
+		statusUpdateInterval: 500,
 	}
 };
diff --git a/controller/torrent.js b/controller/torrent.js
index 6b175a5..de5e81c 100644
--- a/controller/torrent.js
+++ b/controller/torrent.js
@@ -2,8 +2,7 @@
 
 const ps = require('./pubsub.js');
 const {Torrent} = require('>/models');
-
-console.log('here!!!!!!!!!!!!!')
+const conf = require('>/conf');
 
 let statusLock = false;
 setInterval(async function(){
@@ -17,9 +16,4 @@ setInterval(async function(){
 		// console.error('status interval error', error)
 	}
 	statusLock = false
-}, 10000, statusLock);
-
-
-// ps.subscribe(/./g, function(...args){
-// 	console.log('event', args);
-// });
\ No newline at end of file
+}, conf.transmission.statusUpdateInterval, statusLock);
diff --git a/models/sql/torrent.js b/models/sql/torrent.js
index e89de83..11f3682 100644
--- a/models/sql/torrent.js
+++ b/models/sql/torrent.js
@@ -36,9 +36,10 @@ module.exports = (sequelize, DataTypes, Model) => {
         // console.log('instance', instance)
         await this.build(data).validate();
         // console.log('validate', val);
+        data.isPrivate = data.isPrivate === 'true' ? true : false;
 
         let options = {
-          'download-dir': data.isPrivate === 'true' ? `${conf.privateDownloadLocation}/${data.added_by}` : undefined,
+          'download-dir': data.isPrivate  ? `${conf.privateDownloadLocation}/${data.added_by}` : undefined,
         };
 
         let res = await tr_client.addUrl(data.magnetLink, options);
@@ -46,6 +47,7 @@ module.exports = (sequelize, DataTypes, Model) => {
         return await super.create({
           magnetLink: data.magnetLink,
           hashString: res.hashString,
+          isPrivate: data.isPrivate,
           name: res.name,
           added_by: data.added_by,
           status: 0,
diff --git a/public/partial/header.html b/public/partial/header.html
index 7fa1081..6f349d2 100644
--- a/public/partial/header.html
+++ b/public/partial/header.html
@@ -55,6 +55,8 @@
 
 <!-- 
 	Dialog boxes to be displayed
+
+	Login Dialog
  -->
 
 <div id="tbp_proxy_login_dialog" title="SSO Login">
@@ -101,7 +103,6 @@
 <style type="text/css">
 	#tbp_proxy_torrent_dialog{
 		padding: 0;
-		overflow-x: scroll;
 	}
 
 	#tbp_proxy_torrent_dialog progress{
@@ -111,7 +112,7 @@
 
 	#tbp_proxy_torrent_dialog ul{
 		height: 400px;
-		overflow-y: scroll;
+		/*overflow-y: scroll;*/
 		list-style-type: none;
 		padding-left: 0;
 		margin-top: 0;
@@ -219,7 +220,8 @@
 			<form action="torrent" method="post" onsubmit="formAJAX(this)" evalAJAX="
 				app.publish('torrent:add', {...data, __noSocket: true});
 				$('#tbp_proxy_torrent_add_dialog').dialog('close');
-				openDialog($('#tbp_proxy_torrent_dialog'))
+				openDialog($('#tbp_proxy_torrent_dialog'));
+				savePrivateState(data, this);
 			">
 				<p>
 					<label for="_name">Name:</label>
@@ -240,13 +242,11 @@
 				</p>
 
 				<p>
-				  <legend>Public Download:</legend>
+				  <label for="isPrivate-false" title="The download will appare in the communal download folder">Public:</label>
+				  <input type="radio" name="isPrivate" id="isPrivate-false" value="false" />
 
-				  <label for="radio-1" title="The download will appare in the communal download folder">Public</label>
-				  <input type="radio" name="isPrivate" id="radio-1" value="false" checked readonly/>
-
-				  <label for="radio-2" title="Only you(and the admins) will be able to see this download">Private</label>
-				  <input type="radio" name="isPrivate" id="radio-2" value="true" readonly/>
+				  <label for="isPrivate-true" title="Only you(and the admins) will be able to see this download">Private:</label>
+				  <input type="radio" name="isPrivate" id="isPrivate-true" value="true" />
 				</p>
 
 				<p style="display:none">
@@ -269,7 +269,7 @@
 
 
 <!-- 
-	The bar injected at the top of the page
+	Injected Header bar
  -->
 
 <div id="tbp_proxy_header_right">
@@ -285,55 +285,50 @@
 </div>
 
 <script type="text/javascript">
-	$( document ).ready(function() {
+	$(document).ready(function() {
 		var commonDialogOptions = {
-			position: { my: "left top", at: "left bottom", of: '#tbp_proxy_header_right' },
+			position: { my: 'left top', at: 'left bottom', of: '#tbp_proxy_header_right' },
 			autoOpen: false,
 			resizable: false,
 			closeOnEscape: true,
 			draggable: false,
-			width: 'auto',
+			// maxWidth: document.body.clientWidth,
+			// width: 'auto',
 		};
 
 		/* Login Button and dialog*/
-		$( "#tbp_proxy_login_dialog" ).dialog(commonDialogOptions);
+		$('#tbp_proxy_login_dialog').dialog(commonDialogOptions);
 
-		$( "#tbp_proxy_login_dialog_opener" ).on( "click", function() {
-			// https://stackoverflow.com/a/6500385
-			$( "#tbp_proxy_login_dialog" ).parent().css({position:"fixed", 'margin-right': "2em", 'margin-top': '3em'}).end().dialog( "open" );
+		$('#tbp_proxy_login_dialog_opener').on('click', function() {
+			openDialog($('#tbp_proxy_login_dialog'));
 		});
 
 
 		/* Torrent list button and dialog */
-		$( "#tbp_proxy_torrent_dialog" ).dialog(commonDialogOptions);
+		$('#tbp_proxy_torrent_dialog').dialog(commonDialogOptions);
 
-		$( "#tbp_proxy_torrent_dialog_opener" ).on( "click", function() {
-			if($( "#tbp_proxy_torrent_dialog" ).dialog( "isOpen" )){
-				$( "#tbp_proxy_torrent_dialog" ).dialog( "close" )
+		$('#tbp_proxy_torrent_dialog_opener').on('click', function() {
+			if($('#tbp_proxy_torrent_dialog').dialog('isOpen')){
+				$('#tbp_proxy_torrent_dialog').dialog('close')
 			}else{
-				$( "#tbp_proxy_torrent_dialog" ).parent().css({position:"fixed", 'margin-right': "2em", 'margin-top': '3em'}).end().dialog( "open" );
-
+				openDialog($('#tbp_proxy_torrent_dialog'));
 			}
 		});
 
 
 		/* Torrent add button and dialog */
-		$( "#tbp_proxy_torrent_add_dialog" ).dialog({
-			modal: true,
-			height: 300,
-			...commonDialogOptions
-		});
+		$('#tbp_proxy_torrent_add_dialog').dialog(commonDialogOptions);
 
 
 		/* Enable tooltips*/
-		$( '#tbp_proxy_header' ).tooltip({
+		$('#tbp_proxy_header').tooltip({
 		  track: true
 		});
 
 		app.auth.isLoggedIn(function(error, data){
 			if(data){
 
-				$("body").on('click', 'img.718link', function(el){
+				$('body').on('click', 'img.718link', function(event){
 					// magnetLink 
 					let magnetLinkParams = new URLSearchParams($(this).data('link'));
 
@@ -343,14 +338,20 @@
 						hashString: magnetLinkParams.get('magnet:?xt').split(':').pop().toLowerCase(),
 					});
 
-					$('#tbp_proxy_torrent_add_dialog').parent().css({position:"fixed", 'margin-right': "2em", 'margin-top': '3em'}).end().dialog('open');
+					if(localStorage.getItem('isPrivate') === 'true'){
+						$('#isPrivate-true').prop('checked', true);
+					}else{
+						$('#isPrivate-false').prop('checked', true);
+					}
+
+					openDialog($('#tbp_proxy_torrent_add_dialog'));
 				});
 				
 				// Look for
 				$('a').each(function(idx, el){
 					var $el = $(el);
-					if($el.attr('href') && $el.attr('href').match("magnet:?")){
-						$el.replaceWith('<img class="tbp_proxy_is_authed 718link" src="/__static/img/Transmission_Icon.svg" height=24 width=24 data-link="'+$el.attr('href')+'"/>')
+					if($el.attr('href') && $el.attr('href').match('magnet:?')){
+						$el.before(`<img class="tbp_proxy_is_authed 718link" src="/__static/img/Transmission_Icon.svg" height=24 width=24 data-link="${$el.attr('href')}"/>`)
 					}
 				});
 
@@ -360,35 +361,47 @@
 
 				app.subscribe('torrent:server:status', function(data, topic){
 					app.torrent.isDown = false
-					$('#tbp_proxy_torrent_dialog_opener').css('background', "lightseagreen")
+					$('#tbp_proxy_torrent_dialog_opener').css('background', 'lightseagreen')
 					$.scope.tbp_proxy_torrent_dialog_opener_status.update(app.torrent.parseServerStatus(data));
 				});
 
-				app.subscribe(`app:api:error:555`, function(data, topics){
+				app.subscribe('app:api:error:555', function(data, topics){
 					app.torrent.isDown = true
-					$('#tbp_proxy_torrent_dialog_opener').css('background', "red") 
+					$('#tbp_proxy_torrent_dialog_opener').css('background', 'red') 
 				});
 
 				app.subscribe('torrent:server:status:down', function(data, topic){
 					app.torrent.isDown = true
-					$('#tbp_proxy_torrent_dialog_opener').css('background', "red")
+					$('#tbp_proxy_torrent_dialog_opener').css('background', 'red')
 				});
 
 				listTorrents();
-				setInterval(refreshTorrents, 5000);
+				setInterval(refreshTorrents, 1000);
 				app.torrent.migrate();
 			}
 		});
 	});
 
+	function savePrivateState(data){
+		localStorage.setItem('isPrivate', data.isPrivate);
+		if(data.isPrivate){
+			$('#isPrivate-true').prop('checked', true);
+		} else {
+			$('#isPrivate-false').prop('checked', true);
+		}
+	}
+
 	function humanFileSize(size) {
 		var i = size == 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024));
 		return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
 	}
 
 	function openDialog($el){
+		// https://stackoverflow.com/a/6500385
 		$el.parent().css({
-			position:"fixed", 'margin-right': "2em", 'margin-top': '3em'
+			position: 'fixed',
+			'margin-right': '2em',
+			'margin-top': '3em'
 		}).end().dialog('open');
 	}
 
@@ -417,11 +430,11 @@
 		let isDown = false;
 
 		// Dont spam the server if its not online
-		$( document ).on( "ajaxSend", function(event, ajax, res, ...args) {
+		$(document).on('ajaxSend', function(event, ajax, res, ...args) {
 			if(res.url.startsWith('/__api/torrent') && isDown){
-				ajax.abort()
+				ajax.abort();
 			}
-		} );
+		});
 
 		statusMap = [
 		  'Inactive', // 0
@@ -475,7 +488,7 @@
 				...data,
 				"downloadSpeed": humanFileSize(data.downloadSpeed)+'/s',
 				"uploadSpeed": humanFileSize(data.uploadSpeed)+'/s',
-/*      "activeTorrentCount": 11,
+/*      'activeTorrentCount": 11,
 				"cumulative-stats": {
 					"downloadedBytes": 2925927098021,
 					"filesAdded": 80609,
@@ -509,30 +522,11 @@
 				"isFinished": torrent.isFinished || percentDone === 100,
 				"createdAtString": moment(torrent.createdAt).fromNow(),
 				
-				// "createdAt": "2024-01-05T21:18:30.607Z",
-				// "isFinished": false,
-				// "isStalled": false,
-				// "name": "reacher.s02e06.1080p.web.h264-successfulcrab[EZTVx.to].mkv",
-				// "hashString": "4794a0915cada6c491eb5c910e1f4a0da727cac8",
-				// "status": 4,
-				// "id": 1,
-
-				// "peersConnected": 50,
-				// "added_by": "wmantly",
-				// "errorString": "",
-
-				// "downloadDir": "/media/torrents",
-				// "files": [],
-				// "peers": [],
-				// "magnetLink": "magnet:?xt=urn:btih:4794A0915CADA6C491EB5C910E1F4A0DA727CAC8&dn=Reacher+S02E06+1080p+WEB+H264-SuccessfulCrab&tr=http%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2F47.ip-51-68-199.eu%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.me%3A2780%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2730%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2920%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fopentracker.i2p.rocks%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.dler.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce",
-				// "isPrivate": false,
-				// "updatedAt": "2024-01-05T21:32:54.493Z"
-				// "torrent_id": "454",
 			}
 		}
 
 		function migrate(){
-			let torrents = JSON.parse(window.localStorage.getItem('torrents') || '{}' ).list || [];
+			let torrents = JSON.parse(window.localStorage.getItem('torrents') || '{}').list || [];
 
 			if(torrents.length){
 				console.log(`Migrating ${torrents.length}`)