Changeset 856

Timestamp:

05/30/06 15:14:41

Author:

miyagawa

Message:

merge from trunk to plagger-server for Enclosures support and such. Sorry for the big commit

Files:

• branches/feature-server/plagger (modified) (previous)
• branches/feature-server/plagger/AUTHORS (modified) (1 diff)
• branches/feature-server/plagger/Changes (modified) (1 diff)
• branches/feature-server/plagger/MANIFEST (modified) (18 diffs)
• branches/feature-server/plagger/MANIFEST.SKIP (modified) (1 diff)
• branches/feature-server/plagger/Makefile.PL (modified) (6 diffs)
• branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/impress.yaml (modified) (1 diff)
• branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/itmedia.yaml (modified) (1 diff)
• branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/mycom_journal.yaml (modified) (1 diff)
• branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/nikkansports.yaml (modified) (1 diff)
• branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/slashcode.pl (added)
• branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/youtube.yaml (added)
• branches/feature-server/plagger/assets/plugins/Filter-FindEnclosures (added)
• branches/feature-server/plagger/assets/plugins/Filter-FindEnclosures/youtube.pl (added)
• branches/feature-server/plagger/assets/plugins/Filter-StripRSSAd/pheedo_jp (added)
• branches/feature-server/plagger/assets/plugins/Filter-StripRSSAd/pheedo_jp_ad_entry.yaml (added)
• branches/feature-server/plagger/assets/plugins/Filter-TruePermalink/cnet_podcast.yaml (added)
• branches/feature-server/plagger/assets/plugins/Filter-TruePermalink/imenu.yaml (added)
• branches/feature-server/plagger/assets/plugins/Filter-TruePermalink/msn-mainichi.yaml (added)
• branches/feature-server/plagger/assets/plugins/Filter-TruePermalink/redirectors.yaml (added)
• branches/feature-server/plagger/assets/plugins/Filter-TruePermalink/yahoo_blog_search.yaml (modified) (1 diff)
• branches/feature-server/plagger/assets/plugins/Filter-TruePermalink/youtube.yaml (added)
• branches/feature-server/plagger/assets/plugins/Notify-Tiarra (added)
• branches/feature-server/plagger/assets/plugins/Notify-Tiarra/irc_notify.tt (added)
• branches/feature-server/plagger/assets/plugins/Publish-PalmDoc (added)
• branches/feature-server/plagger/assets/plugins/Publish-PalmDoc/palmdoc.tt (added)
• branches/feature-server/plagger/examples/bloglines2gmail.yaml (modified) (1 diff)
• branches/feature-server/plagger/examples/livedoorreader2gmail.yaml (modified) (1 diff)
• branches/feature-server/plagger/examples/podcast.yaml (added)
• branches/feature-server/plagger/examples/yapcvideo.yaml (added)
• branches/feature-server/plagger/lib/Plagger.pm (modified) (8 diffs)
• branches/feature-server/plagger/lib/Plagger/Cache.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Cookies.pm (added)
• branches/feature-server/plagger/lib/Plagger/Enclosure.pm (added)
• branches/feature-server/plagger/lib/Plagger/Entry.pm (modified) (2 diffs)
• branches/feature-server/plagger/lib/Plagger/Feed.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Mechanize.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin.pm (modified) (2 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Aggregator/Simple.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/AmazonAssociateReportJP.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Frepa.pm (modified) (6 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/GoogleNews.pm (modified) (2 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Mixi.pm (modified) (3 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Simple.pm (modified) (2 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Yahoo360JP.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/YouTube.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/2chRSSContent.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/BreakEntriesToFeeds.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/EntryFullText.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/FeedBurnerPermalink.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/FetchEnclosure.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/FindEnclosures.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/HEADEnclosureMetadata.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/HatenaKeywordNewsokuTag.pm (deleted)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/HatenaKeywordTag.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/LivedoorKeywordUnlink.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/Markdown.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/POPFile.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/RSSTimeZoneString.pm (modified) (3 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/Regexp.pm (modified) (2 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/RewriteEnclosureURL.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/SpamAssassin.pm (modified) (5 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/StripRSSAd.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/TagsToTitle.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Filter/TruePermalink.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Notify/Campfire.pm (modified) (3 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Notify/Tiarra.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Notify/UpdatePing.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/2chdat.pm (modified) (3 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/Feed.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/Gmail.pm (modified) (6 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/HatenaBookmark.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/IMAP.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/MT.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/Maildir.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/OutlineText.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Publish/PalmDoc.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/Bloglines.pm (modified) (4 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/HatenaRSS.pm (modified) (3 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/LivedoorReader.pm (modified) (5 diffs)
• branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/Odeo.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/PlanetINI.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/XOXO.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/XPath.pm (added)
• branches/feature-server/plagger/lib/Plagger/Plugin/Widget/Delicious.pm (modified) (2 diffs)
• branches/feature-server/plagger/lib/Plagger/Rule/URLBL.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/TT/Plagger/Util.pm (modified) (1 diff)
• branches/feature-server/plagger/lib/Plagger/UserAgent.pm (modified) (3 diffs)
• branches/feature-server/plagger/lib/Plagger/Util.pm (modified) (4 diffs)
• branches/feature-server/plagger/t/core (added)
• branches/feature-server/plagger/t/core/cookies.t (added)
• branches/feature-server/plagger/t/core/cookies.txt (added)
• branches/feature-server/plagger/t/core/googlevideo.xml (added)
• branches/feature-server/plagger/t/core/monkey.rss (added)
• branches/feature-server/plagger/t/core/mrss.t (added)
• branches/feature-server/plagger/t/plugins (added)
• branches/feature-server/plagger/t/plugins/CustomFeed-GoogleNews (added)
• branches/feature-server/plagger/t/plugins/CustomFeed-GoogleNews/test.t (added)
• branches/feature-server/plagger/t/plugins/Filter-FeedBurnerPermalink (added)
• branches/feature-server/plagger/t/plugins/Filter-FeedBurnerPermalink/feedburner.t (added)
• branches/feature-server/plagger/t/plugins/Filter-FetchEnclosure (added)
• branches/feature-server/plagger/t/plugins/Filter-FetchEnclosure/fetch.t (added)
• branches/feature-server/plagger/t/plugins/Filter-FindEnclosures (added)
• branches/feature-server/plagger/t/plugins/Filter-FindEnclosures/object.t (added)
• branches/feature-server/plagger/t/plugins/Filter-LivedoorKeywordUnlink (added)
• branches/feature-server/plagger/t/plugins/Filter-LivedoorKeywordUnlink/livedoor.t (added)
• branches/feature-server/plagger/t/plugins/Notify-UpdatePing (added)
• branches/feature-server/plagger/t/plugins/Notify-UpdatePing/ping.t (added)
• branches/feature-server/plagger/t/plugins/Subscription-ConfigINI (added)
• branches/feature-server/plagger/t/plugins/Subscription-ConfigINI/config.ini (added)
• branches/feature-server/plagger/t/plugins/Subscription-ConfigINI/subscription.t (added)
• branches/feature-server/plagger/t/regression (added)
• branches/feature-server/plagger/t/regression/mime-lite-chop.t (added)
• branches/feature-server/plagger/t/regression/mime-type-dup.t (added)
• branches/feature-server/plagger/tools (added)
• branches/feature-server/plagger/tools/release.pl (added)

branches/feature-server/plagger/AUTHORS

@@ -24 +24 @@
-Daisuke Murase (typester)
-Manabu Ishii
+woremacx
+Tatsuya Noda
+Motokazu Sekine (cheebow)

branches/feature-server/plagger/Changes

@@ -1 +1 @@
-The latest, HTML version of this document is always available at http://plagger.org/trac.cgi/wiki/PlaggerChangeLog
+
+== 0.7.1 (2006/05/24) ==
+
+=== Core ===
+
+ * Added woremacx, topia and cheebow as AUTHORS
+ * Plagger::Cookies and Plagger::Mechanize allows Plagger to share cookies with your browser like Firefox, IE or Safari.
+
+=== New Plugins ===
+
+ * Notify::UpdatePing: notify updates via XMLRPC pings (miyagawa)
+ * Publish::PalmDoc: publish updates to PalmDoc (cheebow)
+ * Publish::OutlineText: publish updates as outline text (cheebow)
+
+=== Plugins Updates ===
+
+ * Filter::Regexp: now you can use utf-8 regular expressions (woremacx)
+ * Widget::Delicious: Support one_click_post to automatically post by clicking (s_nobu)
+ * Filter::FetchEnclosures: Now it's extensible using meta-plugins. Added youtube.pl as an example. Thanks to mizzy
+ * CustomFeed::Simple: deduplicate links by URLs. Don't add links associated with images without alt (miyagawa)
+ * Filter::TruePermalink: Added YouTube, MSN Mainichi
+ * Publish::MT: Fixed blog_id config bug. #252
+ * Subscription::LivedoorReader: Adds ApiKey as a sticky query to their API (suggested by mala)
+ * Publish::Gmail: Don't trim lines over 1000 by using quoted-printable.
+ * CustomFeed::GoogleNews: now accepts keyword search result page as well
+ * Filter::HatenaRSS: Update OPML URL. Uses Cookie sharing framework.
+ * CustomFeed::Frepa: Uses Cookie sharing.
+ * CustomFeed::Mixi: Uses Cookie sharing.
+ * CustomFeed::Yahoo360JP: Uses Cookie sharing.
+ * Subscription::LivedoorReader: Uses Cookie sharing.
+ * Notify::Campfire: Uses Cookie sharing.
+
+== 0.7.0 (2006/05/17) ==
+
+=== Core ===
+
+ * Shiny new Enclosure support!
+ * Dependency for MIME::Types
+ * Fix $cache->path_to auto creation bug
+ * Allow plugins/Foo/Bar.pm directory strcuture to be backward compatible
+ * Added regression and plugins tests suite for the first time
+
+
+=== New Plugins ===
+
+ * Filter::FetchEnclosure: Download enclosures automatically to local
+ * CustomFeed::YouTube: Search YouTube and find enclosures (mizzy)
+ * Filter::RewriteEnclosureURL: Rewrite enclosure's URL when you republish downloaded enclosures
+ * Filter::POPFile: Use POPFile XMLRPC API to classify feeds (charsbar)
+ * Filter::TagsToTitle: Add tags to title as prefixes (charsbar)
+ * Filter::FindEnclosures: Automatically discover enclosures in entry content
+ * Filter::HEADEnclosureMetadata: Send HEAD requests to enclosures to get Length and correct filename
+ * Subscription::XPath: extract subscriptions from XHTML using XPath (youpy)
+ * Subscription::PlanetINI: extract subscriptions from Planet's config.ini file
+
+=== Plugins Updates ===
+
+ * Publish::2chdat: Internal fix to use id_safe method
+ * Subscription::Bloglines: support enclosures taken from sync API
+ * Publish::Gmail: Attach enclosures if they're downloaded locally with FetchEnclosure
+ * Filter::TruePermalink: Now supports rewriting enclosure URL as well.
+ * Filter::TruePermalink: Support recursive mode and redirector resolution
+ * Publish::Feed: Support enclosure creation in RSS 2.0 and Atom feeds
+ * Filter::SpamAssassin: Nuked some options (charsbar)
+ * Filter::HatenaKeyword: Use title to extract keywords as well
+ * Filter::StripRSSAd: Added pheedo.jp pattern. Now can strip entry if it contains certain pattern.
+ * 
+== 0.6.6 (2006/05/12) ==
+
+=== Core ===
+
+ * Added sites upgrade files (woremacx)
+ * Don't truncate newline after password rewrite #200
+ * Share $feed object between subscription and update
+ * encode detection now uses XML encoding declaration first
+ * Unhandled feed is removed from $context->subscription
+ * Plagger::Date->parse doesn't force preference timezone if parsed datetime is floating
+ * Load plugins from plugins/*/lib #212
+
+=== New Plugins ===
+ 
+ * Filter::HatenaKeywordTag: Use Hatena Keyword API to auto-tag (secondlife)
+ * Search::Estraier: Search plugin to use Hyper Estraier Node API (miyagawa)
+ * Subscription::XOXO: load subscription from XOXO microformats (miyagawa)
+ * Publish::2chdat: Create 2ch subject.txt and *.dat files (miyagawa)
+ * Filter::2chRSSContent: Fix rss.s2ch.net feed content (miyagawa)
+ * Filter::Markdown: Filter entry body using Markdown syntax (s_nobu) 
+
+=== Plugins Updates ===
+
+ * Notify::IRC: added password config to plagger-ircbot #197
+ * Filter::TruePermalink: Updated Y! Blogsearch pattern. Added reedit.com
+ * rename Publish::Spotlight to Search::Spotlight #207
+ * CustomFeed::Mixi: support "ashiato". Update WWW::Mixi deps
+ * Rule::URLBL: now works with $args->{entry} to be used with Filter::Rule
+ * Publish::Planet: get members from subscription rather than update #198
+ * CustomFeed::BloglinesCitation: Handle local datetime PST #187
+ * Filter::EntryFullText: now work with rule
-
-== 0.6.5 (2006/04/28) ==

branches/feature-server/plagger/MANIFEST

@@ -11 +11 @@
-assets/plugins/Filter-EntryFullText/blog_goo_ne_jp.yaml
-assets/plugins/Filter-EntryFullText/blog_tech.rikunabi_next.yaml
+assets/plugins/Filter-EntryFullText/business-i.yaml
-assets/plugins/Filter-EntryFullText/chugoku-np.yaml
-assets/plugins/Filter-EntryFullText/chuspo_dragons.yaml
@@ -31 +32 @@
-assets/plugins/Filter-EntryFullText/japan_linux_com.yaml
-assets/plugins/Filter-EntryFullText/japan_zdnet_com.yaml
+assets/plugins/Filter-EntryFullText/kyodo.yaml
-assets/plugins/Filter-EntryFullText/kyoko_shimbun_news.yaml
+assets/plugins/Filter-EntryFullText/kyoto-np.yaml
-assets/plugins/Filter-EntryFullText/linuxjournal.yaml
-assets/plugins/Filter-EntryFullText/livedoorblog.pl
+assets/plugins/Filter-EntryFullText/mainichi-msn.yaml
+assets/plugins/Filter-EntryFullText/mycom_journal.yaml
-assets/plugins/Filter-EntryFullText/netkeiba.yaml
-assets/plugins/Filter-EntryFullText/news_com.yaml
-assets/plugins/Filter-EntryFullText/newsforge.yaml
-assets/plugins/Filter-EntryFullText/nikkansports.yaml
+assets/plugins/Filter-EntryFullText/nikkei.yaml
-assets/plugins/Filter-EntryFullText/nytimes.yaml
+assets/plugins/Filter-EntryFullText/okinawatimes_day.yaml
-assets/plugins/Filter-EntryFullText/osaka_nikkansports.yaml
-assets/plugins/Filter-EntryFullText/pcweb_mycom.yaml
-assets/plugins/Filter-EntryFullText/physorg.yaml
-assets/plugins/Filter-EntryFullText/plaza_rakuten.yaml
@@ -46 +52 @@
-assets/plugins/Filter-EntryFullText/rbbtoday_com.yaml
-assets/plugins/Filter-EntryFullText/reuters.yaml
+assets/plugins/Filter-EntryFullText/ryukyushimpo.yaml
-assets/plugins/Filter-EntryFullText/sanspo.yaml
-assets/plugins/Filter-EntryFullText/sciam.yaml
-assets/plugins/Filter-EntryFullText/searchenginejournal.yaml
-assets/plugins/Filter-EntryFullText/sixapart.pl
+assets/plugins/Filter-EntryFullText/slashcode.pl
-assets/plugins/Filter-EntryFullText/slashdot_jp.yaml
-assets/plugins/Filter-EntryFullText/sponichi.yaml
@@ -56 +64 @@
-assets/plugins/Filter-EntryFullText/theinquirer.yaml
-assets/plugins/Filter-EntryFullText/theregister.yaml
+assets/plugins/Filter-EntryFullText/ti-da_net.yaml
-assets/plugins/Filter-EntryFullText/usatoday.yaml
-assets/plugins/Filter-EntryFullText/wired_com.yaml
+assets/plugins/Filter-EntryFullText/worldtimes.yaml
-assets/plugins/Filter-EntryFullText/www_nikkeibp.yaml
-assets/plugins/Filter-EntryFullText/yakult.yaml
-assets/plugins/Filter-EntryFullText/yomiuri.yaml
+assets/plugins/Filter-EntryFullText/youtube.yaml
-assets/plugins/Filter-EntryFullText/zakzak.yaml
-assets/plugins/Filter-EntryFullText/zzz_google_adsense.pl
+assets/plugins/Filter-FindEnclosures/youtube.pl
-assets/plugins/Filter-StripRSSAd/feedburner
-assets/plugins/Filter-StripRSSAd/google_adsense
-assets/plugins/Filter-StripRSSAd/google_adsense2
-assets/plugins/Filter-StripRSSAd/pheedo
+assets/plugins/Filter-StripRSSAd/pheedo_jp
+assets/plugins/Filter-StripRSSAd/pheedo_jp_ad_entry.yaml
-assets/plugins/Filter-StripRSSAd/plaza_rakuten
-assets/plugins/Filter-StripRSSAd/rssad_jp
@@ -72 +86 @@
-assets/plugins/Filter-StripRSSAd/valueclick
-assets/plugins/Filter-TruePermalink/2chrss.yaml
+assets/plugins/Filter-TruePermalink/cnet_podcast.yaml
+assets/plugins/Filter-TruePermalink/imenu.yaml
+assets/plugins/Filter-TruePermalink/msn-mainichi.yaml
-assets/plugins/Filter-TruePermalink/namaan.yaml
-assets/plugins/Filter-TruePermalink/rd_yahoo.yaml
-assets/plugins/Filter-TruePermalink/reddit.yaml
+assets/plugins/Filter-TruePermalink/redirectors.yaml
-assets/plugins/Filter-TruePermalink/refrss.yaml
-assets/plugins/Filter-TruePermalink/tech_souken.yaml
@@ -80 +98 @@
-assets/plugins/Filter-TruePermalink/yahoo_blog_search2.yaml
-assets/plugins/Filter-TruePermalink/yahoo_us_rd.yaml
+assets/plugins/Filter-TruePermalink/youtube.yaml
-assets/plugins/Notify-IRC/irc_notify.tt
+assets/plugins/Notify-Tiarra/irc_notify.tt
-assets/plugins/Publish-CHTML/chtml_entry.tt
-assets/plugins/Publish-CHTML/chtml_feed.tt
@@ -89 +109 @@
-assets/plugins/Publish-MTWidget/mt_widget.tt
-assets/plugins/Publish-OPML/opml.tt
+assets/plugins/Publish-PalmDoc/palmdoc.tt
-assets/plugins/Publish-Planet/default/static/css/handheld.css
-assets/plugins/Publish-Planet/default/static/css/print.css
@@ -104 +125 @@
-bin/spotlight_comment.scpt
-Changes
-examples/aggregator.yaml
-examples/atode.yaml
-examples/bloglines2gmail.yaml
@@ -110 +130 @@
-examples/livedoorreader2gmail.yaml
-examples/planet.yaml
+examples/podcast.yaml
+examples/search.yaml
+examples/xoxo-planet.yaml
+examples/xoxo2opml.yaml
+examples/yapcvideo.yaml
-inc/Module/AutoInstall.pm
-inc/Module/Install.pm
@@ -127 +152 @@
-lib/Plagger/Cache/Null.pm
-lib/Plagger/CacheProxy.pm
+lib/Plagger/Cookies.pm
-lib/Plagger/Crypt.pm
-lib/Plagger/Crypt/Base64.pm
-lib/Plagger/Date.pm
+lib/Plagger/Enclosure.pm
-lib/Plagger/Entry.pm
-lib/Plagger/Feed.pm
+lib/Plagger/Mechanize.pm
-lib/Plagger/Operator.pm
-lib/Plagger/Plugin.pm
@@ -152 +180 @@
-lib/Plagger/Plugin/CustomFeed/SVNLog.pm
-lib/Plagger/Plugin/CustomFeed/Yahoo360JP.pm
+lib/Plagger/Plugin/CustomFeed/YouTube.pm
-lib/Plagger/Plugin/Filter/2chNewsokuTitle.pm
+lib/Plagger/Plugin/Filter/2chRSSContent.pm
-lib/Plagger/Plugin/Filter/2chRSSPermalink.pm
-lib/Plagger/Plugin/Filter/AtomLinkRelated.pm
@@ -167 +197 @@
-lib/Plagger/Plugin/Filter/FeedBurnerPermalink.pm
-lib/Plagger/Plugin/Filter/FeedFlareStripper.pm
+lib/Plagger/Plugin/Filter/FetchEnclosure.pm
+lib/Plagger/Plugin/Filter/FindEnclosures.pm
-lib/Plagger/Plugin/Filter/FloatingDateTime.pm
-lib/Plagger/Plugin/Filter/HatenaBookmarkTag.pm
@@ -173 +205 @@
-lib/Plagger/Plugin/Filter/HatenaDiaryKeywordUnlink.pm
-lib/Plagger/Plugin/Filter/HatenaFormat.pm
+lib/Plagger/Plugin/Filter/HatenaKeywordTag.pm
+lib/Plagger/Plugin/Filter/HEADEnclosureMetadata.pm
-lib/Plagger/Plugin/Filter/ImageInfo.pm
+lib/Plagger/Plugin/Filter/Markdown.pm
-lib/Plagger/Plugin/Filter/NamaanPermalink.pm
-lib/Plagger/Plugin/Filter/Pipe.pm
+lib/Plagger/Plugin/Filter/POPFile.pm
-lib/Plagger/Plugin/Filter/Profanity.pm
-lib/Plagger/Plugin/Filter/Regexp.pm
-lib/Plagger/Plugin/Filter/ResolveRelativeLink.pm
+lib/Plagger/Plugin/Filter/RewriteEnclosureURL.pm
-lib/Plagger/Plugin/Filter/Romanize.pm
-lib/Plagger/Plugin/Filter/Romanize/Japanese.pm
@@ -186 +223 @@
-lib/Plagger/Plugin/Filter/SpamAssassin.pm
-lib/Plagger/Plugin/Filter/StripRSSAd.pm
+lib/Plagger/Plugin/Filter/TagsToTitle.pm
-lib/Plagger/Plugin/Filter/tDiaryComment.pm
-lib/Plagger/Plugin/Filter/Thumbnail.pm
@@ -202 +240 @@
-lib/Plagger/Plugin/Notify/MSAgent.pm
-lib/Plagger/Plugin/Notify/SSTP.pm
+lib/Plagger/Plugin/Notify/Tiarra.pm
+lib/Plagger/Plugin/Notify/UpdatePing.pm
+lib/Plagger/Plugin/Publish/2chdat.pm
-lib/Plagger/Plugin/Publish/CHTML.pm
-lib/Plagger/Plugin/Publish/CSV.pm
@@ -215 +256 @@
-lib/Plagger/Plugin/Publish/MTWidget.pm
-lib/Plagger/Plugin/Publish/OPML.pm
+lib/Plagger/Plugin/Publish/OutlineText.pm
+lib/Plagger/Plugin/Publish/PalmDoc.pm
-lib/Plagger/Plugin/Publish/PDF.pm
-lib/Plagger/Plugin/Publish/Pipe.pm
@@ -224 +267 @@
-lib/Plagger/Plugin/Publish/Speech/Win32.pm
-lib/Plagger/Plugin/Publish/Takahashi.pm
+lib/Plagger/Plugin/Search/Estraier.pm
-lib/Plagger/Plugin/Search/Namazu.pm
-lib/Plagger/Plugin/Search/Rast.pm
@@ -240 +284 @@
-lib/Plagger/Plugin/Subscription/PingServer.pm
-lib/Plagger/Plugin/Subscription/Planet.pm
+lib/Plagger/Plugin/Subscription/PlanetINI.pm
+lib/Plagger/Plugin/Subscription/XOXO.pm
+lib/Plagger/Plugin/Subscription/XPath.pm
-lib/Plagger/Plugin/Widget/BloglinesSubscription.pm
-lib/Plagger/Plugin/Widget/BulkfeedsSpamReport.pm

branches/feature-server/plagger/MANIFEST.SKIP

@@ -16 +16 @@
-\.bak$
-\.orig$
+plugins/.*\.pm$
+tools/release\.pl
+t/plugins
+t/regression
+^#

branches/feature-server/plagger/Makefile.PL

@@ -23 +23 @@
-requires('HTML::ResolveLink');
-requires('Date::Parse');
+requires('MIME::Types', 1.16);
-
-build_requires(Test::More => 0.42);
@@ -36 +37 @@
-        recommends('Test::Pod::Coverage'),
-    ],
+    'Cookie sharing with Firefox' => [
+        -default => 0,
+        recommends('HTTP::Cookies::Mozilla'),
+    ],
+);
+
+features(
-    'Subscription::Bloglines' => [
-        -default => 1,
-        recommends('WebService::Bloglines', 0.11),
-6
+9
-    ],
-    'Subscription::OPML' => [
@@ -49 +57 @@
-        recommends('XML::Feed', 0.08),
-        recommends('XML::Atom'),
-19
+20
-        recommends('XML::RSS::Liberal'),
-    ],
@@ -214 +222 @@
-        recommends('DateTime::Locale'),
-    ],
+    'Subscription::PlanetINI' => [
+        -default => 0,
+        recommends('Config::INI::Simple'),
+    ],
+    'Notify::UpdatePing' => [
+        -default => 0,
+        recommends('XMLRPC::Lite'),
+    ],
+    'Publish::PalmDoc' => [
+        -default => 0,
+        recommends('Palm::PalmDoc'),
+    ],
-);
-
-if ($^O eq 'darwin') {
-    features(
+        'Cookie sharing with Safari' => [
+            -default => 0,
+            recommends('HTTP::Cookies::Safari'),
+        ],
-        'Search::Spotlight' => [
-            -default => 1,
-            recommends('Mac::Glue'),
-        ],
-    );
-    features(
-        'Publish::Speech' => [
-            -default => 0,
@@ -234 +256 @@
-} elsif ($^O eq 'MSWin32') {
-    features(
+        'Cookie sharing with MSIE' => [
+            -default => 0,
+            recommends('HTTP::Cookies::Microsoft'),
+        ],
-        'Publish::Speech' => [
-            -default => 0,
@@ -247 +273 @@
-    );
-}
+
+tests 't/*.t t/*/*.t t/*/*/*.t';
-
-auto_include;

branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/impress.yaml

@@ -1 +1 @@
-author: kazeburo
-\w+\.watch
+(\w+\.watch|k-tai)
-extract: <!--\s?本文開始\s?-->(.*)<!--\s?本文終了\s?-->
-extract_capture: body

branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/itmedia.yaml

@@ -1 +1 @@
-author: manabou
-
-
-
+
+
+
+
+

branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/mycom_journal.yaml

@@ -1 @@
-pcweb
+journal
-author: Nobuhito Sato
-handle: http://journal\.mycom\.co\.jp/

branches/feature-server/plagger/assets/plugins/Filter-EntryFullText/nikkansports.yaml

@@ -9 +9 @@
-  - %Y年%m月%d日%H時%M分
-  - %Y/%m/%d %H:%M
-
+

branches/feature-server/plagger/assets/plugins/Filter-TruePermalink/yahoo_blog_search.yaml

@@ -1 +1 @@
-author: Tatsuhiko Miyagawa
-match: http://rd\.yahoo\.co\.jp/rss/l/blogsearch
-\*!
+.*?\*\-http%3A!http:
-

branches/feature-server/plagger/examples/bloglines2gmail.yaml

@@ -2 +2 @@
-  plugin_path:
-    - /home/miyagawa/plagger/plugins
-#template_path: /home/miyagawa/plagger/template
+assets_path: /home/miyagawa/plagger/asset
-  timezone: Asia/Tokyo
-  log:

branches/feature-server/plagger/examples/livedoorreader2gmail.yaml

@@ -2 +2 @@
-  plugin_path:
-    - /home/miyagawa/plagger/plugins
-#
+
-  timezone: Asia/Tokyo
-  log:

branches/feature-server/plagger/lib/Plagger.pm

@@ -1 +1 @@
-package Plagger;
-use strict;
-6.5
+7.1
-
-use 5.8.1;
@@ -41 +41 @@
-    if (-e $opt{config} && -r _) {
-        $config = YAML::LoadFile($opt{config});
-        $self->load_include($config);
-        $self->{conf} = $config->{global};
-        $self->{conf}->{log} ||= { level => 'debug' };
-        $self->{config_path} = $opt{config};
+    } elsif (ref($opt{config}) && ref($opt{config}) eq 'SCALAR') {
+        $config = YAML::Load(${$opt{config}});
+    } elsif (ref($opt{config}) && ref($opt{config}) eq 'HASH') {
+        $config = $opt{config};
-    } else {
-        croak "Plagger->bootstrap: $opt{config}: $!";
-    }
-
+    $self->load_include($config);
+    $self->{conf} = $config->{global};
+    $self->{conf}->{log} ||= { level => 'debug' };
+
+    no warnings 'redefine';
-    local *Plagger::context = sub { $self };
-
@@ -65 +71 @@
-sub rewrite_config {
-    my $self = shift;
+
+    unless ($self->{config_path}) {
+        $self->log(warn => "config is not loaded from file. Ignoring rewrite tasks.");
+        return;
+    }
-
-    open my $fh, $self->{config_path} or $self->error("$self->{config_path}: $!");
@@ -136 +147 @@
-
-    # use config filename as a base directory for cache
-
+ || 'config'
-    my $dir  = $base eq 'config' ? ".plagger" : ".plagger-$base";
-
@@ -159 +170 @@
-                $ent = File::Spec->catfile($path, $ent);
-                if (-f $ent && $ent =~ /\.pm$/) {
-
-
-
-
+
-                } elsif (-d $ent) {
-                    my $lib = File::Spec->catfile($ent, "lib");
@@ -168 +176 @@
-                        $self->log(debug => "Add $lib to INC path");
-                        unshift @INC, $lib;
+                    } else {
+                        my $rule = File::Find::Rule->new;
+                           $rule->file;
+                           $rule->name('*.pm');
+                        my @modules = $rule->in($ent);
+                        for my $module (@modules) {
+                            $self->add_plugin_path($module);
+                        }
-                    }
-                }
@@ -177 +193 @@
-        $self->load_plugin($plugin) unless $plugin->{disable};
-    }
+}
+
+sub add_plugin_path {
+    my($self, $file) = @_;
+
+    my $pkg = $self->extract_package($file)
+        or die "Can't find package from $file";
+    $self->plugins_path->{$pkg} = $file;
+    $self->log(debug => "$file is added as a path to plugin $pkg");
-}
-
@@ -220 +245 @@
-    $module = "Plagger::Plugin::$module";
-
-
+
+
+
-        eval { require $path } or die $@;
-    } else {

branches/feature-server/plagger/lib/Plagger/Cache.pm

@@ -36 +36 @@
-    if (@path > 1) {
-        my @chunk = @path[0..$#path-1];
-
+$self->{base}, 
-    }
-    File::Spec->catfile($self->{base}, @path);

branches/feature-server/plagger/lib/Plagger/Entry.pm

@@ -17 +17 @@
-        tags    => [],
-        meta    => {},
+        enclosures => [],
-    }, $class;
-}
@@ -69 +70 @@
-}
-
+sub add_enclosure {
+    my($self, $enclosure) = @_;
+
+    # don't add enclosure with the same URL again and again
+    unless ($enclosure->url && grep { $_->url && $_->url eq $enclosure->url } $self->enclosures) {
+        push @{ $self->{enclosures} }, $enclosure;
+    }
+}
+
+sub enclosure {
+    my $self = shift;
+    wantarray ? @{$self->{enclosures}} : $self->{enclosures}->[0];
+}
+
+sub enclosures {
+    my $self = shift;
+    wantarray ? @{$self->{enclosures}} : $self->{enclosures};
+}
+
+sub has_enclosure {
+    my $self = shift;
+    scalar @{$self->{enclosures}} > 0;
+}
+
-1;
-

branches/feature-server/plagger/lib/Plagger/Feed.pm

@@ -55 +55 @@
-}
-
+sub id_safe {
+    my $self = shift;
+    my $id = $self->id;
+    $id =~ s![^\w\s]+!_!g;
+    $id =~ s!\s+!_!g;
+    $id;
+}
+
-sub title_text {
-    my $self = shift;

branches/feature-server/plagger/lib/Plagger/Plugin.pm

@@ -5 +5 @@
-__PACKAGE__->mk_accessors( qw(conf rule rule_hook cache) );
-
+use Plagger::Cookies;
-use Plagger::Crypt;
-use Plagger::Rule;
@@ -114 +115 @@
-}
-
+sub cookie_jar {
+    my $self = shift;
+
+    my $agent_conf = Plagger->context->conf->{user_agent} || {};
+    if ($agent_conf->{cookies}) {
+        return Plagger::Cookies->create($agent_conf->{cookies});
+    }
+
+    return $self->cache->cookie_jar;
+}
+
-1;

branches/feature-server/plagger/lib/Plagger/Plugin/Aggregator/Simple.pm

@@ -4 +4 @@
-
-use Feed::Find;
+use Plagger::Enclosure;
-use Plagger::UserAgent;
-use List::Util qw(first);
@@ -12 +13 @@
-
-$XML::Feed::RSS::PREFERRED_PARSER = first { $_->require } qw( XML::RSS::Liberal XML::RSS::LibXML XML::RSS );
+
+eval { require XML::Liberal };
+if (!$@ && XML::Liberal->can('globally_override')) {
+    XML::Liberal->globally_override('LibXML');
+}
-
-sub register {
@@ -87 +93 @@
-    unless ($remote) {
-        $context->log(error => "Parsing $url failed. " . ($@ || XML::Feed->errstr));
-next
+return
-    }
-
@@ -137 +143 @@
-        $entry->body(_u($e->content->body || $e->summary->body));
-
+        # enclosure support, to be added to XML::Feed
+        if ($remote->format =~ /^RSS / && $e->{entry}->{enclosure}) {
+            my $enclosure = Plagger::Enclosure->new;
+            $enclosure->url( URI->new($e->{entry}->{enclosure}->{url}) );
+            $enclosure->length($e->{entry}->{enclosure}->{length});
+            $enclosure->auto_set_type($e->{entry}->{enclosure}->{type});
+            $entry->add_enclosure($enclosure);
+        } elsif ($remote->format eq 'Atom') {
+            for my $link ( grep { $_->rel eq 'enclosure' } $e->{entry}->link ) {
+                my $enclosure = Plagger::Enclosure->new;
+                $enclosure->url( URI->new($link->href) );
+                $enclosure->length($link->length);
+                $enclosure->auto_set_type($link->type);
+                $entry->add_enclosure($enclosure);
+            }
+        }
+
+        # Media RSS
+        my $media_ns = "http://search.yahoo.com/mrss";
+        my $media = $e->{entry}->{$media_ns}->{group} || $e->{entry};
+        my $content = $media->{$media_ns}->{content} || [];
+           $content = [ $content ] unless ref $content;
+
+        for my $media_content (@{$content}) {
+            my $enclosure = Plagger::Enclosure->new;
+            $enclosure->url( URI->new($media_content->{url}) );
+            $enclosure->auto_set_type($media_content->{type});
+            $entry->add_enclosure($enclosure);
+        }
+
+        if (my $thumbnail = $media->{$media_ns}->{thumbnail}) {
+            $entry->icon({
+                url   => $thumbnail->{url},
+                width => $thumbnail->{width},
+                height => $thumbnail->{height},
+            });
+        }
+
-        my $args = {
-            entry      => $entry,

branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/AmazonAssociateReportJP.pm

@@ -4 +4 @@
-use base qw (Plagger::Plugin);
-
-WWW
+Plagger
-
-sub register {
@@ -51 +51 @@
-use strict;
-use warnings;
-WWW
+Plagger
-use base qw(Class::Accessor::Fast);
-
@@ -59 +59 @@
-    my $class = shift;
-    my $plugin = shift;
-WWW
+Plagger
-    $mech->agent_alias( "Windows IE 6" );
-    return bless {
@@ -144 +144 @@
-=head1 SEE ALSO
-
-WWW
+Plagger
-
-=cut

branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Frepa.pm

@@ -7 +7 @@
-use Time::HiRes;
-use UNIVERSAL::require;
-WWW
+Plagger
-
-sub plugin_id {
@@ -25 +25 @@
-    my ($self, $context) = @_;
-
-
-
+
-
-    my $feed = Plagger::Feed->new;
@@ -130 +129 @@
-    my $start_url = 'http://www.frepa.livedoor.com/';
-    my $res = $self->{mech}->get($start_url);
-0 
+
-
-    if ($self->{mech}->content =~ /loginside/) {
+        unless ($args{livedoor_id} && $args{password}) {
+            Plagger->context->log(error => "Error logging in using existent Cookies. Your User-Agent (" . $self->{mech}->agent . ") should strictly match with the UA used with the Cookies.");
+            return;
+        }
+
-        Plagger->context->log(debug => "cookie not found. logging in");
-        $self->{mech}->submit_form(
@@ -142 +146 @@
-        );
-        $self->{mech}->submit;
-0 
-0 
+
+
-    }
-
@@ -208 +212 @@
-C<fetch_body_interval> and C<show_icon>.
-
+Note that you don't have to supply livedoor_id and password if you set
+global cookie_jar in your configuration file and the cookie_jar
+contains a valid login session there, such as:
+
+  global:
+    user_agent:
+      cookies: /path/to/cookies.txt
+
+See L<Plagger::Cookies> for details.
+
+
-=head1 AUTHOR
-
@@ -218 +233 @@
-=head1 SEE ALSO
-
-WWW
+Plagger
-L<http://frepa.livedoor.com/>
-

branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/GoogleNews.pm

@@ -54 +54 @@
-    $feed->link($args->{feed}->url);
-
-
+
+
+
+
-        my $entry = Plagger::Entry->new;
-
-
+
+
+
-        $feed->add_entry($entry);
-    }
@@ -78 +82 @@
-      feed:
-        - http://news.google.com/news?ned=jp&rec=0&topic=s
+        - http://news.google.co.jp/news?hl=ja&ned=jp&q=%E5%9B%B2%E7%A2%81
-
-  - module: CustomFeed::GoogleNews

branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Mixi.pm

@@ -54 +54 @@
-sub load {
-    my($self, $context) = @_;
+
+    my $cookie_jar = $self->cookie_jar;
+    if (ref($cookie_jar) ne 'HTTP::Cookies') {
+        # using foreign cookies = don't have to set email/password. Fake them
+        $self->conf->{email}    ||= 'plagger@localhost';
+        $self->conf->{password} ||= 'pl4gg5r';
+    }
+
-    $self->{mixi} = WWW::Mixi->new($self->conf->{email}, $self->conf->{password});
-self->cache->
+
-
-    my $feed = Plagger::Feed->new;
@@ -79 +87 @@
-    if ($response->content =~ /action=login\.pl/) {
-        $context->log(debug => "Cookie not found. Logging in");
+
+        if ($self->conf->{email} eq 'plagger@localhost') {
+            $context->log(error => 'email/password should be set to login');
+        }
+
-        $response = $self->{mixi}->post("http://mixi.jp/login.pl", {
-            next_url => $next_url,
@@ -214 +227 @@
-Credential you need to login to mixi.jp.
-
+Note that you don't have to supply email and password if you set
+global cookie_jar in your configuration file and the cookie_jar
+contains a valid login session there, such as:
+
+  global:
+    user_agent:
+      cookies: /path/to/cookies.txt
+
+See L<Plagger::Cookies> for details.
+
-=item fetch_body
-

branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Simple.pm

@@ -50 +50 @@
-    my $re = $args->{match};
-
+    my %seen;
-    my $parser = HTML::TokeParser->new(\$content);
-    while (my $token = $parser->get_tag('a')) {
@@ -55 +56 @@
-
-        my $text = $parser->get_trimmed_text('/a');
+        next if !$text || $text eq '[IMG]';
+
+        my $url = URI->new_abs($token->[1]->{href}, $url);
+        next if $seen{$url->as_string}++;
+
-        my $entry = Plagger::Entry->new;
-        $entry->title($text);
- URI->new_abs($token->[1]->{href}, $url) 
+$url
-        $feed->add_entry($entry);
-
-
+ ($text)
-    }
-

branches/feature-server/plagger/lib/Plagger/Plugin/CustomFeed/Yahoo360JP.pm

@@ -6 +6 @@
-use Encode;
-use Time::HiRes;
-WWW
+Plagger
-
-sub plugin_id {
@@ -35 +35 @@
-    my $start = "http://360.yahoo.co.jp/";
-
-
-
+
-    $mech->get($start);
-
@@ -274 +273 @@
-Your Yahoo! ID and password to login.
-
+Note that you don't have to supply these variables if you set global
+cookie_jar in your configuration file and the cookie_jar contains a
+valid login session there, such as:
+
+  global:
+    user_agent:
+      cookies: /path/to/cookies.txt
+
+See L<Plagger::Cookies> for details.
+
-=item fetch_body
-
@@ -292 +301 @@
-=head1 SEE ALSO
-
-WWW
+Plagger
-
-=cut

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/2chRSSContent.pm

@@ -17 +17 @@
-
-    my $body = $args->{entry}->body;
-\.\d\d
+(?:\.\d\d)?
-        my($from, $day, $time, $id) = ($1, $2, $3, $4);
-

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/BreakEntriesToFeeds.pm

@@ -18 +18 @@
-    $feed->clear_entries;
-    $feed->add_entry($args->{entry});
-    $feed->title($args->{entry}->title);
-
-    push @{$self->{feeds}}, $feed;

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/EntryFullText.pm

@@ -109 +109 @@
-    }
-
-
-
+
+
+
-
-    $args->{content} = decode_content($res);
-
-    # if the request was redirected, set it as permalink
-
-
-
-
+
+
+
+
+
+
-    }
-
@@ -134 +137 @@
-                $args->{entry}->body($data->{body});
-                $args->{entry}->title($data->{title}) if $data->{title};
+                $args->{entry}->icon({ url => $data->{icon} }) if $data->{icon};
-
-                # extract date using found one, falls back to Last-Modified
@@ -178 +182 @@
-    # decode as UTF-8
-    for my $key ( qw(extract extract_date_format) ) {
+        next unless defined $data->{$key};
-        if (ref $data->{$key} && ref $data->{$key} eq 'ARRAY') {
-            $data->{$key} = [ map decode("UTF-8", $_), @{$data->{$key}} ];
@@ -223 +228 @@
-        @{$data}{@capture} = @match;
-
+        if ($self->{extract_after_hook}) {
+            eval $self->{extract_after_hook};
+            Plagger->context->error($@) if $@;
+        }
+
-        if ($data->{date}) {
-            if (my $format = $self->{extract_date_format}) {
-                $format = [ $format ] unless ref $format;
-                $data->{date} = (map { Plagger::Date->strptime($_, $data->{date}) } @$format)[0];
+                if ($data->{date} && $self->{extract_date_timezone}) {
+                    $data->{date}->set_time_zone($self->{extract_date_timezone});
+                }
-            } else {
-                $data->{date} = Plagger::Date->parse_dwim($data->{date});
-            }
-        }
-
-        if ($self->{extract_after_hook}) {
-            eval $self->{extract_after_hook};
-            Plagger->context->error($@) if $@;
-        }
-

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/FeedBurnerPermalink.pm

@@ -15 +15 @@
-    my($self, $context, $args) = @_;
-
+    my $fbns = 'http://rssnamespace.org/feedburner/ext/1.0';
+
-    # RSS 1.0 & 2.0
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/RSSTimeZoneString.pm

@@ -55 +55 @@
-0.91) feeds to a correct one.
-
-strf
+c
-example, it'll create a following pubDate format if you're on the box
-under Japanese standard time:
@@ -61 +61 @@
-  Fri, 03 Mar 2006 03:52:42 JST
-
-invalid in RFC 822. (RFC 822 only allows timezone strings for
-
+B<invalid> in RFC 822. (RFC 822 only allows timezone strings
+for 
-
-This plugin fixes the string to:
-
-  Fri, 03 Mar 2006 03:52:42 +0900
-
-and the correct one is re-parsed and set to C<< $entry->date >>.
-
-=head1 AUTHOR
@@ -76 +74 @@
-=head1 SEE ALSO
-
-
+, L<Plagger::Plugin::Filter::RSSLiberalDateTime>
-
-=cut

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/Regexp.pm

@@ -2 +2 @@
-use strict;
-use base qw( Plagger::Plugin::Filter::Base );
+use Encode;
-
-sub init {
@@ -17 +18 @@
-
-    local $_ = $body;
-
+
+
-
-    if ($@) {

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/SpamAssassin.pm

@@ -3 +3 @@
-use base qw( Plagger::Plugin );
-
-1
+2
-
-use Mail::SpamAssassin;
+use MIME::Lite;
+use Encode;
+use Encode::MIME::Header;
-
-sub register {
@@ -11 +14 @@
-    $context->register_hook(
-        $self,
-
+       
-        'update.entry.fixup' => \&filter,
-    );
@@ -28 +31 @@
-    my $sa    = $self->{spamassassin};
-    my $entry = $args->{entry};
-SPAM
+spam
-
-    # create a pseudo mail header to skip some of the sa's default tests
-    my $status = $sa->check_message_text(
-
+
+
+
+
+
+
-    );
-
-    if ($status->is_spam) {
-        $context->log(debug => "spam found");
-
-        $entry->title("[$tag] " . $entry->title) if $self->conf->{add_tag_to_title};
-        $entry->body($entry->body . $status->get_report) if $self->conf->{add_report};
-        $entry->add_tag($tag);
@@ -52 +58 @@
-=head1 NAME
-
-mark spam
+Find spam entrie
-
-=head1 SYNOPSIS
-
-SmartFeed
+Filter
-    config:
-
-
-
+
-      new:
-        local_tests_only: 1
-        config_text:
-          - score MISSING_SUBJECT 0.0
-          - score MISSING_HB_SEP  0.0
-          - score MISSING_HEADERS 0.0
-          - score EMPTY_MESSAGE   0.0
-          - score NO_RELAYS       0.0
-          - score NO_RECEIVED     0.0
-          - score TO_CC_NONE      0.0
-
-=head1 CONFIG
@@ -78 +77 @@
-=item spam_tag
-
-
-
+
-
-
-
-
-
-
-
+
-
-If set to true, the SpamAssassin's report will be added to spam 

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/StripRSSAd.pm

@@ -17 +17 @@
-    my $dir = $self->assets_dir;
-    my $dh = DirHandle->new($dir) or Plagger->context->error("$dir: $!");
-
+\.
-                  map [ File::Spec->catfile($dir, $_), $_ ], sort $dh->read) {
-        $self->load_pattern(@$file);
@@ -28 +28 @@
-    Plagger->context->log(debug => "loading $file");
-
+    if ($file =~ /\.yaml$/) {
+        $self->load_yaml($file, $base);
+    } else {
+        $self->load_regexp($file, $base);
+    }
+}
+
+sub load_regexp {
+    my($self, $file, $base) = @_;
+
-    open my $fh, $file or Plagger->context->error("$file: $!");
-    my $re = join '', <$fh>;
@@ -33 +43 @@
-
-    push @{$self->{pattern}}, { site => $base, re => qr/$re/ };
+}
+
+sub load_yaml {
+    my($self, $file, $base) = @_;
+
+    my $pattern = eval { YAML::LoadFile($file) }
+        or Plagger->context->error("$file: $@");
+
+    push @{$self->{pattern}}, { site => $base, %$pattern };
-}
-
@@ -45 +64 @@
-sub update {
-    my($self, $context, $args) = @_;
-
-
-
-
-
-
+
-
-    for my $pattern (@{ $self->{pattern} }) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    }
-
-body
+args->{entry}->body($body)
-}
-

branches/feature-server/plagger/lib/Plagger/Plugin/Filter/TruePermalink.pm

@@ -5 +5 @@
-use DirHandle;
-use YAML;
+use Plagger::UserAgent;
-use URI;
-use URI::QueryParam;
@@ -29 +30 @@
-
-    Plagger->context->log(debug => "loading $file");
-
+
+
+
+
+
+
-}
-
@@ -43 +49 @@
-    my($self, $context, $args) = @_;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    my $count = 0;
+    my $rewritten;
-
-    for my $plugin (@{ $self->{plugins}}) {
-        my $match = $plugin->{match} || '.'; # anything
-args->{entry}->perma
+
-
-        if ($plugin->{rewrite}) {
-args->{entry}->perma
-$count +
+
+my $done 
-            if ($@) {
-                $context->error("$@ in $plugin->{rewrite}");
+            } elsif ($done) {
+                $count += $done;
+                $rewritten = $_;
+                last;
-            }
-            $args->{entry}->link($_);
-        } elsif ($plugin->{query_param}) {
-
-
-
+
+
-            $count++;
+            $rewritten = $param;
+            last;
-        }
-    }
-
+    unless ($count) {
+        for my $red (@{ $self->{redirectors} }) {
+            next unless $red->{follow_link};
+            if ($link =~ /$red->{follow_link}/i) {
+                my $url = $self->follow_redirect($link);
+                if ($url && $url ne $link) {
+                    $count++;
+                    $rewritten = $url;
+                    last;
+                }
+            }
+        }
+    }
+
-    if ($count) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -89 +161 @@
-this plugin.
-
-
+
+
+
-
-=head1 PATTERN FILES

branches/feature-server/plagger/lib/Plagger/Plugin/Notify/Campfire.pm

@@ -43 +43 @@
-
-use strict;
-WWW
+Plagger
-use HTTP::Request::Common;
-use Encode;
@@ -51 +51 @@
-    my $plugin = shift;
-
-WWW::Mechanize->new(cookie_jar => $plugin->cache
+Plagger::Mechanize->new(cookie_jar => $plugin
-    $mech->agent_alias("Windows IE 6");
-
@@ -144 +144 @@
-L<http://www.campfirenow.com/> chat room.
-
+Note that you don't have to supply emali and password if you set
+global cookie_jar in your configuration file and the cookie_jar
+contains a valid login session there, such as:
+
+  global:
+    user_agent:
+      cookies: /path/to/cookies.txt
+
+See L<Plagger::Cookies> for details.
+
-=head1 AUTHOR
-

branches/feature-server/plagger/lib/Plagger/Plugin/Publish/2chdat.pm

@@ -30 +30 @@
-
-    my $feed = $args->{feed};
-self->safe_id($feed->id)
+feed->id_safe
-    $context->log(info => "Writing dat output to $out");
-
@@ -39 +39 @@
-        ($feed->author || $feed->entries->[0]->author || $anonymous),
-        $self->format_date( Plagger::Date->from_epoch(0) ), # Fix created date to handle bytes-range request
-self->safe_id($feed->id
+feed->id_safe
-        $self->format_body($feed->description) . "<BR>" . $feed->link,
-        $feed->title;
@@ -65 +65 @@
-    open my $fh, ">:encoding(shift_jis)", $out or $context->erorr("$out: $!");
-    for my $feed ($context->update->feeds) {
-self->safe_id($feed->id)
+feed->id_safe
-    }
-}
-
-sub safe_id {
-    my($self, $id) = @_;
-    $id =~ s![^\w\s]+!_!g;
-    $id =~ s!\s+!_!g;
-    $id;
-}
-

branches/feature-server/plagger/lib/Plagger/Plugin/Publish/Feed.pm

@@ -58 +58 @@
-        $entry->issued($e->date) if $e->date;
-        $entry->author($e->author);
+
+        if ($e->has_enclosure) {
+            # RSS 2.0 by spec doesn't allow multiple enclosures
+            my @enclosures = $feed_format eq 'RSS' ? ($e->enclosures->[0]) : $e->enclosures;
+            for my $enclosure (grep { defined $_->url && !$_->is_inline } @enclosures) {
+                $entry->add_enclosure({
+                    url    => $enclosure->url,
+                    length => $enclosure->length,
+                    type   => $enclosure->type,
+                });
+            }
+        }
+
-        $feed->add_entry($entry);
-    }
@@ -64 +77 @@
-    my $filepath = File::Spec->catfile($self->conf->{dir}, $self->gen_filename($f));
-
-url
+link
-
-    my $xml = $feed->as_xml;
@@ -100 +113 @@
-}
-
+# XXX okay, this is a hack until XML::Feed is updated
+*XML::Feed::Entry::Atom::add_enclosure = sub {
+    my($entry, $enclosure) = @_;
+    my $link = XML::Atom::Link->new;
+    $link->rel('enclosure');
+    $link->type($enclosure->{type});
+    $link->href($enclosure->{url});
+    $link->length($enclosure->{length});
+    $entry->{entry}->add_link($link);
+};
+
+*XML::Feed::Entry::RSS::add_enclosure = sub {
+    my($entry, $enclosure) = @_;
+    $entry->{entry}->{enclosure} = {
+        url    => $enclosure->{url},
+        type   => $enclosure->{type},
+        length => $enclosure->{length},
+    };
+};
+
+
-1;
-
@@ -157 +191 @@
-Yoshiki KURIHARA
-
+Tatsuhiko Miyagawa
+
+Gosuke Miyashita
+
-=head1 SEE ALSO
-

branches/feature-server/plagger/lib/Plagger/Plugin/Publish/Gmail.pm

@@ -9 +9 @@
-use Encode;
-use Encode::MIME::Header;
+use HTML::Entities;
+use HTML::Parser;
-use MIME::Lite;
-
@@ -22 +24 @@
-        'publish.feed' => \&notify,
-    );
+}
+
+sub init {
+    my $self = shift;
+    $self->SUPER::init(@_);
+
+    $self->conf->{mailto} or Plagger->context->error("mailto is required");
+    $self->conf->{mailfrom} ||= 'plagger@localhost';
-}
-
@@ -45 +55 @@
-    my $feed = $args->{feed};
-    my $subject = $feed->title || '(no-title)';
+
+    my @enclosure_cb;
+    if ($self->conf->{attach_enclosures}) {
+        for my $entry ($args->{feed}->entries) {
+            push @enclosure_cb, $self->prepare_enclosures($entry);
+        }
+    }
+
-    my $body = $self->templatize($context, $feed);
-
@@ -67 +85 @@
-        Type => 'text/html; charset=utf-8',
-        Data => encode("utf-8", $body),
+        Encoding => 'quoted-printable',
-    );
-
+    for my $cb (@enclosure_cb) {
+        $cb->($msg);
+    }
+
-    my $route = $cfg->{mailroute} || { via => 'smtp', host => 'localhost' };
+    $route->{via} ||= 'smtp';
+
-    if ($route->{via} eq 'smtp_tls') {
-        $self->{tls_args} = [
@@ -88 +113 @@
-}
-
+sub prepare_enclosures {
+    my($self, $entry) = @_;
+
+    if (grep $_->is_inline, $entry->enclosures) {
+        # replace inline enclosures to cid: entities
+        my %url2enclosure = map { $_->url => $_ } $entry->enclosures;
+
+        my $output;
+        my $p = HTML::Parser->new(api_version => 3);
+        $p->handler( default => sub { $output .= $_[0] }, "text" );
+        $p->handler( start => sub {
+                         my($tag, $attr, $attrseq, $text) = @_;
+                         # TODO: use HTML::Tagset?
+                         if (my $url = $attr->{src}) {
+                             if (my $enclosure = $url2enclosure{$url}) {
+                                 $attr->{src} = "cid:" . $self->enclosure_id($enclosure);
+                             }
+                             $output .= $self->generate_tag($tag, $attr, $attrseq);
+                         } else {
+                             $output .= $text;
+                         }
+                     }, "tag, attr, attrseq, text");
+        $p->parse($entry->body);
+        $p->eof;
+
+        $entry->body($output);
+    }
+
+    return sub {
+        my $msg = shift;
+
+        for my $enclosure (grep $_->local_path, $entry->enclosures) {
+            my %param = (
+                Type => $enclosure->type,
+                Path => $enclosure->local_path,
+                Filename => $enclosure->filename,
+            );
+
+            if ($enclosure->is_inline) {
+                $param{Id} = '<' . $self->enclosure_id($enclosure) . '>';
+                $param{Disposition} = 'inline';
+            } else {
+                $param{Disposition} = 'attachment';
+            }
+
+            $msg->attach(%param);
+        }
+    }
+}
+
+sub generate_tag {
+    my($self, $tag, $attr, $attrseq) = @_;
+
+    return "<$tag " .
+        join(' ', map { $_ eq '/' ? '/' : sprintf qq(%s="%s"), $_, encode_entities($attr->{$_}, q(<>"')) } @$attrseq) .
+        '>';
+}
+
+sub enclosure_id {
+    my($self, $enclosure) = @_;
+    return Digest::MD5::md5_hex($enclosure->url->as_string) . '@Plagger';
+}
+
-sub templatize {
-    my($self, $context, $feed) = @_;
@@ -158 +246 @@
-
-1;
+
+__END__
+
+=head1 NAME
+
+Plagger::Plugin::Publish::Gmail - Notify updates to your email account
+
+=head1 SYNOPSIS
+
+  - module: Publish::Gmail
+    config:
+      mailto: example@gmail.com
+      mailfrom: you@example.net
+
+=head1 DESCRIPTION
+
+This plugin creates HTML emails and sends them to your Gmail mailbox.
+
+=head1 CONFIG
+
+=over 4
+
+=item mailto
+
+Your email address to send updatess to. Required.
+
+=item mailfrom
+
+Email address to send email from. Defaults to I<plagger@localhost>.
+
+=item mailroute
+
+Hash to specify how to send emails. Defaults to:
+
+  mailroute:
+    via: smtp
+    host: localhost
+
+the value of I<via> would be either I<smtp>, I<smtp_tls> or I<sendmail>.
+
+  mailroute:
+    via: sendmail
+    command: /usr/sbin/sendmail
+
+=item attach_enclosures
+
+Flag to attach enclosures as Email attachments. Defaults to 0.
+
+=back
+
+=head1 AUTHOR
+
+Tatsuhiko Miyagawa
+
+=head1 SEE ALSO
+
+L<Plagger>, L<MIME::Lite>
+
+=cut

branches/feature-server/plagger/lib/Plagger/Plugin/Publish/HatenaBookmark.pm

@@ -16 +16 @@
-    );
-}
+
+sub rule_hook { 'publish.entry.fixup' }
-
-sub initialize {

branches/feature-server/plagger/lib/Plagger/Plugin/Publish/IMAP.pm

@@ -74 +74 @@
-    Type => 'text/html; charset=utf-8',
-    Data => $body,
+    Encoding => 'quoted-printable',
-  );
-  $msg->add('X-Tags', encode('MIME-Header',join(' ',@{$entry->tags})));

branches/feature-server/plagger/lib/Plagger/Plugin/Publish/MT.pm

@@ -25 +25 @@
-    $self->{mt}->username($self->conf->{username});
-    $self->{mt}->password($self->conf->{password});
-
+conf->
-    return $self->{mt};
-}

branches/feature-server/plagger/lib/Plagger/Plugin/Publish/Maildir.pm

@@ -79 +79 @@
-    Type => 'text/html; charset=utf-8',
-    Data => $body,
+    Encoding => 'quoted-printable',
-  );
-  $msg->add('X-Tags', encode('MIME-Header',join(' ',@{$entry->tags})));

branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/Bloglines.pm

@@ -117 +117 @@
-    # catch bad XML feed by Bloglines
-    eval {
-$mark_read
+0
-    };
-
@@ -129 +129 @@
-            }
-        }
+    } elsif ($mark_read) {
+        # no error found with XML ... call the API again to mark read
+        eval {
+            @updates = $self->{bloglines}->getitems(0, $mark_read);
+        };
-    }
-
@@ -166 +171 @@
-
-            if ($item->{guid}) {
-
+
+
-                my $guid_url     = "$item->{guid}"; # stringify MagicElement
-                $entry->permalink($guid_url)
@@ -175 +181 @@
-            $entry->id($item->{guid});
-            $entry->body($item->{description});
+
+            if ($item->{enclosure}) {
+                my $enclosure = Plagger::Enclosure->new;
+                $enclosure->url( URI->new($item->{enclosure}->{url}) );
+                $enclosure->length($item->{enclosure}->{length});
+                $enclosure->auto_set_type($item->{enclosure}->{type});
+                $entry->add_enclosure($enclosure);
+            }
-
-            $feed->add_entry($entry);

branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/HatenaRSS.pm

@@ -3 +3 @@
-use base qw( Plagger::Plugin::Subscription::OPML );
-
-WWW
+Plagger
-
-sub register {
@@ -18 +18 @@
-
-    my $username = $self->conf->{username}
-'username is missing'
+"username is missing"
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    }
-
-    $context->log(info => "Login to HatenaRSS succeed.");
-
-    $mech->get("http://r.hatena.ne.jp/$username/config");
-    $mech->submit_form(form_name => 'opmlexport');
-
-    my $opml = $mech->content;
@@ -62 +59 @@
-    config:
-      username: example
-      password: xxxxxxxx
-
-=head1 DESCRIPTION
-
-This plugin creates Subscription by fetching Hatena RSS
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-=head1 AUTHOR

branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/LivedoorReader.pm

@@ -5 +5 @@
-use JSON::Syck;
-use URI;
-
-
+
-use Plagger::Util;
-
@@ -26 +25 @@
-sub init_reader {
-    my $self = shift;
-WWW::Mechanize->new(cookie_jar => $self->cache
+Plagger::Mechanize->new(cookie_jar => $self
-
-    unless (defined($self->conf->{username}) && defined($self->conf->{password})) {
@@ -130 +129 @@
-        }
-    }
+
+    $self->{mech}->cookie_jar->scan(
+        sub {
+            my($key, $val) = @_[1,2];
+            if ($key =~ /_sid/) {
+                $self->{apikey} = $val;
+                return;
+            }
+        },
+    );
-}
-
@@ -136 +145 @@
-
-    my $uri = URI->new_abs($method, "http://reader.livedoor.com/");
-param(%$param) if $param
+form(%$param, ApiKey => $self->{apikey})
-
-    $self->{mech}->get($uri->as_string);
@@ -172 +181 @@
-Your username & password to use with livedoor Reader.
-
+Note that you don't have to supply username and password if you set
+global cookie_jar in your configuration file and the cookie_jar
+contains a valid login session there, such as:
+
+  global:
+    user_agent:
+      cookies: /path/to/cookies.txt
+
+See L<Plagger::Cookies> for details.
+
-=item mark_read
-

branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/Odeo.pm

@@ -3 +3 @@
-use base qw( Plagger::Plugin::Subscription::OPML );
-
+use Plagger::UserAgent;
-use URI::Escape;
-use HTML::Entities;

branches/feature-server/plagger/lib/Plagger/Plugin/Subscription/XOXO.pm

@@ -1 +1 @@
-package Plagger::Plugin::Subscription::XOXO;
-use strict;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-sub load {
-    my($self, $context) = @_;
-    my $uri = URI->new($self->conf->{url})
-        or $context->error("config 'url' is missing");
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-}
-

branches/feature-server/plagger/lib/Plagger/Plugin/Widget/Delicious.pm

@@ -23 +23 @@
-    my($self, $entry) = @_;
-    my $uri = URI->new('http://del.icio.us/' . $self->conf->{username});
-
-
-
-
-
+
+
+
+
+
+
+
-
-    my $url = HTML::Entities::encode($uri->as_string);
@@ -34 +36 @@
-
-1;
+
+__END__
+
+=head1 NAME
+
+Plagger::Plugin::Widget::Delicious - Widget to post to del.icio.us
+
+=head1 SYNOPSIS
+
+   module: Widget::Delicious
+   config:
+     username: miyagawa
+
+=head1 DESCRIPTION
+
+This plugin creates a widget to post to del.icio.us in the Publish
+modules output.
+
+=head1 CONFIG
+
+=over 4
+
+=item username
+
+Your del.icio.us username. Required.
+
+=item tags
+
+Preset tags to tag the post.
+
+  tags: foo bar
+
+will set I<foo bar> as a predefined tag to use. Optional.
+
+=item one_click_post
+
+Flag to indicate that clicking the widget will automatically post the
+item, without showing the form. Defaults to 0. (Optional)
+
+=back
+
+=head1 AUTHOR
+
+Tatsuhiko Miyagawa
+
+=head1 SEE ALSO
+
+L<Plagger>, L<http://del.icio.us/>
+
+=cut

branches/feature-server/plagger/lib/Plagger/Rule/URLBL.pm

@@ -26 +26 @@
-
-    return unless $url;
-
+
-    my $res = Net::DNS::Resolver->new;
-    my $dnsbl = $self->{dnsbl};

branches/feature-server/plagger/lib/Plagger/TT/Plagger/Util.pm

@@ -10 +10 @@
-    bless {}, shift;
-}
+
+sub DESTROY { }
-
-sub AUTOLOAD {

branches/feature-server/plagger/lib/Plagger/UserAgent.pm

@@ -3 +3 @@
-use base qw( LWP::UserAgent );
-
+use Plagger::Cookies;
-use URI::Fetch 0.06;
-
@@ -8 +9 @@
-    my $class = shift;
-    my $self  = $class->SUPER::new();
-
-
+
+
+
+
+
+
+
+
+
+
-    $self;
-}
-
-sub fetch {
-
+, $opt
-
-    URI::Fetch->fetch($url,
@@ -20 +29 @@
-        $plugin ? (Cache => $plugin->cache) : (),
-        ForceResponse => 1,
+        ($opt ? %$opt : ()),
-    );
+}
+
+sub mirror {
+    my($self, $request, $file) = @_;
+
+    unless (ref($request)) {
+        return $self->SUPER::mirror($request, $file);
+    }
+
+    # below is copied from LWP::UserAgent
+    if (-e $file) {
+        my($mtime) = (stat($file))[9];
+        if($mtime) {
+            $request->header('If-Modified-Since' =>
+                             HTTP::Date::time2str($mtime));
+        }
+    }
+    my $tmpfile = "$file-$$";
+
+    my $response = $self->request($request, $tmpfile);
+    if ($response->is_success) {
+
+        my $file_length = (stat($tmpfile))[7];
+        my($content_length) = $response->header('Content-length');
+
+        if (defined $content_length and $file_length < $content_length) {
+            unlink($tmpfile);
+            die "Transfer truncated: " .
+                "only $file_length out of $content_length bytes received\n";
+        }
+        elsif (defined $content_length and $file_length > $content_length) {
+            unlink($tmpfile);
+            die "Content-length mismatch: " .
+                "expected $content_length bytes, got $file_length\n";
+        }
+        else {
+            # OK
+            if (-e $file) {
+                # Some dosish systems fail to rename if the target exists
+                chmod 0777, $file;
+                unlink $file;
+            }
+            rename($tmpfile, $file) or
+                die "Cannot rename '$tmpfile' to '$file': $!\n";
+
+            if (my $lm = $response->last_modified) {
+                # make sure the file has the same last modification time
+                utime $lm, $lm, $file;
+            }
+        }
+    }
+    else {
+        unlink($tmpfile);
+    }
+    return $response;
-}
-

branches/feature-server/plagger/lib/Plagger/Util.pm

@@ -2 +2 @@
-use strict;
-our @ISA = qw(Exporter);
-
+mime_type_of 
-
-use Encode ();
-use List::Util qw(min);
-use HTML::Entities;
+use MIME::Types;
+use MIME::Type;
-
-our $Detector;
@@ -21 +23 @@
-    }
-}
+
+
-
-sub strip_html {
@@ -64 +68 @@
-    # 1) if it is HTTP response, get charset from HTTP Content-Type header
-    if ($res) {
-http_response->
+
-    }
-
@@ -129 +133 @@
-}
-
+our $mimetypes = MIME::Types->new;
+$mimetypes->addType( MIME::Type->new(type => 'video/x-flv', extensions => [ 'flv' ]) );
+$mimetypes->addType( MIME::Type->new(type => 'audio/aac', extensions => [ 'm4a', '.aac' ]) );
+
+sub mime_type_of {
+    my $ext = shift;
+
+    if (UNIVERSAL::isa($ext, 'URI')) {
+        $ext = ( $ext->path =~ /\.(\w+)/ )[0];
+    }
+
+    return unless $ext;
+    return $mimetypes->mimeTypeOf($ext);
+}
+
-1;