From 738c81bf3a6b2edaa6f539ea6a24453fbec4c410 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Fri, 18 Aug 2017 15:04:13 +0200 Subject: [PATCH] New key for FimFictionApi, no TUI by default --- changelog.md | 4 ++-- configure.sh | 10 +++++++--- src/be/nikiroo/fanfix/bundles/config.properties | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/changelog.md b/changelog.md index 3cb36a79..e9a44e79 100644 --- 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 cee20780..520afba9 100755 --- 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 6e59fe69..0c04e414 100644 --- 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 -- 2.27.0