Continue refactoring the rss module and distribute the creation of al…

…bum and

 tag feeds to the gallery and tag modules respectively.  This chould close
ticket #388

modules/gallery/helpers/gallery_rss.php

@@ -22,7 +22,10 @@ class gallery_rss_Core {
   static function available_feeds($item) {
     return array(array("description" => t("New photos or movies"),
                        "sidebar" => true,
-                       "uri" => "updates"));
+                       "uri" => "updates"),
+                 array("description" => t("Album feed"),
+                       "sidebar" => false,
+                       "uri" => "albums"));
   }
 
   static function updates($offset, $limit) {
@@ -39,4 +42,20 @@ static function updates($offset, $limit) {
 
     return $feed;
   }
+
+  static function albums($offset, $limit, $id) {
+    $item = ORM::factory("item", $id);
+    access::required("view", $item);
+
+    $feed = new stdClass();
+    $feed->data["children"] = $item
+      ->viewable()
+      ->descendants($limit, $offset, "photo");
+    $feed->max_pages = ceil($item->viewable()->descendants_count("photo") / $limit);
+    $feed->data["title"] = $item->title;
+    $feed->data["link"] = url::abs_site("albums/{$item->id}");
+    $feed->data["description"] = $item->description;
+
+    return $feed;
+  }
 }

modules/rss/controllers/rss.php

@@ -20,90 +20,6 @@
 class Rss_Controller extends Controller {
   public static $page_size = 30;
 
-  public function albums($id) {
-    $item = ORM::factory("item", $id);
-    access::required("view", $item);
-
-    $page = $this->input->get("page", 1);
-    if ($page < 1) {
-      url::redirect("rss/albums/{$item->id}");
-    }
-
-    $children = $item
-      ->viewable()
-      ->descendants(self::$page_size, ($page - 1) * self::$page_size, "photo");
-    $max_pages = ceil($item->viewable()->descendants_count("photo") / self::$page_size);
-
-    if ($max_pages && $page > $max_pages) {
-      url::redirect("rss/albums/{$item->id}?page=$max_pages");
-    }
-
-    $view = new View("feed.mrss");
-    $view->title = $item->title;
-    $view->link = url::abs_site("albums/{$item->id}");
-    $view->description = $item->description;
-    $view->feed_link = url::abs_site("rss/albums/{$item->id}");
-    $view->children = $children;
-
-    if ($page > 1) {
-      $previous_page = $page - 1;
-      $view->previous_page_link = url::site("rss/albums/{$item->id}?page={$previous_page}");
-    }
-
-    if ($page < $max_pages) {
-      $next_page = $page + 1;
-      $view->next_page_link = url::site("rss/albums/{$item->id}?page={$next_page}");
-    }
-
-    // @todo do we want to add an upload date to the items table?
-    $view->pub_date = date("D, d M Y H:i:s T");
-
-    rest::http_content_type(rest::RSS);
-    print $view;
-  }
-
-  public function tags($id) {
-    $tag = ORM::factory("tag", $id);
-    if (!$tag->loaded) {
-      return Kohana::show_404();
-    }
-
-    $page = $this->input->get("page", 1);
-    if ($page < 1) {
-      url::redirect("rss/tags/{$tag->id}");
-    }
-
-    $children = $tag->items(self::$page_size, ($page - 1) * self::$page_size, "photo");
-    $max_pages = ceil($tag->count / self::$page_size);
-
-    if ($max_pages && $page > $max_pages) {
-      url::redirect("rss/tags/{$tag->id}?page=$max_pages");
-    }
-
-    $view = new View("feed.mrss");
-    $view->title = $tag->name;
-    $view->link = url::abs_site("tags/{$tag->id}");
-    $view->description = t("Photos related to %tag_name", array("tag_name" => $tag->name));
-    $view->feed_link = url::abs_site("rss/tags/{$tag->id}");
-    $view->children = $children;
-
-    if ($page > 1) {
-      $previous_page = $page - 1;
-      $view->previous_page_link = url::site("rss/tags/{$tag->id}?page={$previous_page}");
-    }
-
-    if ($page < $max_pages) {
-      $next_page = $page + 1;
-      $view->next_page_link = url::site("rss/tags/{$tag->id}?page={$next_page}");
-    }
-
-    // @todo do we want to add an upload date to the items table?
-    $view->pub_date = date("D, d M Y H:i:s T");
-
-    rest::http_content_type(rest::RSS);
-    print $view;
-  }
-
   public function __call($method, $arguments) {
     $id = empty($arguments) ? null : $arguments[0];
     $page = $this->input->get("page", 1);

modules/tag/helpers/tag_rss.php

@@ -0,0 +1,43 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+class tag_rss_Core {
+  static function available_feeds($item) {
+    return array(array("description" => t("Tag Album feed"),
+                       "sidebar" => false,
+                       "uri" => "tags"));
+  }
+
+  static function tags($offset, $limit, $id) {
+    $tag = ORM::factory("tag", $id);
+    if (!$tag->loaded) {
+      return Kohana::show_404();
+    }
+
+    $feed = new stdClass();
+    $feed->data["children"] = $tag->items($limit, $offset, "photo");
+    $feed->max_pages = ceil($tag->count / $limit);
+    $feed->data["title"] = $tag->name;
+    $feed->data["link"] = url::abs_site("tags/{$tag->id}");
+    $feed->data["description"] = t("Photos related to %tag_name", array("tag_name" => $tag->name));
+
+    return $feed;
+  }
+}