Changeset 185

Timestamp:

10/24/08 01:32:46 (3 months ago)

Author:

drarok

Message:

* Implemented autoloading of classes.
* Renamed nzb-helper.php to nzb.php (related to autoload).
* Added a new class for feed management.
* Created a command-line tool for feed management. (See HellaWorldInfo on the wiki).
* Merged cron.php functionality into new feed management tool.

Location:

hellaworld/branches/autonzb

Files:

• . (modified) (1 prop)
• classes/autoload.php (added)
• classes/feed-manager.php (added)
• classes/nzb.php (moved) (moved from hellaworld/branches/autonzb/classes/nzb-helper.php) (1 diff, 1 prop)
• classes/xml-dataset.php (modified) (1 diff)
• cron.php (deleted)
• index.php (modified) (2 diffs)
• manage.php (added)
• templates/default.php (modified) (1 diff)

hellaworld/branches/autonzb

@@ -2 +2 @@
 ._*
 feeds.xml
+completed.xml

@@ -2 +2 @@
 ._*
 feeds.xml
+completed.xml

hellaworld/branches/autonzb/classes/nzb.php

@@ -17 +17 @@
                 );
         }
+        
+        public static function add_feed($dataset, $url) {
+                // Check we don't already have this feed...
+                foreach ($dataset->feed as $feed)
+                        if ($feed['url'] == $url)
+                                throw new Exception('Feed already exists.');
+                        
+                // Add the new feed!
+                $atom = new Atom_Feed($url);
+                $latest = reset($atom->entry);
+                $parsed = nzb::parse($latest);
+                
+                $feed = $dataset->addNode('feed', array('url' => $url));
+                $feed->addAttribute('name', $parsed->show);
+                $feed->addAttribute('latest_episode', $parsed->episode);
+        }
 }

hellaworld/branches/autonzb/classes/xml-dataset.php

@@ -26 +26 @@
                 return $this->root->$key;
         }
+        
+        public function asXML() {
+                return $this->root->asXML();
+        }
 
         function addNode($name, $attributes = array()) {

hellaworld/branches/autonzb/index.php

@@ -97 +97 @@
                 $protocol = (($_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http');
 
-                require_once 'classes/HellaController.php';
-                
-                require_once('classes/xml-dataset.php');
-                require_once('classes/atom-feed.php');
-                require_once('classes/nzb-helper.php');
+                require_once 'classes/autoload.php';
 
                 if ($auth == 'exclusive' && !ipInRange($iprange, $_SERVER['REMOTE_ADDR'])) {
@@ -360 +356 @@
                 
                 // Auto-NZB
-                if (array_key_exists('addfeed', $_GET)) {       
-                        $dataset = new XML_Dataset('./feeds.xml');
-                        
-                        // Check we don't already have this feed...
-                        foreach ($dataset->feed as $feed)
-                                if ($feed->attributes()->url == $_GET['addfeed'])
-                                        throw new Exception('Feed already processed.');
-                        
-                        // Add the new feed!
-                        $atom = new Atom_Feed($_GET['addfeed']);
-                        $latest = reset($atom->entry);
-                        $parsed = nzb::parse($latest);
-                        
-                        $feed = $dataset->addNode('feed', array('url' => $_GET['addfeed']));
-                        $feed->addAttribute('name', $parsed->show);
-                        $feed->addAttribute('latest_episode', $parsed->episode);
-                        $dataset->save();                                       
+                if (array_key_exists('addfeed', $_GET)) {
+                        $manager = new Feed_Manager();
+                        $manager->add($_GET['addfeed']);
                 }
 

hellaworld/branches/autonzb/templates/default.php

@@ -218 +218 @@
                 <ul>
 <?php
-        if (! isset($dataset))
-                $dataset = new XML_Dataset('./feeds.xml');
-        if (count($dataset->feed) == 0)
+        // We might need to instantiate a manager.
+        if (! isset($manager))
+                $manager = new Feed_Manager();
+        
+        // Grab the feeds.
+        $feeds = $manager->feeds(TRUE);
+        
+        // Are there any to show?
+        if (count($feeds) == 0)
                 echo '<li>There are no feeds to display.</li>', "\n";
         else
-                foreach ($dataset->feed as $feed) {
-                        $attrs = $feed->attributes();
-                        echo sprintf('<li>%s (%s)</li>', $attrs->name, $attrs->latest_episode), "\n";
-                }
+                foreach ($feeds as $feed)
+                        echo sprintf('<li>%s (%s)</li>',
+                                $feed['name'], $feed['latest_episode']), "\n";
 ?>
                 </ul>

@@ -2 +2 @@
 ._*
 feeds.xml
+completed.xml