X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fdata%2FDownload.java;h=12b012947d79651d9b69f4a5cedac12c093e992c;hb=2d0f3614a96b0d8f7d5666c65ab80b3cbf5349ec;hp=5190ed054faa991c588ebc4274fe35d40023dfff;hpb=6b97ecef1be59f3746e859dfb4a65f2195a6ee90;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/data/Download.java b/src/main/java/net/pterodactylus/xdcc/data/Download.java
index 5190ed0..12b0129 100644
--- a/src/main/java/net/pterodactylus/xdcc/data/Download.java
+++ b/src/main/java/net/pterodactylus/xdcc/data/Download.java
@@ -17,11 +17,17 @@
 
 package net.pterodactylus.xdcc.data;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import java.io.OutputStream;
 import java.net.InetAddress;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
 
 import net.pterodactylus.irc.DccReceiver;
 
+import com.google.common.base.Predicate;
+
 /**
  * Information about an ongoing download.
  *
@@ -29,6 +35,15 @@ import net.pterodactylus.irc.DccReceiver;
  */
 public class Download {
 
+	/** Predicate that identifies downloads that have started. */
+	public static final Predicate<Download> FILTER_RUNNING = new Predicate<Download>() {
+
+		@Override
+		public boolean apply(Download download) {
+			return download.dccReceiver() != null;
+		}
+	};
+
 	/** The bot that is being downloaded from. */
 	private final Bot bot;
 
@@ -36,19 +51,19 @@ public class Download {
 	private final Pack pack;
 
 	/** The name of the file being downloaded. */
-	private String filename;
+	private final AtomicReference<String> filename = new AtomicReference<String>();
 
 	/** The size of the file being downloaded. */
-	private long filesize;
+	private final AtomicLong filesize = new AtomicLong();
 
 	/** The remote address. */
-	private InetAddress remoteAddress;
+	private final AtomicReference<InetAddress> remoteAddress = new AtomicReference<InetAddress>();
 
 	/** The output stream. */
-	private OutputStream outputStream;
+	private final AtomicReference<OutputStream> outputStream = new AtomicReference<OutputStream>();
 
 	/** The DCC receiver. */
-	private DccReceiver dccReceiver;
+	private final AtomicReference<DccReceiver> dccReceiver = new AtomicReference<DccReceiver>();
 
 	/**
 	 * Creates a new download.
@@ -59,8 +74,8 @@ public class Download {
 	 * 		The pack being downloaded
 	 */
 	public Download(Bot bot, Pack pack) {
-		this.bot = bot;
-		this.pack = pack;
+		this.bot = checkNotNull(bot, "bot must not be null");
+		this.pack = checkNotNull(pack, "pack must not be null");
 	}
 
 	//
@@ -91,7 +106,7 @@ public class Download {
 	 * @return The full name of the file
 	 */
 	public String filename() {
-		return filename;
+		return filename.get();
 	}
 
 	/**
@@ -100,7 +115,7 @@ public class Download {
 	 * @return The size of the file
 	 */
 	public long filesize() {
-		return filesize;
+		return filesize.get();
 	}
 
 	/**
@@ -109,7 +124,7 @@ public class Download {
 	 * @return The remote address to download from
 	 */
 	public InetAddress remoteAddress() {
-		return remoteAddress;
+		return remoteAddress.get();
 	}
 
 	/**
@@ -118,7 +133,7 @@ public class Download {
 	 * @return The output stream
 	 */
 	public OutputStream outputStream() {
-		return outputStream;
+		return outputStream.get();
 	}
 
 	/**
@@ -127,7 +142,7 @@ public class Download {
 	 * @return The DCC receiver
 	 */
 	public DccReceiver dccReceiver() {
-		return dccReceiver;
+		return dccReceiver.get();
 	}
 
 	//
@@ -142,7 +157,7 @@ public class Download {
 	 * @return This download
 	 */
 	public Download filename(String filename) {
-		this.filename = filename;
+		this.filename.set(filename);
 		return this;
 	}
 
@@ -154,7 +169,7 @@ public class Download {
 	 * @return This download
 	 */
 	public Download filesize(long filesize) {
-		this.filesize = filesize;
+		this.filesize.set(filesize);
 		return this;
 	}
 
@@ -166,7 +181,7 @@ public class Download {
 	 * @return This download
 	 */
 	public Download remoteAddress(InetAddress remoteAddress) {
-		this.remoteAddress = remoteAddress;
+		this.remoteAddress.set(remoteAddress);
 		return this;
 	}
 
@@ -178,7 +193,7 @@ public class Download {
 	 * @return This download
 	 */
 	public Download outputStream(OutputStream outputStream) {
-		this.outputStream = outputStream;
+		this.outputStream.set(outputStream);
 		return this;
 	}
 
@@ -190,8 +205,26 @@ public class Download {
 	 * @return This download
 	 */
 	public Download dccReceiver(DccReceiver dccReceiver) {
-		this.dccReceiver = dccReceiver;
+		this.dccReceiver.set(dccReceiver);
 		return this;
 	}
 
+	//
+	// OBJECT METHODS
+	//
+
+	@Override
+	public boolean equals(Object object) {
+		if (!(object instanceof Download)) {
+			return false;
+		}
+		Download download = (Download) object;
+		return bot().equals(download.bot()) && pack().equals(download.pack());
+	}
+
+	@Override
+	public int hashCode() {
+		return bot().hashCode() ^ pack().hashCode();
+	}
+
 }