X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=library%2FBasicLibrary.java;h=82f3fa28a0f53c6c94671e86ef491670f871145c;hp=a754c002d3e99b2ecb25df00038599b67b0fa021;hb=598196006967b6ea4da21e7236fa21f51a9af12b;hpb=b1c74688d4fa2af21e54f9f2f69eb55753a739b7

diff --git a/library/BasicLibrary.java b/library/BasicLibrary.java
index a754c00..82f3fa2 100644
--- a/library/BasicLibrary.java
+++ b/library/BasicLibrary.java
@@ -378,213 +378,38 @@ abstract public class BasicLibrary {
 	}
 
 	/**
-	 * List all the known types (sources) of stories.
-	 * 
-	 * @return the sources
-	 * 
-	 * @throws IOException
-	 *             in case of IOException
+	 * @deprecated please use {@link BasicLibrary#getList()} and
+	 *             {@link MetaResultList#getSources()} instead.
 	 */
+	@Deprecated
 	public List<String> getSources() throws IOException {
-		List<String> list = new ArrayList<String>();
-		for (MetaData meta : getMetas(null)) {
-			String storySource = meta.getSource();
-			if (!list.contains(storySource)) {
-				list.add(storySource);
-			}
-		}
-
-		Collections.sort(list);
-		return list;
+		return getList().getSources();
 	}
 
 	/**
-	 * List all the known types (sources) of stories, grouped by directory
-	 * ("Source_1/a" and "Source_1/b" will be grouped into "Source_1").
-	 * <p>
-	 * Note that an empty item in the list means a non-grouped source (type) --
-	 * e.g., you could have for Source_1:
-	 * <ul>
-	 * <li><tt></tt>: empty, so source is "Source_1"</li>
-	 * <li><tt>a</tt>: empty, so source is "Source_1/a"</li>
-	 * <li><tt>b</tt>: empty, so source is "Source_1/b"</li>
-	 * </ul>
-	 * 
-	 * @return the grouped list
-	 * 
-	 * @throws IOException
-	 *             in case of IOException
+	 * @deprecated please use {@link BasicLibrary#getList()} and
+	 *             {@link MetaResultList#getSourcesGrouped()} instead.
 	 */
+	@Deprecated
 	public Map<String, List<String>> getSourcesGrouped() throws IOException {
-		Map<String, List<String>> map = new TreeMap<String, List<String>>();
-		for (String source : getSources()) {
-			String name;
-			String subname;
-
-			int pos = source.indexOf('/');
-			if (pos > 0 && pos < source.length() - 1) {
-				name = source.substring(0, pos);
-				subname = source.substring(pos + 1);
-
-			} else {
-				name = source;
-				subname = "";
-			}
-
-			List<String> list = map.get(name);
-			if (list == null) {
-				list = new ArrayList<String>();
-				map.put(name, list);
-			}
-			list.add(subname);
-		}
-
-		return map;
+		return getList().getSourcesGrouped();
 	}
 
 	/**
-	 * List all the known authors of stories.
-	 * 
-	 * @return the authors
-	 * 
-	 * @throws IOException
-	 *             in case of IOException
+	 * @deprecated please use {@link BasicLibrary#getList()} and
+	 *             {@link MetaResultList#getAuthors()} instead.
 	 */
