Changeset 170

Timestamp:

01/12/08 19:27:57 (12 months ago)

Author:

drarok

Message:

Closed ticket #21, implemented David Kubicek's patch with a few alterations.

Location:

hellaworld/trunk

Files:

• CHANGELOG (modified) (1 diff)
• classes/HellaController.php (modified) (2 diffs)
• completed.xml (modified) (1 diff)
• index.php (modified) (1 diff)
• js/hellaworld.php (modified) (2 diffs)
• style/main.css (modified) (4 diffs)
• templates/default.php (modified) (5 diffs)
• templates/json.php (modified) (1 diff)

hellaworld/trunk/CHANGELOG

@@ -1 +1 @@
 1.10
 
+* Applied David Kubicek's patch for HTTP-uploading of NZBs, see
+  http://trac.cheezyblog.net/ticket/21 for details. (drarok)
+
+* Fixed a bug where descending sort wouldn't work (chris)
+
 * Fixed a bug where queue items with an ETA over 24 but less than 48
-  hours long weren't showing the days in the ETA
-
-* Updated the bookmarklet to support Newzbin v2 and Newzxxx
+  hours long weren't showing the days in the ETA (chris)
+
+* Updated the bookmarklet to support Newzbin v2 and Newzxxx (chris)
 
 1.9

hellaworld/trunk/classes/HellaController.php

@@ -244 +244 @@
 
                                         //add the argument to the argument array as an XML-RPC value
-                                        $atmp[] = new xmlrpcval($argument, 'int');
+                                        $type = (is_numeric($arguments) ? 'int' : 'string');
+                                        $atmp[] = new xmlrpcval($argument, $type);
                                 }
 
@@ -254 +255 @@
 
                                 // convert it to a one item array contianing an XML-RPC value
-                                $arguments = array(new xmlrpcval($arguments, 'int'));
+                                $type = (is_numeric($arguments) ? 'int' : 'string');
+                                $arguments = array(new xmlrpcval($arguments, $type));
                         }
 

hellaworld/trunk/completed.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <queue>
-</queue>
+<item><type>ERROR</type><archiveName>Apocalyptica Sheet Music Flood - 2007-12-30 (15 Books)</archiveName><destDir>/Volumes/LaCie/usenet/Books/Apocalyptica Sheet Music Flood - 2007-12-30 (15 Books)</destDir><elapsedTime>1s</elapsedTime><finishedTime>1200164124</finishedTime><parMessage>A problem occurred: FatalError: Unable to par repair: archive requires 77 more recovery blocks for repair</parMessage></item><item><type>SUCCESS</type><archiveName>The Colbert Report - 2008-01-10 - Muhammad Yunus</archiveName><destDir>/Volumes/LaCie/usenet/The Colbert Report - 2008-01-10 - Muhammad Yunus</destDir><elapsedTime>18s</elapsedTime><finishedTime>1200164254</finishedTime><parMessage/></item><item><type>SUCCESS</type><archiveName>The Colbert Report - 2008-01-09 - Matt Taibbi, Gov. Mike Huckabee</archiveName><destDir>/Volumes/LaCie/usenet/The Colbert Report - 2008-01-09 - Matt Taibbi, Gov. Mike Huckabee</destDir><elapsedTime>27s</elapsedTime><finishedTime>1200164664</finishedTime><parMessage></parMessage></item></queue>

hellaworld/trunk/index.php

@@ -275 +275 @@
                 }
 
