Changeset 142

Timestamp:

01/30/06 16:14:29 (3 years ago)

Author:

dsandler

Message:

New feed syntax in publisher.conf allows you to specify a separate public_url
from the feed's canonical URL. This allows you to have, for example, a
private full-content feed pushed out by FeedTree, and a public summaries-only
feed for conventional RSS users. (Another example: A public URL for your
FeedBurner?-hosted feed and a private URL for your *real* feed.)

Files:

• feedtree/trunk/publisher.conf (modified) (2 diffs)
• feedtree/trunk/src/net/feedtree/publisher/Publisher.java (modified) (18 diffs)

feedtree/trunk/publisher.conf

@@ -14 +14 @@
-
-# list of feed URLs to be fetched by the publisher & pushed to FeedTree
+# (comma-separated, square-bracket-enclosed)
-feeds = [
-
+
+
+
+
+
+
+
+
-]
-
@@ -55 +63 @@
-node_port = 29691
-
- (currently unused)
+
-web_port = 8502
-

feedtree/trunk/src/net/feedtree/publisher/Publisher.java

@@ -20 +20 @@
-/// \verbinclude publisher.conf
-/// 
-url
+feed
-/// To generate signed entries, at least \c keystore must be specified.
-
@@ -99 +99 @@
-    public static final String PROP_WEB_PORT = "web_port";
-    
-
-
+ or feed
+structures.  
-    /// feeds = [
-    ///   "http://site.com/feed/atom/",
-
+
+
+
+
-    /// ]
-    public static final String PROP_FEEDS = "feeds";
+
+    /// In a feed structure (element of <code>feeds</code>), the URL of the
+    /// feed to fetch and publish.  Required in a feed structure.
+    public static final String PROP_FEEDS_FEED_URL = "url";
+    
+    /// In a feed structure (element of <code>feeds</code>), the public URL of
+    /// the feed (if different from the URL used for fetching).  Optional.
+    public static final String PROP_FEEDS_FEED_PUBLIC_URL = "public_url";
-
-    /// Filename of a local keystore (optional; required for signing entries)
@@ -134 +145 @@
-    protected PrivateKey m_key = null;
-    protected Signature m_signer = null;
-String[] m_url
+Feed[] m_feed
-    
-    protected Shelf m_storage;
@@ -165 +176 @@
-    public static String REPORT_URL = "http://stats.feedtree.net/report";
-    
+    protected static class Feed {
+        public String fetchUrl;
+        public String topic;
+        public Feed(String url) { this.fetchUrl = this.topic = url; }
+        public Feed(String fetchUrl, String topic) {
+            this.fetchUrl = fetchUrl;
+            this.topic = topic;
+        }
+    }
+
-    protected static int hashEntry(SyndEntry e) {
-        String desc = "";
@@ -172 +193 @@
-        String title = e.getTitle();
-        String link = e.getLink();
+        String author = "";
-        List authors = e.getAuthors();
-
+
+
+
+
+
-        Date date = e.getPublishedDate();
-
@@ -227 +253 @@
-        public void run() { 
-            Logger.global.fine("### Refreshing all feeds");
-url
+feed
-                boolean anyNew = false;
-                
-
+
+
-                
-                /*the*/ long now = new Date().getTime();
-
-
+
+
-                LinkedList toPublish = new LinkedList();
-                
-                LinkedHashMap entriesSeen 
-Url
+Topic
-                if (entriesSeen == null) {
-                    entriesSeen = new LinkedHashMap();
-Url
+Topic
-                }
-                
@@ -247 +275 @@
-
-                try {
-ed
+tch
-                    cx.setRequestProperty("User-Agent", "FeedTreePublisher/1");
-                    feed = new SyndFeedInput().build(new XmlReader(cx));
-                    
-                } catch (MalformedURLException exc) {
-ed
+tch
-                } catch (IOException exc) {
-ed
+tch
-                } catch (ParsingFeedException exc) { 
-                    Logger.global.warning("warning: couldn't parse feed (line " 
-                            + exc.getLineNumber() + ", column " 
-                            + exc.getColumnNumber() + ") at URL: "
-ed
+tch
-                            + (exc.getCause() == null ? "" 
-                                : (" <- " + exc.getCause().getCause()))
-                            + ")");
-                } catch (FeedException exc) { 
-ed
+tch
-                }
-
@@ -303 +331 @@
-                                
-                                IFeedUpdateEvent feedEvent = 
-Url
+Topic
-                                
-                                toPublish.add(feedEvent);
@@ -320 +348 @@
-
-                    if (!anyNew) {
-Url
-Url
+Topic
+Topic
-                                > m_heartbeatInterval) 
-                        {
-Url
-Url
+Topic
+Topic
-                        }
-                    }
@@ -335 +363 @@
-                    // have another full heartbeat interval before we have
-                    // to send another HB.
-Url
+Topic
-                    
-                    for(Iterator eventIterator = toPublish.iterator(); 
@@ -419 +447 @@
-                    + getLocalNodeHandle().toString() 
-                    + "</title></head><body>");
+
+                output.write("<h2>FeedTree Publisher: "
+                    + getLocalNodeHandle().toString() 
+                    + "</h2>");
-                
-                // TODO: make this pretty
-
-
-
-
-
-
+
+
+
+
+
+
+
-                    if (entries != null) {
-                        for (Iterator j = entries.values().iterator(); j.hasNext();) 
@@ -436 +470 @@
-                                + "</tt></small></li>");
-                        }
-                        output.write("</ol>");
-                    }
+                    output.write("</ol><hr/>");
-                }
-                output.write("</body></html>");
@@ -519 +553 @@
-            query.append("&published_feeds=");
-
-url
+feed
-                if (i>0) query.append("|");
+                String topicUrl = m_feeds[i].topic;
-                try {
-m_urls[i]
+topicUrl
-                } catch (java.io.UnsupportedEncodingException exc) {
-                    query.append(release); // sigh
-                }
-                query.append(',');
-m_urls[i]
-m_urls[i]
+topicUrl
+topicUrl
-                    query.append(topic.getId().toStringFull());
-                }
@@ -597 +632 @@
-    
-    public Publisher(Node node, int nodePort, int webPort, 
-String[] url
+Feed[] feed
-    {
-        super(node, nodePort);
@@ -636 +671 @@
-        m_nodePort = nodePort; m_webPort = webPort;
-
-urls = url
+feeds = feed
-
-        g_classLoader = this.getClass().getClassLoader();
@@ -740 +775 @@
-        int webPort = g_config.optInt(PROP_WEB_PORT, 8500);
-
-String[] url
+Feed[] feed
-        
-        JSONArray urlList = g_config.optJSONArray(PROP_FEEDS);
@@ -749 +784 @@
-        } else {
-            int len = urlList.length();
-urls = new String
+feeds = new Feed
-            try {
-                for (int i=0; i<len; i++) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            } catch (JSONException exc) {
@@ -795 +843 @@
-        Node node = Client.start_node(myPort, bs, bsPort, true);
-        
-url
+feed
-    }
-}