From 8141d7ac9891898b77a355bfa152de9f3dd76e7e Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sat, 20 Apr 2019 00:55:09 +0200 Subject: [PATCH] --tag -> --search-tag --- README-fr.md | 4 ++-- README.md | 4 ++-- src/be/nikiroo/fanfix/Main.java | 14 +++++++------- .../fanfix/bundles/resources_core.properties | 4 ++-- .../fanfix/bundles/resources_core_fr.properties | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README-fr.md b/README-fr.md index d5853c20..5a0d7f8d 100644 --- a/README-fr.md +++ b/README-fr.md @@ -12,8 +12,8 @@ Fanfix est un petit programme Java qui peut télécharger des histoires sur inte - ```fanfix``` --read-url [*URL*] ([*chapter number*]) - ```fanfix``` --search - ```fanfix``` --search [*where*] [*keywords*] (page [*page*]) (item [*item*]) -- ```fanfix``` --tag -- ```fanfix``` --tag [*index 1*]... (page [*page*]) (item [*item*]) +- ```fanfix``` --search-tag +- ```fanfix``` --search-tag [*index 1*]... (page [*page*]) (item [*item*]) - ```fanfix``` --list - ```fanfix``` --set-reader [*GUI* | *TUI* | *CLI*] - ```fanfix``` --server [*key*] [*port*] diff --git a/README.md b/README.md index 6acc3d17..7e7c3b9e 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ Fanfix is a small Java program that can download stories from some supported web - ```fanfix``` --read-url [*URL*] ([*chapter number*]) - ```fanfix``` --search - ```fanfix``` --search [*where*] [*keywords*] (page [*page*]) (item [*item*]) -- ```fanfix``` --tag -- ```fanfix``` --tag [*index 1*]... (page [*page*]) (item [*item*]) +- ```fanfix``` --search-tag +- ```fanfix``` --search-tag [*index 1*]... (page [*page*]) (item [*item*]) - ```fanfix``` --list - ```fanfix``` --set-reader [*GUI* | *TUI* | *CLI*] - ```fanfix``` --server [*key*] [*port*] diff --git a/src/be/nikiroo/fanfix/Main.java b/src/be/nikiroo/fanfix/Main.java index faf88200..995251d1 100644 --- a/src/be/nikiroo/fanfix/Main.java +++ b/src/be/nikiroo/fanfix/Main.java @@ -35,7 +35,7 @@ import be.nikiroo.utils.serial.server.ServerObject; */ public class Main { private enum MainAction { - IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE, SET_SOURCE, SET_TITLE, SET_AUTHOR, SEARCH, TAG + IMPORT, EXPORT, CONVERT, READ, READ_URL, LIST, HELP, SET_READER, START, VERSION, SERVER, STOP_SERVER, REMOTE, SET_SOURCE, SET_TITLE, SET_AUTHOR, SEARCH, SEARCH_TAG } /** @@ -65,10 +65,10 @@ public class Main { *
  • --search [where] [keywords] (page [page]) (item [item]): search on * the supported website and display the given results page of stories it * found, or the story details if asked
    • - *
  • --tag [where]: list all the tags supported by this website
    • - *
  • --tag [index 1]... (page [page]) (item [item]): search for the given - * stories or subtags, tag by tag, and display information about a specific - * page of results or about a specific item if requested
    • + *
  • --search-tag [where]: list all the tags supported by this website
    • + *
  • --search-tag [index 1]... (page [page]) (item [item]): search for the + * given stories or subtags, tag by tag, and display information about a + * specific page of results or about a specific item if requested
    • *
  • --list ([type]): list the stories present in the library
    • *
  • --set-source [id] [new source]: change the source of the given story
    • *
  • --set-title [id] [new title]: change the title of the given story
    • @@ -258,7 +258,7 @@ public class Main { exitCode = 255; } break; - case TAG: + case SEARCH_TAG: if (searchOn == null) { searchOn = SupportType.valueOfAllOkUC(args[i]); @@ -509,7 +509,7 @@ public class Main { } break; - case TAG: + case SEARCH_TAG: if (searchOn == null) { exitCode = 255; break; diff --git a/src/be/nikiroo/fanfix/bundles/resources_core.properties b/src/be/nikiroo/fanfix/bundles/resources_core.properties index e2441222..363a59b2 100644 --- a/src/be/nikiroo/fanfix/bundles/resources_core.properties +++ b/src/be/nikiroo/fanfix/bundles/resources_core.properties @@ -24,8 +24,8 @@ HELP_SYNTAX = Valid options:\n\ \t--search [where] [keywords] (page [page]) (item [item]): search on the supported \n\ \t\twebsite and display the given results page of stories it found, or the story \n\ \t\tdetails if asked\n\ -\t--tag [where]: list all the tags supported by this website\n\ -\t--tag [index 1]... (page [page]) (item [item]): search for the given stories or \n\ +\t--search-tag [where]: list all the tags supported by this website\n\ +\t--search-tag [index 1]... (page [page]) (item [item]): search for the given stories or \n\ \t\tsubtags, tag by tag, and display information about a specific page of results or \n\ \t\tabout a specific item if requested\n\ \t--list ([type]) : list the stories present in the library\n\ diff --git a/src/be/nikiroo/fanfix/bundles/resources_core_fr.properties b/src/be/nikiroo/fanfix/bundles/resources_core_fr.properties index 71c0411b..1ce9f64f 100644 --- a/src/be/nikiroo/fanfix/bundles/resources_core_fr.properties +++ b/src/be/nikiroo/fanfix/bundles/resources_core_fr.properties @@ -19,8 +19,8 @@ HELP_SYNTAX = Options reconnues :\n\ \t--search [where] [keywords] (page [page]) (item [item]): lance une recherche et \n\ \t\taffiche les résultats de la page page (page 1 par défaut), et de l'item item \n\ \t\tspécifique si demandé\n\ -\t--tag [where]: liste tous les tags supportés par ce site web\n\ -\t--tag [index 1]... (page [page]) (item [item]): affine la recherche, tag par tag,\n\ +\t--search-tag [where]: liste tous les tags supportés par ce site web\n\ +\t--search-tag [index 1]... (page [page]) (item [item]): affine la recherche, tag par tag,\n\ \t\tet affiche si besoin les sous-tags, les histoires ou les infos précises de \n\ \t\tl'histoire demandée\n\ \t--list ([type]): lister les histoires presentes dans la librairie et leurs IDs\n\ -- 2.27.0