X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderStoryWindow.java;h=af9c472693cb6a689d0c27339e2a9ea564d68025;hp=5874015153e799e8af55e46b157a3f6aac10b8e0;hb=e0fb1417b679a2f3cb0fef4937e79b211f1ce3c4;hpb=6a26aa7608a8e5573fb69b1ef949980d5c4676bf

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
index 5874015..af9c472 100644
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
@@ -1,7 +1,10 @@
 package be.nikiroo.fanfix.reader.tui;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 import jexer.TAction;
@@ -10,6 +13,7 @@ import jexer.TLabel;
 import jexer.TTable;
 import jexer.TText;
 import jexer.TWindow;
+import jexer.event.TCommandEvent;
 import jexer.event.TResizeEvent;
 import jexer.event.TResizeEvent.Type;
 import be.nikiroo.fanfix.data.Chapter;
@@ -17,7 +21,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
-import be.nikiroo.fanfix.library.BasicLibrary;
+import be.nikiroo.utils.StringUtils;
 
 /**
  * This window will contain the {@link Story} in a readable format, with a
@@ -26,8 +30,6 @@ import be.nikiroo.fanfix.library.BasicLibrary;
  * @author niki
  */
 class TuiReaderStoryWindow extends TWindow {
-	private BasicLibrary lib;
-	private MetaData meta;
 	private Story story;
 	private TLabel titleField;
 	private TText textField;
@@ -37,21 +39,24 @@ class TuiReaderStoryWindow extends TWindow {
 	private TLabel currentChapter;
 
 	// chapter: -1 for "none" (0 is desc)
-	public TuiReaderStoryWindow(TuiReaderApplication app, BasicLibrary lib,
-			MetaData meta, int chapter) {
-		super(app, desc(meta), 0, 0, 60, 18, CENTERED | RESIZABLE);
+	public TuiReaderStoryWindow(TuiReaderApplication app, Story story,
+			int chapter) {
+		super(app, desc(story.getMeta()), 0, 0, 60, 18, CENTERED | RESIZABLE);
 
-		this.lib = lib;
-		this.meta = meta;
+		this.story = story;
 
-		app.setStatusBar(this, desc(meta));
+		app.setStatusBar(this, desc(story.getMeta()));
 
 		// last = use window background
 		titleField = new TLabel(this, "    Title", 0, 1, "tlabel", false);
-		textField = new TText(this, "", 0, 3, getWidth() - 2, getHeight() - 5);
+		textField = new TText(this, "", 1, 3, getWidth() - 4, getHeight() - 5);
 		table = new TTable(this, 0, 3, getWidth(), getHeight() - 4, null, null,
 				Arrays.asList("Key", "Value"), true);
 
+		titleField.setEnabled(false);
+		textField.getVerticalScroller().setX(
+				textField.getVerticalScroller().getX() + 1);
+
 		navigationButtons = new ArrayList<TButton>(5);
 
 		// -3 because 0-based and 2 for borders
@@ -98,10 +103,12 @@ class TuiReaderStoryWindow extends TWindow {
 	public void onResize(TResizeEvent resize) {
 		super.onResize(resize);
 
-		// Resize the text field TODO: why setW/setH/reflow not enough for the
-		// scrollbars?
-		textField.onResize(new TResizeEvent(Type.WIDGET, resize.getWidth() - 2,
+		// Resize the text field
+		// TODO: why setW/setH/reflow not enough for the scrollbars?
+		textField.onResize(new TResizeEvent(Type.WIDGET, resize.getWidth() - 4,
 				resize.getHeight() - 5));
+		textField.getVerticalScroller().setX(
+				textField.getVerticalScroller().getX() + 1);
 
 		table.setWidth(getWidth());
 		table.setHeight(getHeight() - 4);
@@ -165,21 +172,63 @@ class TuiReaderStoryWindow extends TWindow {
 	private void displayInfoPage() {
 		textField.setVisible(false);
 		table.setVisible(true);
+		textField.setEnabled(false);
+		table.setEnabled(true);
 
 		MetaData meta = getStory().getMeta();
 
 		setCurrentTitle(meta.getTitle());
 
 		table.setRowData(new String[][] { //
-				new String[] { "Author", meta.getAuthor() }, //
-				new String[] { "Publication date", meta.getDate() },
-				new String[] { "Word count", Long.toString(meta.getWords()) },
-				new String[] { "Source", meta.getSource() } //
+				new String[] { " Author", meta.getAuthor() }, //
+				new String[] { " Publication date", formatDate(meta.getDate()) },
+				new String[] { " Word count", format(meta.getWords()) },
+				new String[] { " Source", meta.getSource() } //
 		});
 		table.setHeaders(Arrays.asList("key", "value"), false);
 		table.toTop();
 	}
 
+	private String format(long value) {
+		String display = "";
+
+		while (value > 0) {
+			if (!display.isEmpty()) {
+				display = "." + display;
+			}
+			display = (value % 1000) + display;
+			value = value / 1000;
+		}
+
+		return display;
+	}
+
+	private String formatDate(String date) {
+		long ms = 0;
+
+		try {
+			ms = StringUtils.toTime(date);
+		} catch (ParseException e) {
+		}
+
+		if (ms <= 0) {
+			SimpleDateFormat sdf = new SimpleDateFormat(
+					"yyyy-MM-dd'T'HH:mm:ssXXX");
+			try {
+				ms = sdf.parse(date).getTime();
+			} catch (ParseException e) {
+			}
+		}
+
+		if (ms > 0) {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+			return sdf.format(new Date(ms));
+		}
+
+		// :(
+		return date;
+	}
+
 	/**
 	 * Append the current chapter.
 	 * 
@@ -189,6 +238,8 @@ class TuiReaderStoryWindow extends TWindow {
 	private void displayChapterPage() {
 		table.setVisible(false);
 		textField.setVisible(true);
+		table.setEnabled(false);
+		textField.setEnabled(true);
 
 		StringBuilder builder = new StringBuilder();
 
@@ -219,10 +270,6 @@ class TuiReaderStoryWindow extends TWindow {
 	}
 
 	private Story getStory() {
-		if (story == null) {
-			// TODO: progress bar?
-			story = lib.getStory(meta.getLuid(), null);
-		}
 		return story;
 	}
 
@@ -278,6 +325,13 @@ class TuiReaderStoryWindow extends TWindow {
 	 *            the new title
 	 */
 	private void setCurrentTitle(String title) {
+		String pad = "";
+		if (title.length() < getWidth()) {
+			int padSize = (getWidth() - title.length()) / 2;
+			pad = String.format("%" + padSize + "s", "");
+		}
+
+		title = pad + title + pad;
 		titleField.setWidth(title.length());
 		titleField.setLabel(title);
 	}
@@ -285,4 +339,14 @@ class TuiReaderStoryWindow extends TWindow {
 	private static String desc(MetaData meta) {
 		return String.format("%s: %s", meta.getLuid(), meta.getTitle());
 	}
+
+	@Override
+	public void onCommand(TCommandEvent command) {
+		if (command.getCmd().equals(TuiReaderApplication.CMD_EXIT)) {
+			TuiReaderApplication.close(this);
+		} else {
+			// Handle our own event if needed here
+			super.onCommand(command);
+		}
+	}
 }