Merge pull request #174 from PureArtistry/develop

updated dev branch also

README.md

@@ -76,29 +76,41 @@ OR: query source | tuxi [options]
 Options:
   -h                    Show this help message and exit.
   -v                    Print tuxi version info and exit.
+
   -r                    Raw search results.
                         (no pretty output, no colors)
+
   -q                    Only output search results.
                         (silences "Did you mean?", greeting, usage)
+
   -a                    Prints all valid answers.
+
+  -u                    Prints out the top handful of URLs for your search query
+                        (this is automatically printed out if tuxi can't find you an answer)
+
   -b                    Tries to select the best answer based on keywords at the start and end of your query.
                         (experimental - eg: define WORD, SONG lyrics, PERSON quotes, weather CITY, FILM cast)
+
   -t                    Pick answers to test.
                         (you can specify multiple answers using tuxi_NAME in your query)
+
   -l                    use LANG_[lang] in your query to override the language used
                         (eg: tuxi -l LANG_en_US my search query)
 
 tuxi supports the following environment variables:
   TUXI_LANG=[lang]      sets default search language (eg: TUXI_LANG='en_US')
+
   TUXI_DELAY=[int]      if you find more than one answer is being printed (and you're not using -a)
                         increase this number by a little (you want it to be as low as possible)
-                        default value is 100 (eg: TUXI_DELAY=120)
+                        default value is 250 (eg: TUXI_DELAY=270)
 
 developer flags:
   -d                    prints debug info along with results
-  -s                    saves HTML for this query to /home/magic/.cache/tuxi/tuxi-[date]-[query].html
+  -s                    saves HTML for this query to /home/dave/.cache/tuxi/[date]-[query].html
+
   -c                    use most recent cached result and query
                         this can be combined with -t flag to more quickly test for different answers
+
   -p                    disable pipe support (it can break some scripts including our own test script)
 
 Report bugs at https://github.com/Bugswriter/tuxi/issues

tests/testqueries.txt

@@ -18,7 +18,6 @@
 # currency
 # trans
 # sport_fixture
-# rich
 # kno_right
 
 did_you_mean Linux Tarvalds
@@ -30,19 +29,19 @@ math 72^43/12(44+1)-3124
 math (40/3)+4*6
 math 45/sqrt(4)*3
 
-basic/kno_val christmas day
+kno_val christmas day
 basic/kno_val summer solstice
 basic/kno_val shortest day of the year
 
-kno_top the office cast
-kno_top legends of runeterra
-kno_top reddit
-kno_top twitter
+richcast/kno_top the office cast
+kno_top/kno_right legends of runeterra
+kno_top/kno_right reddit
+kno_top/kno_right twitter
 
-rich/kno_val elevation of mt everest
-rich/kno_val what is elevation of mt rainier
-rich/kno_val how big is the grand canyon
-rich/kno_val how long is the yellow river?
+kno_val elevation of mt everest
+kno_val what is elevation of mt rainier
+kno_val how big is the grand canyon
+kno_val how long is the yellow river?
 
 feat the meaning of life the universe and everything else
 feat shotgun doom eternal
@@ -79,7 +78,7 @@ weather how cold is it in canada right now?
 
 kno_right lorem ipsum
 kno_right the office
-kno_right what is a firefighter
+kno_right/define what is a firefighter
 kno_right what is the american bill of rights
 
 define define humor
@@ -94,13 +93,12 @@ sport_fixture results of last chelsea match
 
 quotes linus torvalds quotes
 quotes quotes from gandhi
-quotes inspirational quotes
 
 kno_val density of silver
 kno_val density of hydrogen
 kno_val what is the triple point of oxygen
 
 richcast cast of event horizon
 richcast cast of equalibrium
-richcast GoT stars
-richcast avengers actors
+richcast/kno_top GoT stars
+richcast/kno_top avengers actors