mirror of
https://github.com/WebTools-NG/WebTools-NG
synced 2025-02-17 03:48:25 +00:00
#507 just some cleanup
This commit is contained in:
parent
5e511f7209
commit
028bc05194
2 changed files with 8 additions and 65 deletions
|
@ -38,7 +38,6 @@ const download = new class DOWNLOAD {
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
log.error(`[download.js] (createOutDir) - err`)
|
log.error(`[download.js] (createOutDir) - err`)
|
||||||
}
|
}
|
||||||
console.log('Ged 13-3 outDir', dirName)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async getSrvInfo(){ // Get download srv info
|
async getSrvInfo(){ // Get download srv info
|
||||||
|
@ -47,9 +46,6 @@ const download = new class DOWNLOAD {
|
||||||
// Find idx of selected server
|
// Find idx of selected server
|
||||||
let idx = allPMSSrv.map(function(x) {return x.clientIdentifier; }).indexOf(this.item['serverID']);
|
let idx = allPMSSrv.map(function(x) {return x.clientIdentifier; }).indexOf(this.item['serverID']);
|
||||||
this.accessToken = allPMSSrv[idx]['accessToken'];
|
this.accessToken = allPMSSrv[idx]['accessToken'];
|
||||||
//this.srvAddr = await ptv.checkServerConnect(allPMSSrv[idx]);
|
|
||||||
//this.srvAddr = await ptv.getValidPMSAddress( allPMSSrv[idx]['clientIdentifier'], allPMSSrv[idx]['connections'], this.accessToken)
|
|
||||||
console.log('Ged 56-9 Token', this.accessToken)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getFirstEntry(){ // Get first entry in the queue
|
getFirstEntry(){ // Get first entry in the queue
|
||||||
|
@ -59,7 +55,6 @@ const download = new class DOWNLOAD {
|
||||||
removeFirstEntry(){ //Remove first entry from the queue
|
removeFirstEntry(){ //Remove first entry from the queue
|
||||||
this.queue.shift();
|
this.queue.shift();
|
||||||
wtconfig.set('Download.Queue', this.queue);
|
wtconfig.set('Download.Queue', this.queue);
|
||||||
console.log('Ged 444-3 Queue now', this.queue)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
formatBytes(bytes, decimals = 2) {
|
formatBytes(bytes, decimals = 2) {
|
||||||
|
@ -76,13 +71,6 @@ const download = new class DOWNLOAD {
|
||||||
|
|
||||||
async downloadItem(){ // Download the actual item
|
async downloadItem(){ // Download the actual item
|
||||||
log.info(`[Download.js] (downloadItem) Started download of file: ${this.item.targetFile}`);
|
log.info(`[Download.js] (downloadItem) Started download of file: ${this.item.targetFile}`);
|
||||||
console.log('Ged 23-3-0 status', JSON.stringify(store.getters.getStatus))
|
|
||||||
console.log('Ged 23-3-0-1 status')
|
|
||||||
console.log('Ged 23-3-1 status', status.RevMsgType.Info)
|
|
||||||
|
|
||||||
console.log('Ged 23-3-2 status', JSON.stringify(store.getters.getStatus))
|
|
||||||
|
|
||||||
|
|
||||||
let header = wtutils.PMSHeader;
|
let header = wtutils.PMSHeader;
|
||||||
// Add Auth Token
|
// Add Auth Token
|
||||||
header['X-Plex-Token'] = this.accessToken;
|
header['X-Plex-Token'] = this.accessToken;
|
||||||
|
@ -95,27 +83,14 @@ const download = new class DOWNLOAD {
|
||||||
log.info(`[Download.js] (downloadItem) - Resuming download from ${rangeStart}`);
|
log.info(`[Download.js] (downloadItem) - Resuming download from ${rangeStart}`);
|
||||||
//header['Range'] = `bytes=${rangeStart}-${this.item.size}`;
|
//header['Range'] = `bytes=${rangeStart}-${this.item.size}`;
|
||||||
header['Range'] = `bytes=${rangeStart}-`;
|
header['Range'] = `bytes=${rangeStart}-`;
|
||||||
//"bytes=100-200"
|
|
||||||
// procenttal = Math.floor(Math.floor(rangeStart/this.item.size*100)/5)*5;
|
|
||||||
// console.log('Ged 12-3-1 procent done', rangeStart, '*', this.item.size, '*', Math.floor(procenttal))
|
|
||||||
//let procenttal5 = Math.floor(Math.floor(procenttal)/5)*5
|
|
||||||
//console.log('Ged 12-3-1-2 procent 5 done', procenttal5)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let procentlog = 0;
|
||||||
header['Accept'] = '*/*';
|
header['Accept'] = '*/*';
|
||||||
// Url to download
|
// Url to download
|
||||||
const url = this.item.baseAddress + this.item.key + '?download=1';
|
const url = this.item.baseAddress + this.item.key + '?download=1';
|
||||||
|
|
||||||
console.log('Ged 12-3 url', url)
|
|
||||||
console.log('Ged 12-4 Header', JSON.stringify(header))
|
|
||||||
this.downloadProcent = 0;
|
this.downloadProcent = 0;
|
||||||
|
|
||||||
console.log('Ged 88-3-0 Item', JSON.stringify(this.item))
|
|
||||||
|
|
||||||
status.updateStatusMsg( status.RevMsgType.Downloading, i18n.t('Common.Status.Msg.Downloading', { title: this.item.title }));
|
status.updateStatusMsg( status.RevMsgType.Downloading, i18n.t('Common.Status.Msg.Downloading', { title: this.item.title }));
|
||||||
|
|
||||||
let downloadprocentlog = 1;
|
|
||||||
downloadprocentlog;
|
|
||||||
this.controller = new AbortController();
|
this.controller = new AbortController();
|
||||||
this.lastError = null;
|
this.lastError = null;
|
||||||
const _this = this;
|
const _this = this;
|
||||||
|
@ -136,7 +111,13 @@ const download = new class DOWNLOAD {
|
||||||
}
|
}
|
||||||
// Update progress
|
// Update progress
|
||||||
ipcRenderer.on('downloadMediaProgress', (event, data) => {
|
ipcRenderer.on('downloadMediaProgress', (event, data) => {
|
||||||
log.info(`[Download.js] (downloadItem) - Downloaded file: ${this.item.targetFile} completed ${data.Procent}%`);
|
if ( Number(data.Procent) % 5 == 0) {
|
||||||
|
if ( procentlog < Number(data.Procent)){
|
||||||
|
log.info(`[Download.js] (downloadItem) - Downloaded file: ${this.item.targetFile} completed ${data.Procent}%`);
|
||||||
|
procentlog = Number(data.Procent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//log.info(`[Download.js] (downloadItem) - Downloaded file: ${this.item.targetFile} completed ${data.Procent}%`);
|
||||||
const download = `${data.Downloaded} (${this.formatBytes(data.Downloaded)})`;
|
const download = `${data.Downloaded} (${this.formatBytes(data.Downloaded)})`;
|
||||||
const total = `${data.Total} (${this.formatBytes(data.Total)})`
|
const total = `${data.Total} (${this.formatBytes(data.Total)})`
|
||||||
status.updateStatusMsg( status.RevMsgType.Downloaded, i18n.t('Common.Status.Msg.Downloaded', { current: download, total: total, procent: data.Procent } ));
|
status.updateStatusMsg( status.RevMsgType.Downloaded, i18n.t('Common.Status.Msg.Downloaded', { current: download, total: total, procent: data.Procent } ));
|
||||||
|
|
|
@ -251,44 +251,6 @@ const ptv = new class PTV {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
async getValidPMSAddress( clientIdentifier, connections, accessToken)
|
|
||||||
{
|
|
||||||
console.log('Ged 54-3', clientIdentifier, connections, accessToken)
|
|
||||||
|
|
||||||
let header = wtutils.PMSHeader;
|
|
||||||
header['X-Plex-Token'] = accessToken;
|
|
||||||
|
|
||||||
for (var idx in connections){
|
|
||||||
console.log('Ged 54-5', connections[idx].uri)
|
|
||||||
console.log('Ged 54-6', connections[idx].local)
|
|
||||||
// this.testCon(connections[idx]['uri'], header, clientIdentifier, connections[idx]['local']);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
let header = wtutils.PMSHeader;
|
|
||||||
header['X-Plex-Token'] = accessToken;
|
|
||||||
for (var idx in connections){
|
|
||||||
this.address = null;
|
|
||||||
this.resp = null;
|
|
||||||
this.testCon(connections[idx]['uri'], header, clientIdentifier, connections[idx]['local']);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
while (!this.address){
|
|
||||||
console.log('Ged 55', this.address)
|
|
||||||
console.log('Ged 55-3', this.allResp)
|
|
||||||
console.log('Ged 55-4', this.resp)
|
|
||||||
|
|
||||||
await wtutils.sleep(50)
|
|
||||||
} */
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return this.address
|
|
||||||
}
|
|
||||||
|
|
||||||
async updatePMSInfo( PMS, index, options){ //Update PMS entry with missing info
|
async updatePMSInfo( PMS, index, options){ //Update PMS entry with missing info
|
||||||
log.verbose(`[plextv.js] (updatePMSInfo) - look at server: ${PMS['name']} with an Id of: ${PMS['clientIdentifier']} to update ${options}`);
|
log.verbose(`[plextv.js] (updatePMSInfo) - look at server: ${PMS['name']} with an Id of: ${PMS['clientIdentifier']} to update ${options}`);
|
||||||
// Let's start by setting the header once and for all
|
// Let's start by setting the header once and for all
|
||||||
|
|
Loading…
Add table
Reference in a new issue