718itbiz/tpbproxy
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request 'private' (#10) from private into master

Browse Source 
Reviewed-on: #10
This commit was merged in pull request #10.
This commit is contained in:
William Mantly
2025-11-17 18:35:56 +00:00
parent c0c33b8859 331298825e
commit b30fe748b2
4 changed files with 63 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conf/base.js
View File

@@ -22,5 +22,6 @@ module.exports = {
port: 9091, port: 9091,
username: 'william', username: 'william',
password: '__IN SRECREST FILE__', password: '__IN SRECREST FILE__',
statusUpdateInterval: 500,
} }
}; };

10
controller/torrent.js
View File

@@ -2,8 +2,7 @@
const ps = require('./pubsub.js'); const ps = require('./pubsub.js');
const {Torrent} = require('>/models'); const {Torrent} = require('>/models');
const conf = require('>/conf');
console.log('here!!!!!!!!!!!!!')
let statusLock = false; let statusLock = false;
setInterval(async function(){ setInterval(async function(){
@@ -17,9 +16,4 @@ setInterval(async function(){
// console.error('status interval error', error) // console.error('status interval error', error)
} }
statusLock = false statusLock = false
}, 10000, statusLock); }, conf.transmission.statusUpdateInterval, statusLock);
// ps.subscribe(/./g, function(...args){
// console.log('event', args);
// });

4
models/sql/torrent.js
View File

