X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fcli%2FCliReader.java;h=6d9841830982533247e20dfcc8c5f2b9461a61af;hb=8b153400ae5ab24891446be1b3423ea17e71b49c;hp=22d11cbdfbbb87f9f41b28844d8317087070af1b;hpb=6be5e3bb218e1ed118ad5e693e13d1da2b49df13;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/reader/cli/CliReader.java b/src/be/nikiroo/fanfix/reader/cli/CliReader.java
index 22d11cb..6d98418 100644
--- a/src/be/nikiroo/fanfix/reader/cli/CliReader.java
+++ b/src/be/nikiroo/fanfix/reader/cli/CliReader.java
@@ -14,6 +14,7 @@ import be.nikiroo.fanfix.reader.BasicReader;
 import be.nikiroo.fanfix.searchable.BasicSearchable;
 import be.nikiroo.fanfix.searchable.SearchableTag;
 import be.nikiroo.fanfix.supported.SupportType;
+import be.nikiroo.utils.StringUtils;
 
 /**
  * Command line {@link Story} reader.
@@ -108,23 +109,26 @@ class CliReader extends BasicReader {
 
 	@Override
 	public void searchTag(SupportType searchOn, int page, int item,
-			String... tags) throws IOException {
+			Integer... tags) throws IOException {
 		BasicSearchable search = BasicSearchable.getSearchable(searchOn);
 		List<SearchableTag> stags = search.getTags();
+		String fqnTag = "";
 
 		SearchableTag stag = null;
-		for (String tag : tags) {
-			stag = null;
-			for (int i = 0; i < stags.size(); i++) {
-				if (stags.get(i).getName().equalsIgnoreCase(tag)) {
-					stag = stags.get(i);
-					break;
-				}
+		for (Integer tagIndex : tags) {
+			// ! 1-based index !
+			if (tagIndex == null || tagIndex <= 0 | tagIndex > stags.size()) {
+				throw new IOException("Index out of bounds: " + tagIndex);
 			}
 
+			stag = stags.get(tagIndex - 1);
 			if (stag != null) {
 				search.fillTag(stag);
 				stags = stag.getChildren();
+				if (!fqnTag.isEmpty()) {
+					fqnTag += " / ";
+				}
+				fqnTag += stag.getName();
 			} else {
 				stags = new ArrayList<SearchableTag>();
 				break;
@@ -170,33 +174,12 @@ class CliReader extends BasicReader {
 						} else {
 							SearchableTag subtag = subtags.get(item - 1);
 
-							String sp = "";
-							if (subtag.getParent() != null) {
-								List<String> parents = new ArrayList<String>();
-								for (SearchableTag parent = subtag.getParent(); parent != null; parent = parent
-										.getParent()) {
-									parents.add(parent.getName());
-								}
-								for (String parent : parents) {
-									if (!sp.isEmpty()) {
-										sp += " / ";
-									}
-									sp += parent;
-								}
-							}
-
 							// TODO: i18n
-							if (sp.isEmpty()) {
-								System.out.println(String.format(
-										"%d/%d: %s, %d %s", page, item,
-										subtag.getName(), subtag.getCount(),
-										"stories"));
-							} else {
-								System.out.println(String.format(
-										"%d/%d: %s (%s), %d %s", page, item,
-										subtag.getName(), sp,
-										subtag.getCount(), "stories"));
-							}
+							String stories = "stories";
+							String num = StringUtils.formatNumber(subtag
+									.getCount());
+							System.out.println(String.format("%s (%s), %s %s",
+									subtag.getName(), fqnTag, num, stories));
 						}
 					} else {
 						System.out.println("Invalid item: only " + count
@@ -204,30 +187,46 @@ class CliReader extends BasicReader {
 					}
 				} else {
 					if (metas != null) {
-						int i = 0;
+						// TODO i18n
+						System.out.println(String.format("Content of %s: ",
+								fqnTag));
+						int i = 1;
 						for (MetaData meta : metas) {
-							System.out
-									.println((i + 1) + ": " + meta.getTitle());
+							System.out.println(i + ": " + meta.getTitle());
 							i++;
 						}
 					} else {
+						// TODO i18n
+						System.out.println(String.format("Subtags of %s: ",
+								fqnTag));
 						int i = 1;
 						for (SearchableTag subtag : subtags) {
 							String total = "";
 							if (subtag.getCount() > 0) {
-								// TODO: use StringUtils fromNumber
-								total = " (" + subtag.getCount() + ")";
+								total = StringUtils.formatNumber(subtag
+										.getCount());
 							}
-							System.out.println(i + ": " + subtag.getName()
-									+ total);
+
+							if (total.isEmpty()) {
+								System.out.println(String.format("%d: %s", i,
+										subtag.getName()));
+							} else {
+								System.out.println(String.format("%d: %s (%s)",
+										i, subtag.getName(), total));
+							}
+
 							i++;
 						}
 					}
 				}
 			}
 		} else {
+			// TODO i18n
+			System.out.println("Known tags: ");
+			int i = 1;
 			for (SearchableTag s : stags) {
-				System.out.println(s.getName());
+				System.out.println(String.format("%d: %s", i, s.getName()));
+				i++;
 			}
 		}
 	}