projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7e287db
)
Add “unknown” Sone state, initialize local and remote Sones differently.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 19 Oct 2010 07:19:09 +0000
(09:19 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Tue, 19 Oct 2010 07:19:09 +0000
(09:19 +0200)
src/main/java/net/pterodactylus/sone/core/Core.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
patch
|
blob
|
history
src/main/resources/static/css/sone.css
patch
|
blob
|
history
src/main/resources/templates/include/viewSone.html
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
76881ef
..
0f733b6
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-59,6
+59,9
@@
public class Core extends AbstractService {
*/
public enum SoneStatus {
*/
public enum SoneStatus {
+ /** The Sone is unknown, i.e. not yet downloaded. */
+ unknown,
+
/** The Sone is idle, i.e. not being downloaded or inserted. */
idle,
/** The Sone is idle, i.e. not being downloaded or inserted. */
idle,
@@
-159,7
+162,7
@@
public class Core extends AbstractService {
if (!soneCache.containsKey(soneId)) {
Sone sone = new Sone(soneId);
soneCache.put(soneId, sone);
if (!soneCache.containsKey(soneId)) {
Sone sone = new Sone(soneId);
soneCache.put(soneId, sone);
- setSoneStatus(sone, SoneStatus.
idle
);
+ setSoneStatus(sone, SoneStatus.
unknown
);
}
return soneCache.get(soneId);
}
}
return soneCache.get(soneId);
}
@@
-302,6
+305,7
@@
public class Core extends AbstractService {
*/
public void addLocalSone(Sone sone) {
if (localSones.add(sone)) {
*/
public void addLocalSone(Sone sone) {
if (localSones.add(sone)) {
+ setSoneStatus(sone, SoneStatus.idle);
SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserter.start();
soneInserters.put(sone, soneInserter);
SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserter.start();
soneInserters.put(sone, soneInserter);
@@
-443,7
+447,7
@@
public class Core extends AbstractService {
addSone(parsedSone);
}
} finally {
addSone(parsedSone);
}
} finally {
- setSoneStatus(sone, SoneStatus.idle);
+ setSoneStatus(sone,
(sone.getTime() == 0) ? SoneStatus.unknown :
SoneStatus.idle);
}
}
}, "Sone Downloader").start();
}
}
}, "Sone Downloader").start();
diff --git
a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index
07a3755
..
b7663e5
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/
src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@
-125,7
+125,7
@@
public class SoneDownloader extends AbstractService {
core.addSone(parsedSone);
}
} finally {
core.addSone(parsedSone);
}
} finally {
- core.setSoneStatus(sone, SoneStatus.idle);
+ core.setSoneStatus(sone,
(sone.getTime() == 0) ? SoneStatus.unknown :
SoneStatus.idle);
}
}
}
}
diff --git
a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
index
e22738a
..
ebf2f82
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
+++ b/
src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
@@
-78,6
+78,8
@@
public class SoneAccessor extends ReflectionAccessor {
return sone.getModificationCounter() > 0;
} else if (member.equals("status")) {
return core.getSoneStatus(sone).toString();
return sone.getModificationCounter() > 0;
} else if (member.equals("status")) {
return core.getSoneStatus(sone).toString();
+ } else if (member.equals("unknown")) {
+ return core.getSoneStatus(sone) == SoneStatus.unknown;
} else if (member.equals("idle")) {
return core.getSoneStatus(sone) == SoneStatus.idle;
} else if (member.equals("inserting")) {
} else if (member.equals("idle")) {
return core.getSoneStatus(sone) == SoneStatus.idle;
} else if (member.equals("inserting")) {
diff --git
a/src/main/resources/static/css/sone.css
b/src/main/resources/static/css/sone.css
index
cc94ce0
..
25e61c9
100644
(file)
--- a/
src/main/resources/static/css/sone.css
+++ b/
src/main/resources/static/css/sone.css
@@
-153,24
+153,24
@@
display: inline;
}
display: inline;
}
-#sone .sone .
download-marker, #sone .sone .insert-marker, #sone .sone .idle
-marker {
- display:
inli
ne;
+#sone .sone .
unknown-marker, #sone .sone .download-marker, #sone .sone .insert-marker, #sone .sone .idle-marker, #sone .sone .modified
-marker {
+ display:
no
ne;
}
}
-#sone .sone.
idle .download-marker, #sone .sone.idle .insert
-marker {
- display:
no
ne;
+#sone .sone.
unknown .unknown
-marker {
+ display:
inli
ne;
}
}
-#sone .sone.
downloading .insert-marker, #sone .sone.downloading
.idle-marker {
- display:
no
ne;
+#sone .sone.
idle
.idle-marker {
+ display:
inli
ne;
}
}
-#sone .sone.
inserting .download-marker, #sone .sone.inserting .idle
-marker {
- display:
no
ne;
+#sone .sone.
downloading .download
-marker {
+ display:
inli
ne;
}
}
-#sone .sone
.modified
-marker {
- display:
no
ne;
+#sone .sone
.inserting .insert
-marker {
+ display:
inli
ne;
}
#sone .sone.modified .modified-marker {
}
#sone .sone.modified .modified-marker {
diff --git
a/src/main/resources/templates/include/viewSone.html
b/src/main/resources/templates/include/viewSone.html
index
868cd70
..
615510a
100644
(file)
--- a/
src/main/resources/templates/include/viewSone.html
+++ b/
src/main/resources/templates/include/viewSone.html
@@
-1,6
+1,7
@@
<div class="sone <% sone.status><%if sone.modified> modified<%/if>">
<div class="profile-link"><a href="viewSone.html?sone=<% sone.id>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
<div class="last-update">(<%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss">)</div>
<div class="sone <% sone.status><%if sone.modified> modified<%/if>">
<div class="profile-link"><a href="viewSone.html?sone=<% sone.id>" title="<% sone.requestUri|html>"><% sone.niceName|html></a></div>
<div class="last-update">(<%= View.Sone.Label.LastUpdate|l10n|html> <% sone.time|date format="MMM d, yyyy, HH:mm:ss">)</div>
+ <div class="unknown-marker">?</div>
<div class="modified-marker">!</div>
<div class="download-marker">⬊</div>
<div class="insert-marker">⬈</div>
<div class="modified-marker">!</div>
<div class="download-marker">⬊</div>
<div class="insert-marker">⬈</div>