projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Translated untranslated Japanese string
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
Core.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
8ce908b
..
ecb5857
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-52,7
+52,6
@@
import net.pterodactylus.sone.core.event.SoneLockedEvent;
import net.pterodactylus.sone.core.event.SoneRemovedEvent;
import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.core.event.SoneRemovedEvent;
import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.AlbumImpl;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
@@
-63,6
+62,7
@@
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
import net.pterodactylus.sone.data.Sone.SoneStatus;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneImpl;
import net.pterodactylus.sone.data.TemporaryImage;
import net.pterodactylus.sone.database.Database;
import net.pterodactylus.sone.database.DatabaseException;
import net.pterodactylus.sone.data.TemporaryImage;
import net.pterodactylus.sone.database.Database;
import net.pterodactylus.sone.database.DatabaseException;
@@
-188,9
+188,6
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
/** Trusted identities, sorted by own identities. */
private final Multimap<OwnIdentity, Identity> trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.<OwnIdentity, Identity>create());
/** Trusted identities, sorted by own identities. */
private final Multimap<OwnIdentity, Identity> trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.<OwnIdentity, Identity>create());
- /** All known images. */
- private final Map<String, Image> images = new HashMap<String, Image>();
-
/** All temporary images. */
private final Map<String, TemporaryImage> temporaryImages = new HashMap<String, TemporaryImage>();
/** All temporary images. */
private final Map<String, TemporaryImage> temporaryImages = new HashMap<String, TemporaryImage>();
@@
-382,11
+379,11
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
synchronized (sones) {
Sone sone = sones.get(id);
if ((sone == null) && create) {
synchronized (sones) {
Sone sone = sones.get(id);
if ((sone == null) && create) {
- sone = new Sone(id, true);
+ sone = new Sone
Impl
(id, true);
sones.put(id, sone);
}
if ((sone != null) && !sone.isLocal()) {
sones.put(id, sone);
}
if ((sone != null) && !sone.isLocal()) {
- sone = new Sone(id, true);
+ sone = new Sone
Impl
(id, true);
sones.put(id, sone);
}
return sone;
sones.put(id, sone);
}
return sone;
@@
-423,7
+420,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
synchronized (sones) {
Sone sone = sones.get(id);
if ((sone == null) && create && (id != null) && (id.length() == 43)) {
synchronized (sones) {
Sone sone = sones.get(id);
if ((sone == null) && create && (id != null) && (id.length() == 43)) {
- sone = new Sone(id, false);
+ sone = new Sone
Impl
(id, false);
sones.put(id, sone);
}
return sone;
sones.put(id, sone);
}
return sone;
@@
-641,7
+638,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
if (!create) {
return null;
}
if (!create) {
return null;
}
- Album newAlbum =
new AlbumImpl(albumId
);
+ Album newAlbum =
database.newAlbumBuilder().withId(albumId).build(
);
database.storeAlbum(newAlbum);
return newAlbum;
}
database.storeAlbum(newAlbum);
return newAlbum;
}
@@
-670,14
+667,16
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* none was created
*/
public Image getImage(String imageId, boolean create) {
* none was created
*/
public Image getImage(String imageId, boolean create) {
- synchronized (images) {
- Image image = images.get(imageId);
- if (create && (image == null)) {
- image = new Image(imageId);
- images.put(imageId, image);
- }
- return image;
+ Optional<Image> image = database.getImage(imageId);
+ if (image.isPresent()) {
+ return image.get();
}
}
+ if (!create) {
+ return null;
+ }
+ Image newImage = database.newImageBuilder().withId(imageId).build();
+ database.storeImage(newImage);
+ return newImage;
}
/**
}
/**
@@
-1033,18
+1032,16
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
}
}
database.storePostReplies(sone, sone.getReplies());
}
}
database.storePostReplies(sone, sone.getReplies());
- synchronized (images) {
- for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
- database.removeAlbum(album);
- for (Image image : album.getImages()) {
- images.remove(image.getId());
- }
+ for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
+ database.removeAlbum(album);
+ for (Image image : album.getImages()) {
+ database.removeImage(image);
}
}
- for (Album album : sone.getRootAlbum().getAlbums()) {
- database.storeAlbum(album);
- for (Image image : album.getImages()) {
- images.put(image.getId(), image);
- }
+ }
+ for (Album album : sone.getRootAlbum().getAlbums()) {
+ database.storeAlbum(album);
+ for (Image image : album.getImages()) {
+ database.storeImage(image);
}
}
synchronized (sones) {
}
}
synchronized (sones) {
@@
-1248,7
+1245,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
logger.log(Level.WARNING, "Invalid album found, aborting load!");
return;
}
logger.log(Level.WARNING, "Invalid album found, aborting load!");
return;
}
- Album album = getAlbum(albumId).setSone(sone).
setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId
);
+ Album album = getAlbum(albumId).setSone(sone).
modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update(
);
if (albumParentId != null) {
Album parentAlbum = getAlbum(albumParentId, false);
if (parentAlbum == null) {
if (albumParentId != null) {
Album parentAlbum = getAlbum(albumParentId, false);
if (parentAlbum == null) {
@@
-1287,8
+1284,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
logger.log(Level.WARNING, "Invalid album image encountered, aborting load!");
return;
}
logger.log(Level.WARNING, "Invalid album image encountered, aborting load!");
return;
}
- Image image = getImage(imageId).setSone(sone).setCreationTime(creationTime).setKey(key);
- image.setTitle(title).setDescription(description).setWidth(width).setHeight(height);
+ Image image = getImage(imageId).modify().setSone(sone).setCreationTime(creationTime).setKey(key).setTitle(title).setDescription(description).setWidth(width).setHeight(height).update();
album.addImage(image);
}
album.addImage(image);
}
@@
-1601,7
+1597,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* @return The new album
*/
public Album createAlbum(Sone sone, Album parent) {
* @return The new album
*/
public Album createAlbum(Sone sone, Album parent) {
- Album
Impl album = new AlbumImpl
();
+ Album
album = database.newAlbumBuilder().randomId().build
();
database.storeAlbum(album);
album.setSone(sone);
parent.addAlbum(album);
database.storeAlbum(album);
album.setSone(sone);
parent.addAlbum(album);
@@
-1643,11
+1639,9
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
checkNotNull(temporaryImage, "temporaryImage must not be null");
checkArgument(sone.isLocal(), "sone must be a local Sone");
checkArgument(sone.equals(album.getSone()), "album must belong to the given Sone");
checkNotNull(temporaryImage, "temporaryImage must not be null");
checkArgument(sone.isLocal(), "sone must be a local Sone");
checkArgument(sone.equals(album.getSone()), "album must belong to the given Sone");
- Image image =
new Image(temporaryImage.getId()).setSone(sone).setCreationTime(System.currentTimeMillis()
);
+ Image image =
database.newImageBuilder().withId(temporaryImage.getId()).build().modify().setSone(sone).setCreationTime(System.currentTimeMillis()).update(
);
album.addImage(image);
album.addImage(image);
- synchronized (images) {
- images.put(image.getId(), image);
- }
+ database.storeImage(image);
imageInserter.insertImage(temporaryImage, image);
return image;
}
imageInserter.insertImage(temporaryImage, image);
return image;
}
@@
-1665,9
+1659,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
checkArgument(image.getSone().isLocal(), "image must belong to a local Sone");
deleteTemporaryImage(image.getId());
image.getAlbum().removeImage(image);
checkArgument(image.getSone().isLocal(), "image must belong to a local Sone");
deleteTemporaryImage(image.getId());
image.getAlbum().removeImage(image);
- synchronized (images) {
- images.remove(image.getId());
- }
+ database.removeImage(image);
touchConfiguration();
}
touchConfiguration();
}
@@
-1771,7
+1763,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
synchronized (sones) {
for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
soneInserter.getValue().stop();
synchronized (sones) {
for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
soneInserter.getValue().stop();
- saveSone(
soneInserter.getKey(
));
+ saveSone(
getLocalSone(soneInserter.getKey().getId(), false
));
}
}
saveConfiguration();
}
}
saveConfiguration();
@@
-2224,7
+2216,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
@Subscribe
public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
@Subscribe
public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
- imageInsertFinishedEvent.image().
setKey(imageInsertFinishedEvent.resultingUri().toString()
);
+ imageInsertFinishedEvent.image().
modify().setKey(imageInsertFinishedEvent.resultingUri().toString()).update(
);
deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
touchConfiguration();
}
deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
touchConfiguration();
}