X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5103b7d527afe1b22082cdaf4f50f6de229cc857;hp=827729c938690ace677419006f6a7233132517ee;hb=c2e868714435ac7c75d77d1911d0dfb00393d051;hpb=78e60dc26c8ad078237ee2e2f763e53fd84a3764

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 827729c..5103b7d 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -603,7 +603,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (bookmarkedPosts) {
 			for (String bookmarkedPostId : bookmarkedPosts) {
 				Optional<Post> post = getPost(bookmarkedPostId);
-				if (!post.isPresent()) {
+				if (post.isPresent()) {
 					posts.add(post.get());
 				}
 			}
@@ -741,6 +741,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given OwnIdentity is null!");
 			return null;
 		}
+		logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
 		synchronized (sones) {
 			final Sone sone;
 			try {
@@ -1034,13 +1035,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			database.storePostReplies(sone, sone.getReplies());
 			synchronized (albums) {
 				synchronized (images) {
-					for (Album album : storedSone.get().getAlbums()) {
+					for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
 						albums.remove(album.getId());
 						for (Image image : album.getImages()) {
 							images.remove(image.getId());
 						}
 					}
-					for (Album album : sone.getAlbums()) {
+					for (Album album : sone.getRootAlbum().getAlbums()) {
 						albums.put(album.getId(), album);
 						for (Image image : album.getImages()) {
 							images.put(image.getId(), image);
@@ -1050,6 +1051,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 			synchronized (sones) {
 				sone.setOptions(storedSone.get().getOptions());
+				sone.setKnown(storedSone.get().isKnown());
+				sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
+				if (sone.isLocal()) {
+					soneInserters.get(storedSone.get()).setSone(sone);
+					touchConfiguration();
+				}
 				sones.put(sone.getId(), sone);
 			}
 		}
@@ -1116,6 +1123,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
 			return;
 		}
+		logger.info(String.format("Loading local Sone: %s", sone));
 
 		/* initialize options. */
 		sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
@@ -1311,7 +1319,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			for (String friendId : friends) {
 				followSone(sone, friendId);
 			}
-			sone.setAlbums(topLevelAlbums);
+			for (Album album : sone.getRootAlbum().getAlbums()) {
+				sone.getRootAlbum().removeAlbum(album);
+			}
+			for (Album album : topLevelAlbums) {
+				sone.getRootAlbum().addAlbum(album);
+			}
 			soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 		}
 		synchronized (knownSones) {
@@ -1327,6 +1340,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		for (PostReply reply : replies) {
 			reply.setKnown(true);
 		}
+
+		logger.info(String.format("Sone loaded successfully: %s", sone));
 	}
 
 	/**
@@ -1574,7 +1589,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The new album
 	 */
 	public Album createAlbum(Sone sone) {
-		return createAlbum(sone, null);
+		return createAlbum(sone, sone.getRootAlbum());
 	}
 
 	/**
@@ -1593,11 +1608,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			albums.put(album.getId(), album);
 		}
 		album.setSone(sone);
-		if (parent != null) {
-			parent.addAlbum(album);
-		} else {
-			sone.addAlbum(album);
-		}
+		parent.addAlbum(album);
 		return album;
 	}
 
@@ -1614,11 +1625,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		if (!album.isEmpty()) {
 			return;
 		}
-		if (album.getParent() == null) {
-			album.getSone().removeAlbum(album);
-		} else {
-			album.getParent().removeAlbum(album);
-		}
+		album.getParent().removeAlbum(album);
 		synchronized (albums) {
 			albums.remove(album.getId());
 		}
@@ -1873,7 +1880,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
 			/* save albums. first, collect in a flat structure, top-level first. */
-			List<Album> albums = FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList();
+			List<Album> albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();
 
 			int albumCounter = 0;
 			for (Album album : albums) {
@@ -1881,7 +1888,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
 				configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
 				configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
-				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent() == null ? null : album.getParent().getId());
+				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
 				configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId());
 			}
 			configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);
@@ -2160,6 +2167,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				Sone sone = getRemoteSone(identity.getId(), false);
+				if (sone.isLocal()) {
+					return;
+				}
 				sone.setIdentity(identity);
 				sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
 				soneDownloader.addSone(sone);