X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a6a33169e21b47691c01203b3800d851f41ad95e;hb=f313a48bfc36f9968d18b76436739c093b562b7a;hp=008702c0c511346f3df6f0d367891cda2e014f01;hpb=f51ae381645dbe409ec6e08891ff7d90c30f1f34;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 008702c..a6a3316 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -52,6 +52,7 @@ 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.data.AlbumImpl;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
@@ -603,7 +604,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());
 				}
 			}
@@ -639,7 +640,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (albums) {
 			Album album = albums.get(albumId);
 			if (create && (album == null)) {
-				album = new Album(albumId);
+				album = new AlbumImpl(albumId);
 				albums.put(albumId, album);
 			}
 			return album;
@@ -1035,13 +1036,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);
@@ -1052,6 +1053,11 @@ 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);
 			}
 		}
@@ -1314,7 +1320,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) {
@@ -1579,7 +1590,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,16 +1604,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The new album
 	 */
 	public Album createAlbum(Sone sone, Album parent) {
-		Album album = new Album();
+		AlbumImpl album = new AlbumImpl();
 		synchronized (albums) {
 			albums.put(album.getId(), album);
 		}
 		album.setSone(sone);
-		if (parent != null) {
-			parent.addAlbum(album);
-		} else {
-			sone.addAlbum(album);
-		}
+		parent.addAlbum(album);
 		return album;
 	}
 
@@ -1619,11 +1626,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());
 		}
@@ -1878,7 +1881,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) {
@@ -1886,7 +1889,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);
@@ -2165,6 +2168,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);