+	@Deprecated
 	public List<String> getAuthors() throws IOException {
-		List<String> list = new ArrayList<String>();
-		for (MetaData meta : getMetas(null)) {
-			String storyAuthor = meta.getAuthor();
-			if (!list.contains(storyAuthor)) {
-				list.add(storyAuthor);
-			}
-		}
-
-		Collections.sort(list);
-		return list;
+		return getList().getAuthors();
 	}
 
 	/**
-	 * Return the list of authors, grouped by starting letter(s) if needed.
-	 * <p>
-	 * If the number of author is not too high, only one group with an empty
-	 * name and all the authors will be returned.
-	 * <p>
-	 * If not, the authors will be separated into groups:
-	 * <ul>
-	 * <li><tt>*</tt>: any author whose name doesn't contain letters nor numbers
-	 * </li>
-	 * <li><tt>0-9</tt>: any authors whose name starts with a number</li>
-	 * <li><tt>A-C</tt> (for instance): any author whose name starts with
-	 * <tt>A</tt>, <tt>B</tt> or <tt>C</tt></li>
-	 * </ul>
-	 * Note that the letters used in the groups can vary (except <tt>*</tt> and
-	 * <tt>0-9</tt>, which may only be present or not).
-	 * 
-	 * @return the authors' names, grouped by letter(s)
-	 * 
-	 * @throws IOException
-	 *             in case of IOException
+	 * @deprecated please use {@link BasicLibrary#getList()} and
+	 *             {@link MetaResultList#getAuthorsGrouped()} instead.
 	 */
 	public Map<String, List<String>> getAuthorsGrouped() throws IOException {
-		int MAX = 20;
-
-		Map<String, List<String>> groups = new TreeMap<String, List<String>>();
-		List<String> authors = getAuthors();
-
-		// If all authors fit the max, just report them as is
-		if (authors.size() <= MAX) {
-			groups.put("", authors);
-			return groups;
-		}
-
-		// Create groups A to Z, which can be empty here
-		for (char car = 'A'; car <= 'Z'; car++) {
-			groups.put(Character.toString(car), getAuthorsGroup(authors, car));
-		}
-
-		// Collapse them
-		List<String> keys = new ArrayList<String>(groups.keySet());
-		for (int i = 0; i + 1 < keys.size(); i++) {
-			String keyNow = keys.get(i);
-			String keyNext = keys.get(i + 1);
-
-			List<String> now = groups.get(keyNow);
-			List<String> next = groups.get(keyNext);
-
-			int currentTotal = now.size() + next.size();
-			if (currentTotal <= MAX) {
-				String key = keyNow.charAt(0) + "-"
-						+ keyNext.charAt(keyNext.length() - 1);
-
-				List<String> all = new ArrayList<String>();
-				all.addAll(now);
-				all.addAll(next);
-
-				groups.remove(keyNow);
-				groups.remove(keyNext);
-				groups.put(key, all);
-
-				keys.set(i, key); // set the new key instead of key(i)
-				keys.remove(i + 1); // remove the next, consumed key
-				i--; // restart at key(i)
-			}
-		}
-
-		// Add "special" groups
-		groups.put("*", getAuthorsGroup(authors, '*'));
-		groups.put("0-9", getAuthorsGroup(authors, '0'));
-
-		// Prune empty groups
-		keys = new ArrayList<String>(groups.keySet());
-		for (String key : keys) {
-			if (groups.get(key).isEmpty()) {
-				groups.remove(key);
-			}
-		}
-
-		return groups;
-	}
-
-	/**
-	 * Get all the authors that start with the given character:
-	 * <ul>
-	 * <li><tt>*</tt>: any author whose name doesn't contain letters nor numbers
-	 * </li>
-	 * <li><tt>0</tt>: any authors whose name starts with a number</li>
-	 * <li><tt>A</tt> (any capital latin letter): any author whose name starts
-	 * with <tt>A</tt></li>
-	 * </ul>
-	 * 
-	 * @param authors
-	 *            the full list of authors
-	 * @param car
-	 *            the starting character, <tt>*</tt>, <tt>0</tt> or a capital
-	 *            letter
-	 * 
-	 * @return the authors that fulfil the starting letter
-	 */
-	private List<String> getAuthorsGroup(List<String> authors, char car) {
-		List<String> accepted = new ArrayList<String>();
-		for (String author : authors) {
-			char first = '*';
-			for (int i = 0; first == '*' && i < author.length(); i++) {
-				String san = StringUtils.sanitize(author, true, true);
-				char c = san.charAt(i);
-				if (c >= '0' && c <= '9') {
-					first = '0';
-				} else if (c >= 'a' && c <= 'z') {
-					first = (char) (c - 'a' + 'A');
-				} else if (c >= 'A' && c <= 'Z') {
-					first = c;
-				}
-			}
-
-			if (first == car) {
-				accepted.add(author);
-			}
-		}
-
-		return accepted;
+		return getList().getAuthorsGrouped();
 	}
 
 	/**
@@ -638,8 +463,7 @@ abstract public class BasicLibrary {
 	 * @throws IOException
 	 *             in case of IOException
 	 */
-	public Story getStory(String luid, Progress pg)
-			throws IOException {
+	public Story getStory(String luid, Progress pg) throws IOException {
 		Progress pgMetas = new Progress();
 		Progress pgStory = new Progress();
 		if (pg != null) {