Browse Source

Show missing articles as MB instead of number of articles

tags/2.2.0Alpha2
Safihre 8 years ago
parent
commit
111feb1b57
  1. 14
      interfaces/Glitter/templates/static/javascripts/glitter.queue.js
  2. 1
      sabnzbd/api.py
  3. 6
      sabnzbd/constants.py
  4. 3
      sabnzbd/nzbstuff.py

14
interfaces/Glitter/templates/static/javascripts/glitter.queue.js

@ -464,7 +464,7 @@ function QueueModel(parent, data) {
self.totalMB = ko.observable(parseFloat(data.mb)); self.totalMB = ko.observable(parseFloat(data.mb));
self.remainingMB = ko.observable(parseFloat(data.mbleft)); self.remainingMB = ko.observable(parseFloat(data.mbleft));
self.avg_age = ko.observable(data.avg_age) self.avg_age = ko.observable(data.avg_age)
self.missing = ko.observable(data.missing) self.missing = ko.observable(parseFloat(data.mbmissing))
self.category = ko.observable(data.cat); self.category = ko.observable(data.cat);
self.priority = ko.observable(parent.priorityName[data.priority]); self.priority = ko.observable(parent.priorityName[data.priority]);
self.script = ko.observable(data.script); self.script = ko.observable(data.script);
@ -485,8 +485,8 @@ function QueueModel(parent, data) {
if(self.status() == 'Checking') { if(self.status() == 'Checking') {
return '#58A9FA' return '#58A9FA'
} }
// Check for missing data, the value is arbitrary! // Check for missing data, the value is arbitrary! (3%)
if(self.missing() > 50) { if(self.missing()/self.totalMB() > 0.03) {
return '#F8A34E' return '#F8A34E'
} }
// Set to grey, only when not Force download // Set to grey, only when not Force download
@ -510,9 +510,9 @@ function QueueModel(parent, data) {
// Texts // Texts
self.missingText= ko.pureComputed(function() { self.missingText= ko.pureComputed(function() {
// Check for missing data, the value is arbitrary! // Check for missing data, the value is arbitrary! (3%)
if(self.missing() > 50) { if(self.missing()/self.totalMB() > 0.03) {
return self.missing() + ' ' + glitterTranslate.misingArt return self.missing().toFixed(0) + ' MB ' + glitterTranslate.misingArt
} }
return; return;
}) })
@ -565,7 +565,7 @@ function QueueModel(parent, data) {
self.totalMB(parseFloat(data.mb)); self.totalMB(parseFloat(data.mb));
self.remainingMB(parseFloat(data.mbleft)); self.remainingMB(parseFloat(data.mbleft));
self.avg_age(data.avg_age) self.avg_age(data.avg_age)
self.missing(data.missing) self.missing(parseFloat(data.mbmissing))
self.category(data.cat); self.category(data.cat);
self.priority(parent.priorityName[data.priority]); self.priority(parent.priorityName[data.priority]);
self.script(data.script); self.script(data.script);

1
sabnzbd/api.py

@ -1346,6 +1346,7 @@ def build_queue(start=0, limit=0, trans=False, output=None, search=None):
slot['sizeleft'] = format_bytes(bytesleft) slot['sizeleft'] = format_bytes(bytesleft)
slot['percentage'] = "%s" % (int(((mb - mbleft) / mb) * 100)) if mb != mbleft else '0' slot['percentage'] = "%s" % (int(((mb - mbleft) / mb) * 100)) if mb != mbleft else '0'
slot['missing'] = pnfo.missing slot['missing'] = pnfo.missing
slot['mbmissing'] = "%.2f" % (pnfo.bytes_missing / MEBI)
if not output: if not output:
slot['mb_fmt'] = locale.format('%d', int(mb), True) slot['mb_fmt'] = locale.format('%d', int(mb), True)
slot['mbdone_fmt'] = locale.format('%d', int(mb - mbleft), True) slot['mbdone_fmt'] = locale.format('%d', int(mb - mbleft), True)

6
sabnzbd/constants.py

@ -25,9 +25,9 @@ POSTPROC_QUEUE_VERSION = 2
REC_RAR_VERSION = 500 REC_RAR_VERSION = 500
PNFO = namedtuple('PNFO', 'repair unpack delete script nzo_id filename password ' PNFO = namedtuple('PNFO', 'repair unpack delete script nzo_id filename password unpackstrht '
'unpackstrht msgid category url bytes_left bytes avg_stamp ' 'msgid category url bytes_left bytes avg_stamp avg_date finished_files '
'avg_date finished_files active_files queued_files status priority missing') 'active_files queued_files status priority missing bytes_missing')
QNFO = namedtuple('QNFO', 'bytes bytes_left bytes_left_previous_page list q_size_list q_fullsize') QNFO = namedtuple('QNFO', 'bytes bytes_left bytes_left_previous_page list q_size_list q_fullsize')

3
sabnzbd/nzbstuff.py

@ -1525,7 +1525,8 @@ class NzbObject(TryList):
self.files if full else [], self.files if full else [],
queued_files, queued_files,
self.status, self.priority, self.status, self.priority,
len(self.nzo_info.get('missing_art_log', [])) len(self.nzo_info.get('missing_art_log', [])),
self.bytes_tried - self.bytes_downloaded,
) )
def get_nzf_by_id(self, nzf_id): def get_nzf_by_id(self, nzf_id):

Loading…
Cancel
Save