This commit is contained in:
William Mantly 2024-01-07 00:30:53 -05:00
parent 7fad640cca
commit 1c7e2e794e
5 changed files with 548 additions and 413 deletions

View File

@ -3,13 +3,9 @@
module.exports = { module.exports = {
async up(queryInterface, Sequelize) { async up(queryInterface, Sequelize) {
await queryInterface.createTable('Torrents', { await queryInterface.createTable('Torrents', {
id: {
allowNull: false,
autoIncrement: true,
primaryKey: true,
type: Sequelize.INTEGER
},
hashString: { hashString: {
primaryKey: true,
allowNull: false,
type: Sequelize.STRING type: Sequelize.STRING
}, },
magnetLink: { magnetLink: {

View File

@ -53,12 +53,47 @@ module.exports = (sequelize, DataTypes, Model) => {
} }
} }
static async migrate(hashString, username){
try{
let exists = await this.findByPk(hashString);
if(exists){
console.log('torrent in DB, skipping')
return {}
}
let res = ( await tr_client.get(hashString, [
"eta", "percentDone", "status", "rateDownload",
"errorString", "hashString", 'name',
'downloadDir',
'addedDate',
'magnetLink',
'files', //array of files
'filesStats', // array of files with status
'isFinished',
'isStalled',
'peers',
'peersConnected', // array of peers,
'sizeWhenDone',
]) ).torrents[0];
// console.log('date:', res.addedDate, new Date(res.addedDate*1000), 'res:', res)
let instance = await this.build({createdAt: new Date(res.addedDate*1000), ...res, added_by: username});
await instance.save();
return {...res, ...instance.dataValues};
}catch(error){
console.error('migrate error', error);
}
}
async getTorrentData(noUpdate){ async getTorrentData(noUpdate){
try{ try{
let res = ( await tr_client.get(this.hashString, [ let res = ( await tr_client.get(this.hashString, [
"eta", "percentDone", "status", "rateDownload", "eta", "percentDone", "status", "rateDownload",
"errorString", "hashString", 'name', "errorString", "hashString", 'name',
'downloadDir', 'downloadDir',
'dateCreated',
'files', //array of files 'files', //array of files
'filesStats', // array of files with status 'filesStats', // array of files with status
'isFinished', 'isFinished',
@ -100,6 +135,11 @@ module.exports = (sequelize, DataTypes, Model) => {
} }
} }
Torrent.init({ Torrent.init({
hashString: {
type: DataTypes.STRING,
allowNull: false,
primaryKey: true
},
magnetLink: { magnetLink: {
type: DataTypes.STRING, type: DataTypes.STRING,
allowNull: false, allowNull: false,
@ -112,7 +152,6 @@ module.exports = (sequelize, DataTypes, Model) => {
type: DataTypes.BOOLEAN, type: DataTypes.BOOLEAN,
defaultValue: false, defaultValue: false,
}, },
hashString: DataTypes.STRING,
name: DataTypes.STRING, name: DataTypes.STRING,
added_by: { added_by: {
type: DataTypes.STRING, type: DataTypes.STRING,
@ -137,6 +176,9 @@ module.exports = (sequelize, DataTypes, Model) => {
type: DataTypes.NUMBER, type: DataTypes.NUMBER,
allowNull: true, allowNull: true,
}, },
createdAt: {
type: DataTypes.DATE
},
}, { }, {
sequelize, sequelize,
modelName: 'Torrent', modelName: 'Torrent',

View File

@ -7,7 +7,7 @@
var make = function( element ){ var make = function( element ){
//construct array //construct array
function makeArray( input ){ function makeArray( input , index ){
var result = []; var result = [];
@ -25,6 +25,20 @@
configurable: true configurable: true
} ); } );
Object.defineProperty( result, "__jq_index", {
value: index,
writable: true,
enumerable: false,
configurable: true
} );
function removeEmpty(){
if(result.__jq_empty){
result.__jq_empty.remove();
delete result.__jq_empty;
}
}
result.splice = function(inputValue, ...args){ result.splice = function(inputValue, ...args){
//splice does all the heavy lifting by interacting with the DOM elements. //splice does all the heavy lifting by interacting with the DOM elements.
@ -88,6 +102,7 @@
//if there are fields to add to the array, add them //if there are fields to add to the array, add them
if( toAdd.length > 0 ){ if( toAdd.length > 0 ){
removeEmpty()
//$.each( toAdd, function( key, value ){ //$.each( toAdd, function( key, value ){
for(var I = 0; I < toAdd.length; I++){ for(var I = 0; I < toAdd.length; I++){
@ -176,7 +191,7 @@
result.indexOf = function( key, value ){ result.indexOf = function( key, value ){
if( !value ){ if( !value ){
value = arguments[0]; value = arguments[0];
key = this.__index; key = this.__jq_index;
} }
for ( var index = 0; index < this.length; ++index ) { for ( var index = 0; index < this.length; ++index ) {
if( this[index][key] === value ){ if( this[index][key] === value ){
@ -200,7 +215,7 @@
if( !update ){ if( !update ){
update = arguments[1]; update = arguments[1];
value = arguments[0]; value = arguments[0];
key = this.__index; key = this.__jq_index;
} }
var index = this.indexOf( key, value ); var index = this.indexOf( key, value );
@ -226,7 +241,7 @@
if( type === 'object' ){ if( type === 'object' ){
result.push( value ); result.push( value );
}else if( type === 'string' ){ }else if( type === 'string' ){
Object.defineProperty( result, "__index", { Object.defineProperty( result, "__jq_index", {
value: value, value: value,
writable: true, writable: true,
enumerable: false, enumerable: false,
@ -248,19 +263,23 @@
var $this = $( element ); var $this = $( element );
var repeatId = $this.attr( 'jq-repeat' ); var repeatId = $this.attr( 'jq-repeat' );
var index = $this.attr( 'jq-repeat-index' );
var tempId = repeatId + 'Template'; var tempId = repeatId + 'Template';
var templateId = $( '#' + tempId ).html(); var templateId = $( '#' + tempId ).html();
var empty = $(`[jq-repeat-defualt="${repeatId}"]`);
$this.removeAttr( 'jq-repeat' ); $this.removeAttr( 'jq-repeat' );
$this.removeAttr( 'jq-repeat-index' );
var template = element.outerHTML var template = element.outerHTML
$this.replaceWith( '<script type="x-tmpl-mustache" id="' + tempId + '" class="jq-repeat-' + repeatId + ' " jq-repeat-index="holder"><\/script>' ); $this.replaceWith( '<script type="x-tmpl-mustache" id="' + tempId + '" class="jq-repeat-' + repeatId + ' " jq-repeat-index="holder"><\/script>' );
Mustache.parse(templateId); // optional, speeds up future uses Mustache.parse(templateId); // optional, speeds up future uses
$.scope[repeatId] = makeArray($.scope[repeatId], index);
$.scope[repeatId] = makeArray($.scope[repeatId]); $.scope[repeatId].__rq_template = template;
$.scope[repeatId].__rq_template = template $.scope[repeatId].__jq_empty = empty;
}; };
$( document ).ready( function(){ $( document ).ready( function(){

View File

@ -8,6 +8,9 @@
<script src="/__static/js/app.js"></script> <script src="/__static/js/app.js"></script>
<style type="text/css"> <style type="text/css">
.ui-dialog{
padding: 0;
}
.ui-dialog .ui-dialog-title{ .ui-dialog .ui-dialog-title{
width: unset; width: unset;
} }
@ -99,59 +102,94 @@
#tbp_proxy_torrent_dialog{ #tbp_proxy_torrent_dialog{
padding: 0; padding: 0;
} }
#tbp_proxy_torrent_dialog progress{ #tbp_proxy_torrent_dialog progress{
width: 100%; width: 100%;
height: 2em; height: 2em;
} }
#tbp_proxy_torrent_dialog ul{ #tbp_proxy_torrent_dialog ul{
max-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-bottom: 0; margin-bottom: 0;
} }
#tbp_proxy_torrent_dialog li{ #tbp_proxy_torrent_dialog li{
padding-left: 1em; padding-left: 1em;
padding-right: 1em; padding-right: 1em;
} }
#tbp_proxy_torrent_dialog li p{
margin: .3em;
}
</style> </style>
<div id="tbp_proxy_torrent_dialog" title="Torrents"> <div id="tbp_proxy_torrent_dialog" title="Torrents">
<ul> <ul>
<li jq-repeat="tbp_proxy_torrent_dialog_torrents">{{name}} <li jq-repeat="tbp_proxy_torrent_dialog_torrents" jq-repeat-index="hashString">
<br /> <p>
<b>{{name}}</b> - <i>{{statusText}}</i>
</p>
<p>
Is <b>{{sizeWhenDone}}</b>
saved to <b>{{downloadDir}}</b>
added by <b>{{added_by}}</b>
<b>{{createdAtString}}</b>
</p>
{{^isFinished}} {{^isFinished}}
<p>
<progress id="file" max="100" value="{{percentDone}}">{{percentDone}}%</progress> <progress id="file" max="100" value="{{percentDone}}">{{percentDone}}%</progress>
<br /> </p>
<b>{{statusText}}</b> @ <b>{{rateDownload}}</b> finishing <b>{{eta}}</b>
<br />
{{^isActive}}
<button class="ui-button ui-widget ui-corner-all" onclick="app.torrent.start({{id}})">
<span class="ui-icon ui-icon-play"></span> Start
</button>
{{/isActive}}
{{#isActive}} {{#isActive}}
<button class="ui-button ui-widget ui-corner-all" onclick="app.torrent.stop({{id}})"> <p>
<b>{{rateDownload}}</b>
Finishing <b>{{eta}}</b>
From <b>{{peersConnected}}</b> Peers
</p>
<button class="ui-button ui-widget ui-corner-all" onclick="app.torrent.stop({{hashString}})">
<span class="ui-icon ui-icon-pause"></span>Pause <span class="ui-icon ui-icon-pause"></span>Pause
</button> </button>
{{/isActive}} {{/isActive}}
{{^isActive}}
<button class="ui-button ui-widget ui-corner-all" onclick="app.torrent.start({{hashString}})">
<span class="ui-icon ui-icon-play"></span> Start
</button>
{{/isActive}}
<button class="ui-button ui-widget ui-corner-all" onclick=" <button class="ui-button ui-widget ui-corner-all" onclick="
app.torrent.destroy({{id}}, function(error, data){ app.torrent.destroy({{hashString}}, function(error, data){
$.scope.tbp_proxy_torrent_dialog_torrents.splice({{__id}}, 1); $.scope.tbp_proxy_torrent_dialog_torrents.splice({{__id}}, 1);
}); });
"> ">
<span class="ui-icon ui-icon-closethick"></span>Delete <span class="ui-icon ui-icon-closethick"></span>Delete
</button> </button>
</p>
{{/isFinished}} {{/isFinished}}
{{#errorString}}
<p>
<b>{{errorString}}</b>
</p>
{{/errorString}}
{{#isFinished}} {{#isFinished}}
<br /> Done! <a href="https://stuff.718it.biz/torrents/{{name}}" target="_blank"> HTTP Link</a> <p>
Done! <a href="https://stuff.718it.biz/torrents/{{name}}" target="_blank"> HTTP Link</a>
</p>
{{/isFinished}} {{/isFinished}}
<hr /> <hr />
</li> </li>
<li jq-repeat-defualt="tbp_proxy_torrent_dialog_torrents">
<h3> No Torrents...</h3>
<hr width="300pt" />
</li>
</ul> </ul>
</div> </div>
@ -195,6 +233,12 @@
</p> </p>
<p> <p>
<label for="hashString">Hash:</label>
<br />
<input type="text" name="hashString" value="{{{hashString}}}" readonly/>
</p>
<p style="display:none">
<legend>Public Download:</legend> <legend>Public Download:</legend>
<label for="radio-1" title="The download will appare in the communal download folder">Public</label> <label for="radio-1" title="The download will appare in the communal download folder">Public</label>
@ -204,7 +248,7 @@
<input type="radio" name="isPrivate" id="radio-2" value="false" readonly/> <input type="radio" name="isPrivate" id="radio-2" value="false" readonly/>
</p> </p>
<p> <p style="display:none">
<legend>Start on add:</legend> <legend>Start on add:</legend>
<label for="isStart-1" title="The download will appare in the communal download folder">Yes</label> <label for="isStart-1" title="The download will appare in the communal download folder">Yes</label>
@ -231,7 +275,7 @@
<span id="tbp_proxy_torrent_dialog_opener" class="tbp_proxy_is_authed"> <span id="tbp_proxy_torrent_dialog_opener" class="tbp_proxy_is_authed">
<img src="/__static/img/Transmission_Icon.svg" height="22" width="22" style="margin-right: .3em;" /> <img src="/__static/img/Transmission_Icon.svg" height="22" width="22" style="margin-right: .3em;" />
<span jq-repeat="tbp_proxy_torrent_dialog_opener_status"> <span jq-repeat="tbp_proxy_torrent_dialog_opener_status">
<b> <span class="ui-icon ui-icon-arrowthick-1-n"></span>{{downloadSpeed}} <span class="ui-icon ui-icon-arrowthick-1-s"></span>{{uploadSpeed}}</b> <b> <span class="ui-icon ui-icon-arrowthick-1-s"></span>{{downloadSpeed}} <span class="ui-icon ui-icon-arrowthick-1-n"></span>{{uploadSpeed}}</b>
</span> </span>
</span> </span>
<button id="tbp_proxy_login_dialog_opener" class="tbp_proxy_not_authed ui-button ui-corner-all ui-widget">Login</button> <button id="tbp_proxy_login_dialog_opener" class="tbp_proxy_not_authed ui-button ui-corner-all ui-widget">Login</button>
@ -274,29 +318,37 @@
...commonDialogOptions ...commonDialogOptions
}); });
$("body").on('click', 'img.718link', function(el){
// magnetLink
$.scope.torrentAdd.update({
magnetLink: $(this).data('link'),
name: (new URLSearchParams($(this).data('link'))).get('dn')
});
$('#tbp_proxy_torrent_add_dialog').parent().css({position:"fixed", 'margin-right': "2em", 'margin-top': '3em'}).end().dialog('open');
});
$('a').each(function(idx, el){
var $el = $(el);
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')+'"/>')
}
});
/* Enable tooltips*/ /* Enable tooltips*/
$( '#tbp_proxy_header' ).tooltip({ $( '#tbp_proxy_header' ).tooltip({
track: true track: true
}); });
app.auth.isLoggedIn(function(error, data){
if(data){
$("body").on('click', 'img.718link', function(el){
// magnetLink
let magnetLinkParams = new URLSearchParams($(this).data('link'));
$.scope.torrentAdd.update({
magnetLink: $(this).data('link'),
name: magnetLinkParams.get('dn'),
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');
});
// 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')+'"/>')
}
});
app.subscribe('torrent:add', function(data, topic){ app.subscribe('torrent:add', function(data, topic){
console.log('sub', topic, data)
$.scope.tbp_proxy_torrent_dialog_torrents.unshift(app.torrent.parseTorrnetItem(data)) $.scope.tbp_proxy_torrent_dialog_torrents.unshift(app.torrent.parseTorrnetItem(data))
}); });
@ -307,7 +359,6 @@
}); });
app.subscribe(`app:api:error:555`, function(data, topics){ app.subscribe(`app:api:error:555`, function(data, topics){
console.log('we down')
app.torrent.isDown = true app.torrent.isDown = true
$('#tbp_proxy_torrent_dialog_opener').css('background', "red") $('#tbp_proxy_torrent_dialog_opener').css('background', "red")
}); });
@ -318,7 +369,10 @@
}); });
listTorrents(); listTorrents();
setInterval(refreshTorrents, 5000) setInterval(refreshTorrents, 5000);
app.torrent.migrate();
}
});
}); });
function humanFileSize(size) { function humanFileSize(size) {
@ -335,10 +389,10 @@
function listTorrents(){ function listTorrents(){
app.torrent.list(function(err, data){ app.torrent.list(function(err, data){
for(let torrent of data.results){ for(let torrent of data.results){
$.scope.tbp_proxy_torrent_dialog_torrents.unshift(app.torrent.parseTorrnetItem(torrent)) $.scope.tbp_proxy_torrent_dialog_torrents.push(app.torrent.parseTorrnetItem(torrent))
app.torrent.get(function(error, torrent){ app.torrent.get(function(error, torrent){
$.scope.tbp_proxy_torrent_dialog_torrents.update('id', torrent.result.id, app.torrent.parseTorrnetItem(torrent.result)) $.scope.tbp_proxy_torrent_dialog_torrents.update('hashString', torrent.result.hashString, app.torrent.parseTorrnetItem(torrent.result))
} , torrent.id, true) } , torrent.hashString, true)
} }
}); });
}; };
@ -347,8 +401,8 @@
for(let torrent of $.scope.tbp_proxy_torrent_dialog_torrents){ for(let torrent of $.scope.tbp_proxy_torrent_dialog_torrents){
if(!torrent.isFinished){ if(!torrent.isFinished){
app.torrent.get(function(error, torrent){ app.torrent.get(function(error, torrent){
$.scope.tbp_proxy_torrent_dialog_torrents.update('id', torrent.result.id, app.torrent.parseTorrnetItem(torrent.result)) $.scope.tbp_proxy_torrent_dialog_torrents.update('hashString', torrent.result.hashString, app.torrent.parseTorrnetItem(torrent.result))
} , torrent.id, true) } , torrent.hashString, true)
} }
} }
} }
@ -356,13 +410,11 @@
app.torrent = (function(app){ app.torrent = (function(app){
let isDown = false; 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) {
console.log('right?', res.url, res.url.startsWith('/__api/torrent'), app.torrent.isDown)
if(res.url.startsWith('/__api/torrent') && isDown){ if(res.url.startsWith('/__api/torrent') && isDown){
ajax.abort() ajax.abort()
} }
// $( ".log" ).text( "Triggered ajaxStart handler." );
// throw new Error('go')
} ); } );
statusMap = [ statusMap = [
@ -377,7 +429,6 @@
'Unknown', // 8 'Unknown', // 8
]; ];
function list(callback, username) { function list(callback, username) {
app.api.get('torrent', function(error, data){ app.api.get('torrent', function(error, data){
if(error) return; if(error) return;
@ -385,29 +436,29 @@
}); });
} }
function get(callback, id, forceUpdate){ function get(callback, hashString, forceUpdate){
app.api.get(`torrent/${id}?${forceUpdate ? 'latest': '' }`, function(error, data){ app.api.get(`torrent/${hashString}?${forceUpdate ? 'latest': '' }`, function(error, data){
if(error) return; if(error) return;
callback(null, data) callback(null, data)
}); });
} }
function start(id, callback){ function start(hashString, callback){
app.api.post(`torrent/${id}/start`, function(error, data){ app.api.post(`torrent/${hashString}/start`, function(error, data){
if(error) return; if(error) return;
callback(null, data) callback(null, data)
}); });
} }
function stop(id, callback){ function stop(hashString, callback){
app.api.post(`torrent/${id}/stop`, function(error, data){ app.api.post(`torrent/${hashString}/stop`, function(error, data){
if(error) return; if(error) return;
callback(null, data) callback(null, data)
}); });
} }
function destroy(id, callback){ function destroy(hashString, callback){
app.api.delete(`torrent/${id}`, function(error, data){ app.api.delete(`torrent/${hashString}`, function(error, data){
if(error) return; if(error) return;
callback(null, data) callback(null, data)
}); });
@ -452,6 +503,7 @@
"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, // "isFinished": false,
// "isStalled": false, // "isStalled": false,
// "name": "reacher.s02e06.1080p.web.h264-successfulcrab[EZTVx.to].mkv", // "name": "reacher.s02e06.1080p.web.h264-successfulcrab[EZTVx.to].mkv",
@ -468,13 +520,28 @@
// "peers": [], // "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", // "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, // "isPrivate": false,
// "createdAt": "2024-01-05T21:18:30.607Z",
// "updatedAt": "2024-01-05T21:32:54.493Z" // "updatedAt": "2024-01-05T21:32:54.493Z"
// "torrent_id": "454", // "torrent_id": "454",
} }
} }
return {list, get, start, stop, destroy, parseTorrnetItem, parseServerStatus, isDown}; function migrate(){
let torrents = JSON.parse(window.localStorage.getItem('torrents') || '{}' ).list || [];
if(torrents.length){
console.log(`Migrating ${torrents.length}`)
for(let torrent of torrents){
app.api.post(`torrent/${torrent.hashString}`, {}, function(error, torrent) {
if(Object.keys(torrent).length){
$.scope.tbp_proxy_torrent_dialog_torrents.unshift(app.torrent.parseTorrnetItem(torrent))
}
});
}
localStorage.clear('torrents');
}
}
return {list, get, start, stop, destroy, migrate, parseTorrnetItem, parseServerStatus, isDown};
})(app); })(app);
</script> </script>

View File

@ -8,7 +8,10 @@ router.get('/', async function(req, res, next){
res.json({results: await Torrent.findAll({ res.json({results: await Torrent.findAll({
where:{added_by: req.query.username || req.user.username}, where:{added_by: req.query.username || req.user.username},
limit: req.query.limit, limit: req.query.limit,
offset: req.query.offset offset: req.query.offset,
order: [
['createdAt', 'DESC'],
],
})}); })});
}catch(error){ }catch(error){
next(error); next(error);
@ -23,6 +26,14 @@ router.post("/", async function(req, res, next){
} }
}); });
router.post("/:hashString", async function(req, res, next){
try{
res.json(await Torrent.migrate(req.params.hashString, req.user.username))
}catch(error){
next(error);
}
});
router.get('/server', async function(req, res, next){ router.get('/server', async function(req, res, next){
try{ try{
res.json(await Torrent.trClient.sessionStats()) res.json(await Torrent.trClient.sessionStats())
@ -31,9 +42,9 @@ router.get('/server', async function(req, res, next){
} }
}); });
router.get("/:id", async function(req, res, next){ router.get("/:hashString", async function(req, res, next){
try{ try{
let torrent = await Torrent.findByPk(req.params.id); let torrent = await Torrent.findByPk(req.params.hashString);
if('latest' in req.query){ if('latest' in req.query){
torrent = await torrent.getTorrentData(); torrent = await torrent.getTorrentData();
} }
@ -43,9 +54,9 @@ router.get("/:id", async function(req, res, next){
} }
}); });
router.delete("/:id", async function(req, res, next){ router.delete("/:hashString", async function(req, res, next){
try{ try{
let torrent = await Torrent.findByPk(req.params.id); let torrent = await Torrent.findByPk(req.params.hashString);
res.json({result: torrent, activity: await torrent.destroy()}); res.json({result: torrent, activity: await torrent.destroy()});
}catch(error){ }catch(error){
@ -53,9 +64,9 @@ router.delete("/:id", async function(req, res, next){
} }
}); });
router.post("/:id/stop", async function(req, res, next){ router.post("/:hashString/stop", async function(req, res, next){
try{ try{
let torrent = await Torrent.findByPk(req.params.id); let torrent = await Torrent.findByPk(req.params.hashString);
res.json({result: torrent, activity: await torrent.stop()}); res.json({result: torrent, activity: await torrent.stop()});
}catch(error){ }catch(error){
@ -63,9 +74,9 @@ router.post("/:id/stop", async function(req, res, next){
} }
}); });
router.post("/:id/start", async function(req, res, next){ router.post("/:hashString/start", async function(req, res, next){
try{ try{
let torrent = await Torrent.findByPk(req.params.id); let torrent = await Torrent.findByPk(req.params.hashString);
res.json({result: torrent, activity: await torrent.start()}); res.json({result: torrent, activity: await torrent.start()});
}catch(error){ }catch(error){