@@ -1,13 +1,10 @@ TODO: -- check for stfl in config.sh script - add an auto-flag configuration command to automatically flag articles that match a certain query - when reload is finished, the focus shall be in the current form's list - per-feed refresh settings - implement internal alias mechanism to allow transition of renamed config commands. - fix HTML rendering of bold and underlined text when light background is configured -- add quoting when printing out config variable values so that copy/paste can be applied. - make MacPort available for easy installation -- test highlighting, especially of search phrases. - compute "busy-ness" of feeds, make it a sort option - reduce memory usage by loading feeds on demand when being opened - implement RFC 5005 (http://www.ietf.org/rfc/rfc5005.txt) @@ -156,3 +153,5 @@ DONE: - check correct sorting of query feeds - add option to prepopulate query feeds - fix help screen in podbeuter +- add quoting when printing out config variable values so that copy/paste can be applied. +- check for stfl in config.sh script TODO @@ -1,5 +1,7 @@ #!/bin/sh +FAILSTATUS="" + check_pkg() { pkgname=$1 add_define=$2 @@ -51,14 +53,24 @@ fail() { echo "Please make sure it is installed." echo "" echo "You can download ${pkgname} from here: ${dlurl}" - exit 1 + FAILSTATUS="1" } fail_custom() { err=$1 echo "" echo "ERROR: ${err}" - exit 1 + FAILSTATUS="1" +} + +all_aboard_the_fail_boat() { + if [ "x$FAILSTATUS" != "x" ] ; then + rm -f config.mk + echo "" + echo "One or more dependencies couldn't be found. Please install" + echo "these packages and retry compilation." + exit 1 + fi } echo "" > config.mk @@ -67,3 +79,4 @@ check_pkg "sqlite3" || fail "sqlite3" check_pkg "libcurl" || check_custom "libcurl" "curl-config" || fail "libcurl" check_pkg "libxml-2.0" || check_custom "libxml2" "xml2-config" || fail "libxml2" check_pkg "stfl" "" "--static" || fail "stfl" +all_aboard_the_fail_boat config.sh @@ -42,7 +42,7 @@ themselves depend on other libraries. These dependencies are not listed here. Please also be aware that you need a recent C++ compiler. Currently, newsbeuter has only been tested with GCC. -- STFL (version 0.20 or newer): http://www.clifford.at/stfl/[] +- STFL (version 0.21 or newer): http://www.clifford.at/stfl/[] - SQLite 3 (version 3.5 or newer): http://www.sqlite.org/[] - libcurl: http://curlm.haxx.se/download.html[] - GNU gettext (on systems that don't provide gettext in the libc): ftp://ftp.gnu.org/gnu/gettext/[] doc/newsbeuter.txt @@ -77,6 +77,8 @@ class utils { static curl_proxytype get_proxy_type(const std::string& type); + static bool is_special_url(const std::string& url); + private: static void append_escapes(std::string& str, char c); include/utils.h @@ -73,6 +73,7 @@ item rss_09x_parser::parse_item(xmlNode * itemNode) { it.author = authorfield.substr(start+1, end-start); } else { it.author_email = authorfield; + it.author = authorfield; } } else if (node_is(node, "creator", DC_URI)) { author = get_content(node); rss/rss_09x_parser.cpp @@ -812,7 +812,7 @@ void controller::export_opml() { xmlNodePtr body = xmlNewTextChild(opml_node, NULL, (const xmlChar *)"body", NULL); for (std::vector<std::tr1::shared_ptr<rss_feed> >::iterator it=feeds.begin(); it != feeds.end(); ++it) { - if ((*it)->rssurl().substr(0,6) != "query:" && (*it)->rssurl().substr(0,7) != "filter:") { + if (!utils::is_special_url((*it)->rssurl())) { std::string rssurl = (*it)->rssurl(); std::string link = (*it)->link(); std::string title = (*it)->title(); src/controller.cpp @@ -20,6 +20,7 @@ mutex::~mutex() { void mutex::lock() { int rc = pthread_mutex_lock(&mtx); if (rc != 0) { + LOG(LOG_INFO, "mutex::lock: lock returned %d", rc); throw exception(rc); } } src/mutex.cpp @@ -619,9 +619,13 @@ std::string utils::join(const std::vector<std::string>& strings, const std::stri return result; } +bool utils::is_special_url(const std::string& url) { + return url.substr(0,6) == "query:" || url.substr(0,7) == "filter:" || url.substr(0,5) == "exec:"; +} + std::string utils::censor_url(const std::string& url) { std::string rv; - if (url.length() > 0) { + if (url.length() > 0 && !utils::is_special_url(url)) { const char * myuri = url.c_str(); xmlURIPtr uri = xmlParseURI(myuri); if (uri) { @@ -636,6 +640,8 @@ std::string utils::censor_url(const std::string& url) { xmlFreeURI(uri); } else return url; + } else { + rv = url; } return rv; } src/utils.cpp @@ -356,7 +356,6 @@ void view::open_in_browser(const std::string& url) { } void view::update_visible_feeds(std::vector<std::tr1::shared_ptr<rss_feed> >& feeds) { - scope_mutex lock(mtx); try { if (formaction_stack_size() > 0) { std::tr1::shared_ptr<feedlist_formaction> feedlist = std::tr1::dynamic_pointer_cast<feedlist_formaction, formaction>(formaction_stack[0]); @@ -489,6 +488,7 @@ void view::view_dialogs() { void view::push_help() { std::tr1::shared_ptr<help_formaction> helpview(new help_formaction(this, help_str)); set_bindings(helpview); + apply_colors(helpview); helpview->set_context(get_current_formaction()->id()); helpview->set_parent_formaction(get_current_formaction()); helpview->init(); src/view.cpp @@ -36,12 +36,10 @@ BOOST_AUTO_TEST_CASE(InitTests) { } BOOST_AUTO_TEST_CASE(TestNewsbeuterReload) { - // disabled for now -#if 0 configcontainer * cfg = new configcontainer(); cache * rsscache = new cache("test-cache.db", cfg); - rss_parser parser("http://bereshit.synflood.at/~ak/rss.xml", rsscache, cfg, NULL); + rss_parser parser("http://testbed.newsbeuter.org/unit-test/rss.xml", rsscache, cfg, NULL); std::tr1::shared_ptr<rss_feed> feed = parser.parse(); BOOST_CHECK_EQUAL(feed->items().size(), 8u); @@ -59,7 +57,7 @@ BOOST_AUTO_TEST_CASE(TestNewsbeuterReload) { rsscache->externalize_rssfeed(feed, false); std::tr1::shared_ptr<rss_feed> feed2(new rss_feed(rsscache)); - feed2->set_rssurl("http://bereshit.synflood.at/~ak/rss.xml"); + feed2->set_rssurl("http://testbed.newsbeuter.org/unit-test/rss.xml"); rsscache->internalize_rssfeed(feed2); BOOST_CHECK_EQUAL(feed2->items().size(), 8u); @@ -68,7 +66,7 @@ BOOST_AUTO_TEST_CASE(TestNewsbeuterReload) { std::vector<std::string> feedurls = rsscache->get_feed_urls(); BOOST_CHECK_EQUAL(feedurls.size(), 1u); - BOOST_CHECK_EQUAL(feedurls[0], "http://bereshit.synflood.at/~ak/rss.xml"); + BOOST_CHECK_EQUAL(feedurls[0], "http://testbed.newsbeuter.org/unit-test/rss.xml"); std::vector<std::tr1::shared_ptr<rss_feed> > feedv; feedv.push_back(feed); @@ -80,7 +78,6 @@ BOOST_AUTO_TEST_CASE(TestNewsbeuterReload) { delete cfg; ::unlink("test-cache.db"); -#endif } BOOST_AUTO_TEST_CASE(TestConfigParserContainerAndKeymap) { test/test.cpp 603143aca1ef30cf5772036585f083cb200d41f9 e840c8d2f07ad5c33eed322ec892907a6e00667b Andreas Krennmair ak@synflood.at http://github.com/akrennmair/newsbeuter/commit/cb8a8aaaf71ab97a8758b73270d47d4d7bf2d944 cb8a8aaaf71ab97a8758b73270d47d4d7bf2d944 2009-07-01T02:16:45-07:00 2009-07-01T02:16:45-07:00 Merge branch 'master' of git@github.com:akrennmair/newsbeuter 2382f1069799eb4575d59ba19ce040aaaac8b2c2 Andreas Krennmair ak@synflood.at