@@ -36,9 +36,10 @@ module.exports = (sequelize, DataTypes, Model) => {
// console.log('instance', instance) // console.log('instance', instance)
await this.build(data).validate(); await this.build(data).validate();
// console.log('validate', val); // console.log('validate', val);
data.isPrivate = data.isPrivate === 'true' ? true : false;
let options = { 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); let res = await tr_client.addUrl(data.magnetLink, options);
@@ -46,6 +47,7 @@ module.exports = (sequelize, DataTypes, Model) => {
return await super.create({ return await super.create({
magnetLink: data.magnetLink, magnetLink: data.magnetLink,
hashString: res.hashString, hashString: res.hashString,
isPrivate: data.isPrivate,
name: res.name, name: res.name,
added_by: data.added_by, added_by: data.added_by,
status: 0, status: 0,

112
public/partial/header.html
View File

@@ -55,6 +55,8 @@
<!-- <!--
Dialog boxes to be displayed Dialog boxes to be displayed
Login Dialog
--> -->
<div id="tbp_proxy_login_dialog" title="SSO Login"> <div id="tbp_proxy_login_dialog" title="SSO Login">
@@ -101,7 +103,6 @@
<style type="text/css"> <style type="text/css">
#tbp_proxy_torrent_dialog{ #tbp_proxy_torrent_dialog{
padding: 0; padding: 0;
overflow-x: scroll;
} }
#tbp_proxy_torrent_dialog progress{ #tbp_proxy_torrent_dialog progress{
@@ -111,7 +112,7 @@
#tbp_proxy_torrent_dialog ul{ #tbp_proxy_torrent_dialog ul{
height: 400px; height: 400px;
overflow-y: scroll; /*overflow-y: scroll;*/
list-style-type: none; list-style-type: none;
padding-left: 0; padding-left: 0;
margin-top: 0; margin-top: 0;
@@ -219,7 +220,8 @@
<form action="torrent" method="post" onsubmit="formAJAX(this)" evalAJAX=" <form action="torrent" method="post" onsubmit="formAJAX(this)" evalAJAX="
app.publish('torrent:add', {...data, __noSocket: true}); app.publish('torrent:add', {...data, __noSocket: true});
$('#tbp_proxy_torrent_add_dialog').dialog('close'); $('#tbp_proxy_torrent_add_dialog').dialog('close');
openDialog($('#tbp_proxy_torrent_dialog')) openDialog($('#tbp_proxy_torrent_dialog'));
savePrivateState(data, this);
"> ">
<p> <p>
<label for="_name">Name:</label> <label for="_name">Name:</label>
@@ -240,13 +242,11 @@
</p> </p>
<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> <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="radio-1" value="false" checked readonly/> <input type="radio" name="isPrivate" id="isPrivate-true" value="true" />
<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/>
</p> </p>
<p style="display:none"> <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"> <div id="tbp_proxy_header_right">
@@ -287,42 +287,37 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var commonDialogOptions = { 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, autoOpen: false,
resizable: false, resizable: false,
closeOnEscape: true, closeOnEscape: true,
draggable: false, draggable: false,
width: 'auto', // maxWidth: document.body.clientWidth,
// width: 'auto',
}; };
/* Login Button and dialog*/ /* Login Button and dialog*/
$( "#tbp_proxy_login_dialog" ).dialog(commonDialogOptions); $('#tbp_proxy_login_dialog').dialog(commonDialogOptions);
$( "#tbp_proxy_login_dialog_opener" ).on( "click", function() { $('#tbp_proxy_login_dialog_opener').on('click', function() {
// https://stackoverflow.com/a/6500385 openDialog($('#tbp_proxy_login_dialog'));
$( "#tbp_proxy_login_dialog" ).parent().css({position:"fixed", 'margin-right': "2em", 'margin-top': '3em'}).end().dialog( "open" );
}); });
/* Torrent list button and 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() { $('#tbp_proxy_torrent_dialog_opener').on('click', function() {
if($( "#tbp_proxy_torrent_dialog" ).dialog( "isOpen" )){ if($('#tbp_proxy_torrent_dialog').dialog('isOpen')){
$( "#tbp_proxy_torrent_dialog" ).dialog( "close" ) $('#tbp_proxy_torrent_dialog').dialog('close')
}else{ }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 */ /* Torrent add button and dialog */
$( "#tbp_proxy_torrent_add_dialog" ).dialog({ $('#tbp_proxy_torrent_add_dialog').dialog(commonDialogOptions);
modal: true,
height: 300,
...commonDialogOptions
});
/* Enable tooltips*/ /* Enable tooltips*/
@@ -333,7 +328,7 @@
app.auth.isLoggedIn(function(error, data){ app.auth.isLoggedIn(function(error, data){
if(data){ if(data){
$("body").on('click', 'img.718link', function(el){ $('body').on('click', 'img.718link', function(event){
// magnetLink // magnetLink
let magnetLinkParams = new URLSearchParams($(this).data('link')); let magnetLinkParams = new URLSearchParams($(this).data('link'));
@@ -343,14 +338,20 @@
hashString: magnetLinkParams.get('magnet:?xt').split(':').pop().toLowerCase(), 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 // Look for
$('a').each(function(idx, el){ $('a').each(function(idx, el){
var $el = $(el); var $el = $(el);
if($el.attr('href') && $el.attr('href').match("magnet:?")){ 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')+'"/>') $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.subscribe('torrent:server:status', function(data, topic){
app.torrent.isDown = false 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)); $.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 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.subscribe('torrent:server:status:down', function(data, topic){
app.torrent.isDown = true app.torrent.isDown = true
$('#tbp_proxy_torrent_dialog_opener').css('background', "red") $('#tbp_proxy_torrent_dialog_opener').css('background', 'red')
}); });
listTorrents(); listTorrents();
setInterval(refreshTorrents, 5000); setInterval(refreshTorrents, 1000);
app.torrent.migrate(); 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) { function humanFileSize(size) {
var i = size == 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024)); 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]; return (size / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + ['B', 'kB', 'MB', 'GB', 'TB'][i];
} }
function openDialog($el){ function openDialog($el){
// https://stackoverflow.com/a/6500385
$el.parent().css({ $el.parent().css({
position:"fixed", 'margin-right': "2em", 'margin-top': '3em' position: 'fixed',
'margin-right': '2em',
'margin-top': '3em'
}).end().dialog('open'); }).end().dialog('open');
} }
@@ -417,9 +430,9 @@
let isDown = false; let isDown = false;
// Dont spam the server if its not online // 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){ if(res.url.startsWith('/__api/torrent') && isDown){
ajax.abort() ajax.abort();
} }
}); });
@@ -475,7 +488,7 @@
...data, ...data,
"downloadSpeed": humanFileSize(data.downloadSpeed)+'/s', "downloadSpeed": humanFileSize(data.downloadSpeed)+'/s',
"uploadSpeed": humanFileSize(data.uploadSpeed)+'/s', "uploadSpeed": humanFileSize(data.uploadSpeed)+'/s',
/* "activeTorrentCount": 11, /* 'activeTorrentCount": 11,
"cumulative-stats": { "cumulative-stats": {
"downloadedBytes": 2925927098021, "downloadedBytes": 2925927098021,
"filesAdded": 80609, "filesAdded": 80609,
@@ -509,25 +522,6 @@
"isFinished": torrent.isFinished || percentDone === 100, "isFinished": torrent.isFinished || percentDone === 100,
"createdAtString": moment(torrent.createdAt).fromNow(), "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",
} }
} }