+                if (array_key_exists('nzbupload', $_FILES)) {
+                        $nzbfile = trim($_FILES['nzbupload']['tmp_name']);
+                        chmod($nzbfile, 0644);
+                        $nzbname = trim($_FILES['nzbupload']['name']);
+                        if (preg_match('/\.nzb$/i', $nzbname)) {
+                                $newfile = dirname($nzbfile)."/".$nzbname;
+                                move_uploaded_file($nzbfile, $newfile);
+                                $c->enqueue($newfile);
+                                unlink($newfile);
+                        } else {
+                                throw new Exception("Invalid NZB upload!");
+                        }
+                        header('Location: ' . $protocol . '://' . $_SERVER['HTTP_HOST'] . $self);
+                }
+
                 if (array_key_exists('bookmarklet', $_GET)) {
                         if (preg_match('/((https?):\/\/)?(([A-Z0-9][A-Z0-9_-]*)((\.[A-Z0-9][A-Z0-9_-]*)+)?)(:(\d+))?(\/([^ ]*)?| |$)/i', $_GET['bookmarklet']) < 1) {

hellaworld/trunk/js/hellaworld.php

@@ -81 +81 @@
                 var info = "<h2><?php echo _('Currently Downloading'); ?></h2>";
                 if (json.downloading != null) {
-                        info += "<div>" + json.downloading + "</div>";
+                        info += '<div class="nzbname">' + json.downloading + '</div>';
                         info += '<div class="queuestats"><img alt="progress bar" src="progress.php?percentage=' + json.completed + '"/> <?php printf(_('%s%% complete'), "' + json.completed + '"); ?></div>';
                         info += '<div class="queuestats"><?php printf(_('%sMB of %sMB remaining'), "' + json.remaining + '", "' + json.size + '"); ?></div>';
@@ -133 +133 @@
                                 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>';
+                                        if (json.finished[i].url != '') {
+                                                finished += '<div><a class="queuetitle" href="' + json.finished[i].url + '">' + json.finished[i].archiveName + '</a></div>';
+                                        } else {
+                                                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"); ?>;

hellaworld/trunk/style/main.css

@@ -62 +62 @@
 }
 
-#modules div {
+#nzbinput {
         background: #eaeaea;
         padding: 3px;
@@ -68 +68 @@
         border-top: 0px;
         margin-bottom: 10px;
-        min-height: 36px;
-        height: 36px;
+        min-height: 30px;
+        height: 73px;
+}
+
+#downrate {
+        background: #eaeaea;
+        padding: 3px;
+        border: 1px solid #000;
+        border-top: 0px;
+        margin-bottom: 10px;
+        min-height: 30px;
+        height: 30px;
+}
+
+#modules div input {
+        left: 0px;
 }
 
@@ -150 +164 @@
         border: 1px solid #000;
         margin-bottom: 10px;
+}
+
+.queuebox.first {
+        margin-left: 310px;
 }
 
@@ -193 +211 @@
 .queuetitle {
         font-weight: bold;
+        color: black;
+}
+
+.queuetitle:visited {
+        font-weight: bold;
+        color: black;
 }
 

hellaworld/trunk/templates/default.php

@@ -47 +47 @@
                 <link rel="stylesheet" type="text/css" href="style/thickbox.css" />
                 <link rel="stylesheet" type="text/css" href="style/tabs.css" />
+                <link rel="icon" href="images/trac.ico" type="image/x-icon" />
+                <link rel="shortcut icon" href="images/trac.ico" type="image/x-icon" />
                 <!--[if lte IE 7]>
                 <link rel="stylesheet" href="style/tabs-ie.css" type="text/css" />
@@ -67 +69 @@
                         <div id="modules">
                                 <h2><?php echo _('Add NZB Via Newzbin ID Or URL'); ?></h2>
-                                <div>
+                                <div id="nzbinput">
                                         <form method="get" action="<?php echo $self; ?>">
                                                 <fieldset>
+                                                        <label for="nzbdownload"><?php echo _('Article ID or URL:'); ?><br /> <input type="text" name="nzbdownload" id="nzbdownload" /></label>
                                                         <input type="submit" value="Go" style="float:right;" />
-                                                        <label for="nzbdownload"><?php echo _('Article ID or URL:'); ?> <input type="text" name="nzbdownload" id="nzbdownload" /></label>
                                                 </fieldset>
                                         </form>
