Changeset 157

Timestamp:

11/02/07 19:54:40 (14 months ago)

Author:

chris

Message:

Added further automatic refresh support for remaining non-refreshing data 17

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• index.php (modified) (1 diff)
• js/hellaworld.php (modified) (3 diffs)
• templates/default.php (modified) (3 diffs)
• templates/json.php (modified) (4 diffs)

trunk/CHANGELOG

@@ -28 +28 @@
   change has added options to the configuration file, please see the
   README for details
+
+* Added further automatic refresh support for remaining data that wasn't
+  already being refreshed by the 15 second automatic refresher [ticket:17]
 
 1.8

trunk/index.php

@@ -174 +174 @@
                                 case 11:
                                         $c->shutdown();
+                                        throw new Exception('HellaNZB Has been shut down');
                         }
                         header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . $self);

trunk/js/hellaworld.php

@@ -75 +75 @@
 
         function updateData(json) {
+                var status = "<h1>HellaWorld</h1>";
+                status += '<div><p><?php printf(_('HellaNZB %s - Uptime: %s'), "' + json.status.version + '", "' + json.status.uptime + '"); ?></p>';
+                status += '<p><?php printf(_('Downloaded: %s files in %s segments totalling %sMB via %s NZB files'), "' + json.status.files + '", "' + json.status.segments + '", "' + json.status.totalmb + '", "' + json.status.totalnzbs + '"); ?></p></div>';
+                $('#masthead').html(status);
                 var info = "<h2><?php echo _('Currently Downloading'); ?></h2>";
                 if (json.downloading != null) {
@@ -99 +103 @@
                 }
                 $('#info').html(info);
+                status = '<?php printf(_('Queued: %s items totalling %sMB'), "' + json.queuelength + '", "' + json.queuesize + '"); ?>';
+                $('#queuestatus').html(status)
+                var queue = '';
                 if (json.queuelength > 0) {
-                        var queue = '';
                         for (i = 0; i < json.queuelength; i ++) {
                                 queue += '<li id="order_' + json.queue[i].id + '" class="queuebox">';
@@ -112 +118 @@
                                         queue += '</div>';
                                 }
-                                queue += '</li>';
-                        }
-                        $('#queue').html(queue);
-                        makeSortable();
-                } else {
-                        $('#queue').html('');
-                }
-                if (json.finished && json.finished.length > 0) {
+                                        queue += '</li>';
+                        }
+                } else {
+                        queue += '<li class="queuebox" style="text-align: center; font-weight: bold;"><?php echo _('Queue is empty'); ?></li>';
+                }
+                $('#queue').html(queue);
+                makeSortable();
+                if (json.showfinished) {
+                        $('#finishedcount').html('<?php printf(_('Finished items: %s'), "' + json.finishedlength + '"); ?>');
+                }
+                if (json.showfinished) {
                         var finished = '';
-                        for (i = 0; i < json.finished.length; i++) {
-                                finished += '<li class="queuebox ' + json.finished[i].type + '">';
-                                finished += '<div class="queuetitle">' + json.finished[i].archiveName + '</div>';
-                                finished += '<ul class="queuecontrols"><li class="control"><a href="index.php?removefinished=' + json.finished[i].index + '"><?php echo _('Remove'); ?></a></li></ul>';
-                                finished += '<div class="queuestats"><?php printf(_('Finished on: %s Processing Time: %s'), "' + json.finished[i].finishedTime + '", "' + json.finished[i].elapsedTime"); ?>;
-                                if (json.finished[i].parMessage != '') {
-                                        finished += '<?php printf(_(' Par message: %s'), "' + json.finished[i].parMessage"); ?>;
+                        if (json.finished.length > 0) {
+                                for (i = 0; i < json.finished.length; i++) {
+                                        finished += '<li class="queuebox ' + json.finished[i].type + '">';
+                                        finished += '<div class="queuetitle">' + json.finished[i].archiveName + '</div>';
+                                        finished += '<ul class="queuecontrols"><li class="control"><a href="index.php?removefinished=' + json.finished[i].index + '"><?php echo _('Remove'); ?></a></li></ul>';
+                                        finished += '<div class="queuestats"><?php printf(_('Finished on: %s Processing Time: %s'), "' + json.finished[i].finishedTime + '", "' + json.finished[i].elapsedTime"); ?>;
+                                        if (json.finished[i].parMessage != '') {
+                                                finished += '<?php printf(_(' Par message: %s'), "' + json.finished[i].parMessage"); ?>;
+                                        }
+                                        finished += '</div></li>';
                                 }
-                                finished += '</div></li>';
+                        } else {
+                                finished += '<li class="queuebox" style="text-align: center; font-weight: bold;"><?php echo _('No Finished Items'); ?></li>';
                         }
                         $('#finished').html(finished);

trunk/templates/default.php

@@ -117 +117 @@
                         </div>
                         <div id="content">
-                                <div class="queuebox first">
+                                <div id="queuestatus" class="queuebox first">
                                         <?php printf(_('Queued: %s items totalling %sMB'), $c->queueLength, $c->queueSize); ?>
                                 </div>
-                                <?php if ($c->queueLength > 0): ?>
                                 <form method="post" action="<?php echo $self; ?>" onsubmit="confirmorder(this)">
 <ul id="queue">
+<?php if ($c->queueLength == 0): ?>
+        <li class="queuebox" style="text-align: center; font-weight: bold;"><?php echo _('Queue is empty'); ?></li>
+<?php endif; ?>
 <?php $i = 0; foreach ($c->queue as $queue): $i++ ?>
         <li class="queuebox" id="order_<?php echo $queue['id']; ?>">
@@ -134 +136 @@
 <?php endforeach; ?>
 </ul>
-                                <?php endif; ?>
                                 <div id="controls">
                                         <span id="refresher">
                                         <input type="checkbox" name="refresh" id="refresh" onclick="if (this.checked) { createCookie('HHRefresh', 1, 30);startRefresher(); } else { createCookie('HHRefresh', 0, 30);stopRefresher(); }" /> <label for="refresh" class="refresher"><?php echo _('Refresh every 15 seconds'); ?></label> <input type="button" value="<?php echo _('Refresh Now'); ?>" onclick="refreshNow();" />
                                         </span>
-                                        <?php if ($c->queueLength > 0): ?>
                                         <input type="submit" name="reorder" value="<?php echo _('Reorder Items'); ?>" /> <?php echo _('by'); ?> <select name="sorttype" id="sorttype" onchange="showstatus(this);"><option value="1"><?php echo _('Provided Order'); ?></option><option value="2"><?php echo _('Name'); ?></option><option value="3"><?php echo _('Size'); ?></option></select> <select name="sortdirection" id="sortdirection"><option value="1"><?php echo _('Ascending'); ?></option><option value="2"><?php echo _('Descending'); ?></option></select>
-                                        <?php endif; ?>
                                 </div>
-                                <?php if ($c->queueLength > 0): ?>
                                 </form>
-                                <?php endif; ?>
                 </div>
         </div>
@@ -168 +165 @@
                 </div>
         </form>
-        <?php if ($finishedcount > 0): ?>
         <ul id="finished">
-                <?php $i = 0; foreach($x->item as $item): $i++; ?>
-                <li class="queuebox <?php echo (((string)$item->type == 'SUCCESS') ? 'good' : 'bad'); ?>">
-                        <div class="queuetitle">
-                                <?php echo (string)$item->archiveName; ?>
-                        </div>
-                        <ul class="queuecontrols">
-                                <li class="control"><a href="<?php echo $self; ?>?removefinished=<?php echo $i; ?>"><?php echo _('Remove'); ?></a></li>
-                        </ul>
-                        <div class="queuestats"><?php printf(_('Finished on: %s Processing Time: %s'), date('M dS - H:i:s', (int)$item->finishedTime), (string)$item->elapsedTime); if (trim((string)$item->parMessage) != ''): printf(_(' Par message: %s'), (string)$item->parMessage); endif; ?></div>
-                </li>
-                <?php endforeach; ?>
+                <?php if ($finishedcount == 0): ?>
+                        <li class="queuebox" style="text-align: center; font-weight: bold;"><?php echo _('No Finished Items'); ?></li>
+                <?php else: ?>
+                        <?php $i = 0; foreach($x->item as $item): $i++; ?>
+                        <li class="queuebox <?php echo (((string)$item->type == 'SUCCESS') ? 'good' : 'bad'); ?>">
+                                <div class="queuetitle">
+                                        <?php echo (string)$item->archiveName; ?>
+                                </div>
+                                <ul class="queuecontrols">
+                                        <li class="control"><a href="<?php echo $self; ?>?removefinished=<?php echo $i; ?>"><?php echo _('Remove'); ?></a></li>
+                                </ul>
+                                <div class="queuestats"><?php printf(_('Finished on: %s Processing Time: %s'), date('M dS - H:i:s', (int)$item->finishedTime), (string)$item->elapsedTime); if (trim((string)$item->parMessage) != ''): printf(_(' Par message: %s'), (string)$item->parMessage); endif; ?></div>
+                        </li>
+                        <?php endforeach; ?>
+                <?php endif; ?>
         </ul>
-        <?php endif; ?>
 </div>
 </div>

trunk/templates/json.php

@@ -39 +39 @@
 
 $hellainfo = array();
-
 $hellainfo['path'] = $self;
+$hellainfo['status']['version'] = $c->version;
+$hellainfo['status']['uptime'] = $c->uptime;
+$hellainfo['status']['files'] = $c->totalFiles;
+$hellainfo['status']['segments'] = $c->totalSegments;
+$hellainfo['status']['totalmb'] = $c->totalMB;
+$hellainfo['status']['totalnzbs'] = $c->totalNZBs;
 if ($c->downloadCount > 0) {
         $hellainfo['downloading'] = htmlspecialchars($c->downloads[0]['nzbName']);
@@ -57 +62 @@
 }
 $hellainfo['queuelength'] = $c->queueLength;
+$hellainfo['queuesize'] = $c->queueSize;
 $i = 0;
 $hellainfo['queue'] = array();
@@ -69 +75 @@
 }
 if ($config['showfinished']) {
+        $hellainfo['showfinished'] = true;
         $hellainfo['finished'] = array();
         $i = 0;
@@ -82 +89 @@
                 $hellainfo['finished'][] = $tmp;
         }
+        $hellainfo['finishedlength'] = $i;
 } else {
-        $hellainfo['finished'] = false;
+        $hellainfo['showfinished'] = false;
 }
 $hellainfo['log'] = $c->log;