git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Network server and Library + nikiroo-utils update
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
VersionCheck.java
diff --git
a/src/be/nikiroo/fanfix/VersionCheck.java
b/src/be/nikiroo/fanfix/VersionCheck.java
index 3359bacbce41b977a6a7ee9daf089a02a8331e61..be7fb919cb376f939457a989298deffd626af17e 100644
(file)
--- a/
src/be/nikiroo/fanfix/VersionCheck.java
+++ b/
src/be/nikiroo/fanfix/VersionCheck.java
@@
-12,6
+12,12
@@
import java.util.Map;
import be.nikiroo.utils.Version;
import be.nikiroo.utils.Version;
+/**
+ * Version checker: can check the current version of the program against a
+ * remote changelog, and list the missed updates and their description.
+ *
+ * @author niki
+ */
public class VersionCheck {
private static final String url = "https://github.com/nikiroo/fanfix/raw/master/changelog.md";
public class VersionCheck {
private static final String url = "https://github.com/nikiroo/fanfix/raw/master/changelog.md";
@@
-107,18
+113,22
@@
public class VersionCheck {
BufferedReader reader = new BufferedReader(
new InputStreamReader(in, "UTF-8"));
try {
BufferedReader reader = new BufferedReader(
new InputStreamReader(in, "UTF-8"));
try {
+ Version version = new Version();
for (String line = reader.readLine(); line != null; line = reader
.readLine()) {
if (line.startsWith("## Version ")) {
for (String line = reader.readLine(); line != null; line = reader
.readLine()) {
if (line.startsWith("## Version ")) {
- String v = line.substring("## Version ".length());
-
Version version = new Version(v
);
+ version = new Version(line.substring("## Version "
+
.length())
);
if (version.isNewerThan(current)) {
newer.add(version);
changes.put(version, new ArrayList<String>());
if (version.isNewerThan(current)) {
newer.add(version);
changes.put(version, new ArrayList<String>());
+ } else {
+ version = new Version();
}
}
- } else if (!newer.isEmpty() && !line.isEmpty()) {
- Version version = newer.get(newer.size() - 1);
- List<String> ch = changes.get(version);
+ } else if (!version.isEmpty() && !newer.isEmpty()
+ && !line.isEmpty()) {
+ List<String> ch = changes.get(newer.get(newer
+ .size() - 1));
if (!ch.isEmpty() && !line.startsWith("- ")) {
int i = ch.size() - 1;
ch.set(i, ch.get(i) + " " + line.trim());
if (!ch.isEmpty() && !line.startsWith("- ")) {
int i = ch.size() - 1;
ch.set(i, ch.get(i) + " " + line.trim());