git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cf032e2
)
--tag -> --search-tag
author
Niki Roo
<niki@nikiroo.be>
Fri, 19 Apr 2019 22:55:09 +0000
(
00:55
+0200)
committer
Niki Roo
<niki@nikiroo.be>
Fri, 19 Apr 2019 22:55:09 +0000
(
00:55
+0200)
README-fr.md
patch
|
blob
|
blame
|
history
README.md
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/Main.java
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/bundles/resources_core.properties
patch
|
blob
|
blame
|
history
src/be/nikiroo/fanfix/bundles/resources_core_fr.properties
patch
|
blob
|
blame
|
history
diff --git
a/README-fr.md
b/README-fr.md
index d5853c20a917afe85fa0d3f7d1b74ab0d527b80e..5a0d7f8dadda047e57d5ae30a3000fceb216f903 100644
(file)
--- 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``` --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*]
- ```fanfix``` --list
- ```fanfix``` --set-reader [*GUI* | *TUI* | *CLI*]
- ```fanfix``` --server [*key*] [*port*]
diff --git
a/README.md
b/README.md
index 6acc3d17bc4c34042e8894edef844c13cd698148..7e7c3b9e22e8ad15648b99d4de2dfb76c89bfeb0 100644
(file)
--- 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``` --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*]
- ```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 faf882006fccfb0b1e9c8a3774c74802d6b8ee78..995251d16d0ee7ca6a0438ce21c8268efa6c51cc 100644
(file)
--- 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 {
*/
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 {
* <li>--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</li>
* <li>--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</li>
- * <li>--tag [where]: list all the tags supported by this website</li>
- * <li>--
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</li>
+ * <li>--
search-
tag [where]: list all the tags supported by this website</li>
+ * <li>--
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</li>
* <li>--list ([type]): list the stories present in the library</li>
* <li>--set-source [id] [new source]: change the source of the given story</li>
* <li>--set-title [id] [new title]: change the title of the given story</li>
* <li>--list ([type]): list the stories present in the library</li>
* <li>--set-source [id] [new source]: change the source of the given story</li>
* <li>--set-title [id] [new title]: change the title of the given story</li>
@@
-258,7
+258,7
@@
public class Main {
exitCode = 255;
}
break;
exitCode = 255;
}
break;
- case TAG:
+ case
SEARCH_
TAG:
if (searchOn == null) {
searchOn = SupportType.valueOfAllOkUC(args[i]);
if (searchOn == null) {
searchOn = SupportType.valueOfAllOkUC(args[i]);
@@
-509,7
+509,7
@@
public class Main {
}
break;
}
break;
- case TAG:
+ case
SEARCH_
TAG:
if (searchOn == null) {
exitCode = 255;
break;
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 e244122258e1dc656404e29c35a48603d09c648b..363a59b268cb0ae1936b012131de1c1e5b00cb5c 100644
(file)
--- 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--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\
\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 71c0411b26b7b62e7c571839eb71b20a17703d31..1ce9f64f681d79e3508fe2962d080e7f8fb12219 100644
(file)
--- 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--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\
\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\