New key for FimFictionApi, no TUI by default

diff --git a/changelog.md b/changelog.md
index 3cb36a796537ba7d5f2316fbe8b169401c878857..e9a44e791eff4c7cd8941ebae809fa9274999ac6 100644 (file)
--- a/changelog.md
+++ b/changelog.md
@@ -2,11 +2,11 @@
 
 ## Version WIP
 
-- New reader type: TUI (a text user interface with windows and menus)
+- TUI (text with windows and menus) -- not compiled by default (configure.sh)
 - A server option to offer stories on the network
 - A remote library to get said stories from the network
 - Update to latest version of nikiroo-utils
-- New option to download from FimFiction via the new beta API
+- Support for FimFiction.net via the new API
 - Cache update (you may want to clear your current cache)
 - Bug fixed (moving an unopened book in GUI mode does not fail any more)
 

diff --git a/configure.sh b/configure.sh
index cee2078068a224cc09b52cef9df0e96291371db5..520afba9454ad0e7ad4ab8a3bb91152f549d7ae3 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -5,10 +5,10 @@ PREFIX=/usr/local
 PROGS="java javac jar make sed"
 
 CLI=be/nikiroo/fanfix/reader/CliReader
-TUI=be/nikiroo/fanfix/reader/TuiReader
+TUI=
 GUI=be/nikiroo/fanfix/reader/GuiReader
 JCLI=
-JTUI="-C bin/ jexer"
+JTUI=
 JGUI=
 
 valid=true
@@ -32,8 +32,12 @@ while [ "$*" != "" ]; do
        --cli) #=no     Disable CLI support (System.out)
                [ "$val" = no -o "$val" = false ] && CLI= && JCLI=
        ;;
-       --tui) #=no     Disable TUI support (Jexer)
+       --tui) #=yes    Enable TUI support (Jexer, experimental)
                [ "$val" = no -o "$val" = false ] && TUI= && JTUI=
+               if [ "$val" = yes -o "$val" = true ]; then
+                       TUI=be/nikiroo/fanfix/reader/TuiReader
+                       JTUI="-C bin/ jexer"
+               fi
        ;;
        --gui) #=no     Disable GUI support (Swing)
                [ "$val" = no -o "$val" = false ] && GUI= && JGUI=

diff --git a/src/be/nikiroo/fanfix/bundles/config.properties b/src/be/nikiroo/fanfix/bundles/config.properties
index 6e59fe694f0300f187caf764eaa82711d5fe1c04..0c04e414cf5437251481ab4b19b1a35180ea8108 100644 (file)
--- a/src/be/nikiroo/fanfix/bundles/config.properties
+++ b/src/be/nikiroo/fanfix/bundles/config.properties
@@ -78,4 +78,4 @@ LOGIN_FIMFICTION_APIKEY_CLIENT_SECRET =
 LOGIN_FIMFICTION_APIKEY_FORCE_HTML = 
 # A token is required to use the beta APIv2 from FimFiction (see APIKEY_CLIENT_*)
 # (FORMAT: PASSWORD) 
-LOGIN_FIMFICTION_APIKEY_TOKEN = 
+LOGIN_FIMFICTION_APIKEY_TOKEN = Bearer WnZ5oHlzQoDocv1GcgHfcoqctHkSwL-D