txt2h.pl @@ -6,3 +6,4 @@ newsbeuter podbeuter test/test test/test-rss +xlicense.h .gitignore @@ -59,7 +59,7 @@ POFILES:=$(wildcard po/*.po) MOFILES:=$(patsubst %.po,%.mo,$(POFILES)) POTFILE=po/newsbeuter.pot -STFLCONV=./stfl2h.pl +TEXTCONV=./txt2h.pl RM=rm -f all: $(NEWSBEUTER) $(PODBEUTER) @@ -95,7 +95,7 @@ regenerate-parser: $(CXX) $(CXXFLAGS) -o $@ -c $< %.h: %.stfl - $(STFLCONV) $< > $@ + $(TEXTCONV) $< .stfl > $@ clean-newsbeuter: $(RM) $(NEWSBEUTER) $(NEWSBEUTER_OBJS) @@ -117,7 +117,7 @@ clean-doc: $(RM) doc/*.xml doc/*.1 doc/newsbeuter-cfgcmds.txt doc/podbeuter-cfgcmds.txt doc/newsbeuter-keycmds.txt clean: clean-newsbeuter clean-podbeuter clean-libbeuter clean-libfilter clean-doc clean-librsspp - $(RM) $(STFLHDRS) + $(RM) $(STFLHDRS) xlicense.h distclean: clean clean-mo test-clean $(RM) core *.core core.* config.mk @@ -197,4 +197,7 @@ config: config.mk config.mk: @./config.sh +xlicense.h: LICENSE + $(TEXTCONV) $< > $@ + include mk.deps Makefile @@ -3,6 +3,14 @@ TODO: - 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 +- fix :source for bind-key: bind-key j down etc. +- implement internal alias mechanism to allow transition of renamed config commands. +- improve logging of which feeds are broken. +- persist search and command history to text files. +- make last search phrase stand out in article view. +- make search phrase stand out in help (just like article view instead of limit) - configurable? combine both limit and standout? +- add license to -V output +- rename -v to something else to avoid confusion DONE: TODO @@ -11,10 +11,10 @@ After you've installed newsbeuter, you can run it for the first time by typing -u <urlfile> read RSS feed URLs from <urlfile> -c <cachefile> use <cachefile> as cache file -C <configfile> read configuration from <configfile> - -v clean up cache thoroughly + -X clean up cache thoroughly -x <command>... execute list of commands -o activate offline mode (only applies to bloglines synchronization mode) - -V get version information + -v get version information -l <loglevel> write a log with a certain loglevel (valid values: 1 to 6) -d <logfile> use <logfile> as output log file -E <file> export list of read articles to <file> doc/chapter-firststeps.txt @@ -10,7 +10,7 @@ newsbeuter - an RSS feed reader for text terminals SYNOPSIS -------- -'newsbeuter' [-r] [-e] [-i opmlfile] [-u urlfile] [-c cachefile] [-C configfile] [-v] [-o] [-x <command> ...] [-h] +'newsbeuter' [-r] [-e] [-i opmlfile] [-u urlfile] [-c cachefile] [-C configfile] [-X] [-o] [-x <command> ...] [-h] DESCRIPTION @@ -32,10 +32,10 @@ OPTIONS -e:: Export feeds as OPML to stdout --v:: +-X:: Clean up cache thoroughly (i.e. reduce it in size if possible) --V:: +-v, -V:: Get version information about newsbeuter and the libraries it uses -i opmlfile:: doc/manpage-newsbeuter.txt @@ -76,7 +76,7 @@ namespace newsbeuter { private: void usage(char * argv0); - void version_information(); + void version_information(const char * argv0, unsigned int level); void import_opml(const char * filename); void export_opml(); void rec_find_rss_outlines(xmlNode * node, std::string tag); include/controller.h @@ -14,7 +14,7 @@ src/configparser.o: include/configparser.h include/tagsouppullparser.h include/e src/controller.o: include/view.h include/controller.h include/configparser.h \ include/configcontainer.h include/exceptions.h include/downloadthread.h \ include/colormanager.h include/logger.h include/utils.h include/stflpp.h \ - config.h + config.h xlicense.h src/download.o: include/download.h include/pb_controller.h config.h mk.deps @@ -13,6 +13,7 @@ #include <formatstring.h> #include <regexmanager.h> #include <rss_parser.h> +#include <xlicense.h> #include <cstdlib> #include <cstring> @@ -119,12 +120,13 @@ void controller::run(int argc, char * argv[]) { std::string importfile; bool do_read_import = false, do_read_export = false; std::string readinfofile; + unsigned int show_version = 0; bool silent = false; bool execute_cmds = false; do { - if((c = ::getopt(argc,argv,"i:erhu:c:C:d:l:vVoxI:E:"))<0) + if((c = ::getopt(argc,argv,"i:erhu:c:C:d:l:vVoxXI:E:"))<0) continue; switch (c) { case ':': /* fall-through */ @@ -161,11 +163,12 @@ void controller::run(int argc, char * argv[]) { case 'C': config_file = optarg; break; - case 'v': + case 'X': do_vacuum = true; break; + case 'v': case 'V': - version_information(); + show_version++; break; case 'o': offline_mode = true; @@ -203,6 +206,9 @@ void controller::run(int argc, char * argv[]) { } } while (c != -1); + if (show_version) { + version_information(argv[0], show_version); + } if (do_import) { LOG(LOG_INFO,"Importing OPML file from %s",importfile.c_str()); @@ -651,21 +657,27 @@ void controller::start_reload_all_thread(std::vector<int> * indexes) { dlt->start(); } -void controller::version_information() { - std::cout << PROGRAM_NAME << " " << PROGRAM_VERSION << " - " << PROGRAM_URL << std::endl; - std::cout << "Copyright (C) 2006-2009 Andreas Krennmair" << std::endl << std::endl; +void controller::version_information(const char * argv0, unsigned int level) { + if (level<=1) { + std::cout << PROGRAM_NAME << " " << PROGRAM_VERSION << " - " << PROGRAM_URL << std::endl; + std::cout << "Copyright (C) 2006-2009 Andreas Krennmair" << std::endl << std::endl; - struct utsname xuts; - uname(&xuts); + std::cout << _("newsbeuter is free software and licensed under the MIT/X Consortium License.") << std::endl; + std::cout << utils::strprintf(_("Type `%s -vv' for more information."), argv0) << std::endl << std::endl; - std::cout << "System: " << xuts.sysname << " " << xuts.release << " (" << xuts.machine << ")" << std::endl; + struct utsname xuts; + uname(&xuts); + std::cout << "System: " << xuts.sysname << " " << xuts.release << " (" << xuts.machine << ")" << std::endl; #if defined(__GNUC__) && defined(__VERSION__) - std::cout << "Compiler: g++ " << __VERSION__ << std::endl; + std::cout << "Compiler: g++ " << __VERSION__ << std::endl; #endif - std::cout << "ncurses: " << curses_version() << " (compiled with " << NCURSES_VERSION << ")" << std::endl; - std::cout << "libcurl: " << curl_version() << " (compiled with " << LIBCURL_VERSION << ")" << std::endl; - std::cout << "SQLite: " << sqlite3_libversion() << " (compiled with " << SQLITE_VERSION << ")" << std::endl; - std::cout << "libxml2: compiled with " << LIBXML_DOTTED_VERSION << std::endl; + std::cout << "ncurses: " << curses_version() << " (compiled with " << NCURSES_VERSION << ")" << std::endl; + std::cout << "libcurl: " << curl_version() << " (compiled with " << LIBCURL_VERSION << ")" << std::endl; + std::cout << "SQLite: " << sqlite3_libversion() << " (compiled with " << SQLITE_VERSION << ")" << std::endl; + std::cout << "libxml2: compiled with " << LIBXML_DOTTED_VERSION << std::endl << std::endl; + } else { + std::cout << LICENSE_str << std::endl; + } ::exit(EXIT_SUCCESS); } @@ -692,10 +704,10 @@ void controller::usage(char * argv0) { { 'u', _("<urlfile>"), _("read RSS feed URLs from <urlfile>") }, { 'c', _("<cachefile>"), _("use <cachefile> as cache file") }, { 'C', _("<configfile>"), _("read configuration from <configfile>") }, - { 'v', "", _("clean up cache thoroughly") }, + { 'X', "", _("clean up cache thoroughly") }, { 'x', _("<command>..."), _("execute list of commands") }, { 'o', "", _("activate offline mode (only applies to bloglines synchronization mode)") }, - { 'V', "", _("get version information") }, + { 'v', "", _("get version information") }, { 'l', _("<loglevel>"), _("write a log with a certain loglevel (valid values: 1 to 6)") }, { 'd', _("<logfile>"), _("use <logfile> as output log file") }, { 'E', _("<file>"), _("export list of read articles to <file>") }, src/controller.cpp stfl2h.pl 4e1f444dddc01ae1bc9d08bbe5517269cd16ea55 Andreas Krennmair ak@synflood.at http://github.com/akrennmair/newsbeuter/commit/0249e5e0dec18f983f4a0aa84bb6af1faf9203ca 0249e5e0dec18f983f4a0aa84bb6af1faf9203ca 2009-02-09T00:38:35-08:00 2009-02-09T00:38:35-08:00 updated TODO list, renamed -v to -X, added license information in new -v output. 7e4d239e0857b204a18d07b259443741438ad1f2 Andreas Krennmair ak@synflood.at