+                                        <form method="post" enctype="multipart/form-data" action="<?php echo $self; ?>">
+                                                <fieldset>
+                                                        <label for="nzbupload" ><?php echo _('Upload NZB:'); ?><br/> <input size=27 type="file" name="nzbupload" id="nzbupload" /></label>
+                                                        <input type="submit" value="Go" style="float:right;" />
+                                                </fieldset>
+                                        </form>
                                 </div>
                                 <h2><?php echo _('Set Rate Limit'); ?></h2>
-                                <div>
+                                <div id="downrate" >
                                         <form method="get" action="<?php echo $self; ?>">
                                                 <fieldset>
@@ -101 +109 @@
 <h2><?php echo _('Currently Downloading'); ?></h2>
 <?php if ($c->downloadCount > 0): foreach($c->downloads as $download): ?>
-<div><?php echo htmlspecialchars($download['nzbName']); ?></div>
+<div class="nzbname"><?php echo htmlspecialchars($download['nzbName']); ?></div>
 <div class="queuestats"><img src="progress.php?percentage=<?php echo $c->completed; ?>" alt="progress bar" /> <?php printf(_('%s%% complete'), $c->completed); ?></div>
 <div class="queuestats"><?php printf(_('%sMB of %sMB remaining'), $c->remaining, $download['total_mb']); ?></div>
@@ -154 +162 @@
 <div id="log"><?php foreach ($c->log as $line): echo $line . "<br />"; endforeach; ?></div>
 </div>
-<?php if (isset($config['showfinished']) && $config['showfinished']): $finishedcount = count($x->item); ?>
+<?php if (isset($config['showfinished']) && $config['showfinished']): $finishedcount = count($x->item);
+        $baseurl = (!strstr($config['basepath'], '://') ? $protocol . '://' . htmlentities($_SERVER['HTTP_HOST']) : '').$config['basepath'].'/';
+?>
 <div id="fragment-2">
 <div id="finishedbox">
@@ -169 +179 @@
                         <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++; ?>
+                        <?php $i = 0; foreach($x->item as $item):
+                                $i++; $durl = '';
+                                if (!strncmp($config['destpath'], (string)$item->destDir, strlen($config['destpath'])) && is_dir((string)$item->destDir)):
+                                        $durl = $baseurl.substr((string)$item->destDir, strlen($config['destpath'])+1);
+                                endif
+                        ?>
                         <li class="queuebox <?php echo (((string)$item->type == 'SUCCESS') ? 'good' : 'bad'); ?>">
-                                <div class="queuetitle">
-                                        <?php echo (string)$item->archiveName; ?>
+                                <div>
+                                        <?php if ($config['showlinks'] && !empty($durl)): ?>
+                                        <div><a class="queuetitle" href="<?php echo $durl; ?>"><?php echo (string)$item->archiveName; ?></a></div>
+                                        <?php else: ?>
+                                        <div class="queuetitle"><?php echo (string)$item->archiveName; ?></div>
+                                        <?php endif ?>
                                 </div>
                                 <ul class="queuecontrols">

hellaworld/trunk/templates/json.php

@@ -77 +77 @@
         $hellainfo['showfinished'] = true;
         $hellainfo['finished'] = array();
+        $baseurl = (!strstr($config['basepath'], '://') ? $protocol . '://' . htmlentities($_SERVER['HTTP_HOST']) : '').$config['basepath'].'/';
         $i = 0;
         foreach($x->item as $item) {
                 $tmp = array();
+                $durl = '';
+                if (!strncmp($config['destpath'], (string)$item->destDir, strlen($config['destpath']))) {
+                        $durl = $baseurl.substr((string)$item->destDir, strlen($config['destpath'])+1);
+                }
                 $tmp['index'] = ++$i;
                 $tmp['type'] = (((string)$item->type == 'SUCCESS') ? 'good' : 'bad' );
                 $tmp['archiveName'] = (string)$item->archiveName;
                 $tmp['destDir'] = (string)$item->destDir;
+                $tmp['url'] = $durl;
                 $tmp['elapsedTime'] = (string)$item->elapsedTime;
                 $tmp['finishedTime'] = date('M dS - H:i:s', (int)$item->finishedTime);