X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=e9d02610648641c98809283a0848e884be585f98;hb=0cd950664899385a6d3b8750b557e244597453d0;hp=a395537607d4e490d6bbc080832603629e9b05dd;hpb=f6942b34cf66267bc67d673cf7852f420ab06dfd;p=xudocci.git
diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index a395537..e9d0261 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -17,6 +17,8 @@
package net.pterodactylus.xdcc.core;
+import static net.pterodactylus.xdcc.data.Download.FILTER_RUNNING;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -24,9 +26,11 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Collection;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -37,12 +41,14 @@ import net.pterodactylus.irc.event.ChannelJoined;
import net.pterodactylus.irc.event.ChannelLeft;
import net.pterodactylus.irc.event.ChannelMessageReceived;
import net.pterodactylus.irc.event.ClientQuit;
+import net.pterodactylus.irc.event.ConnectionClosed;
import net.pterodactylus.irc.event.ConnectionEstablished;
import net.pterodactylus.irc.event.DccAcceptReceived;
import net.pterodactylus.irc.event.DccDownloadFailed;
import net.pterodactylus.irc.event.DccDownloadFinished;
import net.pterodactylus.irc.event.DccSendReceived;
import net.pterodactylus.irc.event.NicknameChanged;
+import net.pterodactylus.irc.event.PrivateNoticeReceived;
import net.pterodactylus.irc.event.PrivateMessageReceived;
import net.pterodactylus.irc.util.MessageCleaner;
import net.pterodactylus.irc.util.RandomNickname;
@@ -62,16 +68,21 @@ import net.pterodactylus.xdcc.data.Pack;
import net.pterodactylus.xdcc.data.Server;
import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
+import com.google.common.collect.FluentIterable;
import com.google.common.collect.HashBasedTable;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.common.collect.Table;
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import com.google.common.io.Closeables;
-import com.google.common.util.concurrent.AbstractIdleService;
+import com.google.common.util.concurrent.AbstractExecutionThreadService;
import com.google.inject.Inject;
/**
@@ -79,7 +90,7 @@ import com.google.inject.Inject;
*
* @author David âBombeâ Roden
*/
-public class Core extends AbstractIdleService {
+public class Core extends AbstractExecutionThreadService {
/** The logger. */
private static final Logger logger = Logger.getLogger(Core.class.getName());
@@ -109,7 +120,7 @@ public class Core extends AbstractIdleService {
private final Table networkBots = HashBasedTable.create();
/** The current downloads. */
- private final Map downloads = Maps.newHashMap();
+ private final Multimap downloads = HashMultimap.create();
/** The current DCC receivers. */
private final Collection dccReceivers = Lists.newArrayList();
@@ -173,12 +184,12 @@ public class Core extends AbstractIdleService {
}
/**
- * Returns the currently active DCC receivers.
+ * Returns all currently running downloads.
*
- * @return The currently active DCC receivers
+ * @return All currently running downloads
*/
- public Collection dccReceivers() {
- return dccReceivers;
+ public Collection downloads() {
+ return downloads.values();
}
//
@@ -209,6 +220,25 @@ public class Core extends AbstractIdleService {
return;
}
+ /* check if we are already downloading the file? */
+ if (downloads.containsKey(pack.name())) {
+ Collection packDownloads = downloads.get(pack.name());
+ Collection runningDownloads = FluentIterable.from(packDownloads).filter(FILTER_RUNNING).toSet();
+ if (!runningDownloads.isEmpty()) {
+ Download download = runningDownloads.iterator().next();
+ eventBus.post(new GenericMessage(String.format("File %s is already downloading from %s (%s).", pack.name(), download.bot().name(), download.bot().network().name())));
+ return;
+ }
+ StringBuilder bots = new StringBuilder();
+ for (Download download : packDownloads) {
+ if (bots.length() > 0) {
+ bots.append(", ");
+ }
+ bots.append(download.bot().name()).append(" (").append(download.bot().network().name()).append(')');
+ }
+ eventBus.post(new GenericMessage(String.format("File %s is already requested from %d bots (%s).", pack.name(), packDownloads.size(), bots.toString())));
+ }
+
Download download = new Download(bot, pack);
downloads.put(pack.name(), download);
@@ -235,6 +265,31 @@ public class Core extends AbstractIdleService {
}
@Override
+ protected void run() throws Exception {
+ while (isRunning()) {
+ try {
+ Thread.sleep(TimeUnit.MINUTES.toMillis(1));
+ } catch (InterruptedException ie1) {
+ /* ignore. */
+ }
+
+ /* find channels that should be monitored but are not. */
+ for (Channel channel : channels) {
+ if (joinedChannels.contains(channel)) {
+ continue;
+ }
+
+ connectNetwork(channel.network());
+ Connection connection = networkConnections.get(channel.network());
+ if (connection.established()) {
+ eventBus.post(new GenericMessage(String.format("Trying to join %s on %s.", channel.name(), channel.network().name())));
+ connection.joinChannel(channel.name());
+ }
+ }
+ }
+ }
+
+ @Override
protected void shutDown() {
}
@@ -300,6 +355,45 @@ public class Core extends AbstractIdleService {
}
/**
+ * Remove all data stored for a network if the connection is closed.
+ *
+ * @param connectionClosed
+ * The connection closed event
+ */
+ @Subscribe
+ public void connectionClosed(ConnectionClosed connectionClosed) {
+ Optional network = getNetwork(connectionClosed.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ /* find all channels that need to be removed. */
+ for (Collection channels : ImmutableList.of(joinedChannels, extraChannels)) {
+ for (Iterator channelIterator = channels.iterator(); channelIterator.hasNext(); ) {
+ Channel joinedChannel = channelIterator.next();
+ if (!joinedChannel.network().equals(network.get())) {
+ continue;
+ }
+
+ channelIterator.remove();
+ }
+ }
+
+ /* now remove all bots for that network. */
+ Map bots = networkBots.row(network.get());
+ int botCount = bots.size();
+ int packCount = 0;
+ for (Bot bot : bots.values()) {
+ packCount += bot.packs().size();
+ }
+ bots.clear();
+ eventBus.post(new GenericMessage(String.format("Network %s disconnected, %d bots removed, %d packs removed.", network.get().name(), botCount, packCount)));
+
+ /* now remove the network. */
+ networkConnections.remove(network.get());
+ }
+
+ /**
* Shows a message when a channel was joined by us.
*
* @param channelJoined
@@ -440,7 +534,7 @@ public class Core extends AbstractIdleService {
Bot bot;
synchronized (networkBots) {
if (!networkBots.contains(network.get(), channelMessageReceived.source().nick().get())) {
- bot = new Bot(network.get()).name(channelMessageReceived.source().nick().get());
+ bot = new Bot(network.get(), channelMessageReceived.source().nick().get());
networkBots.put(network.get(), channelMessageReceived.source().nick().get(), bot);
eventBus.post(new BotAdded(bot));
} else {
@@ -465,24 +559,63 @@ public class Core extends AbstractIdleService {
}
/**
+ * Sends a message to all console when a notice was received.
+ *
+ * @param privateNoticeReceived
+ * The notice received event
+ */
+ @Subscribe
+ public void privateNoticeReceived(PrivateNoticeReceived privateNoticeReceived) {
+ Optional network = getNetwork(privateNoticeReceived.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.reply().source().get(), network.get(), privateNoticeReceived.text())));
+ }
+
+ /**
* Starts a DCC download.
*
* @param dccSendReceived
* The DCC SEND event
*/
@Subscribe
- public void dccSendReceived(DccSendReceived dccSendReceived) {
- Optional network = getNetwork(dccSendReceived.connection());
+ public void dccSendReceived(final DccSendReceived dccSendReceived) {
+ final Optional network = getNetwork(dccSendReceived.connection());
if (!network.isPresent()) {
return;
}
- Download download = downloads.get(dccSendReceived.filename());
- if (download == null) {
+ Collection packDownloads = downloads.get(dccSendReceived.filename());
+ if (packDownloads.isEmpty()) {
/* unknown download, ignore. */
return;
}
+ /* check if itâs already downloading. */
+ Collection runningDownloads = FluentIterable.from(packDownloads).filter(FILTER_RUNNING).toSet();
+ if (!runningDownloads.isEmpty()) {
+ eventBus.post(new GenericMessage(String.format("Ignoring offer for %s, itâs already being downloaded.", dccSendReceived.filename())));
+ return;
+ }
+
+ /* locate the correct download. */
+ Collection requestedDownload = FluentIterable.from(packDownloads).filter(new Predicate() {
+
+ @Override
+ public boolean apply(Download download) {
+ return download.bot().network().equals(network.get()) && download.bot().name().equalsIgnoreCase(dccSendReceived.source().nick().get());
+ }
+ }).toSet();
+
+ /* we did not request this download. */
+ if (requestedDownload.isEmpty()) {
+ return;
+ }
+
+ Download download = requestedDownload.iterator().next();
+
/* check if the file already exists. */
File outputFile = new File(temporaryDirectory, dccSendReceived.filename());
if (outputFile.exists()) {
@@ -498,7 +631,7 @@ public class Core extends AbstractIdleService {
}
/* remove download. */
- downloads.remove(download);
+ downloads.removeAll(download.pack().name());
return;
}
@@ -527,25 +660,48 @@ public class Core extends AbstractIdleService {
}
@Subscribe
- public void dccAcceptReceived(DccAcceptReceived dccAcceptReceived) {
- Optional network = getNetwork(dccAcceptReceived.connection());
+ public void dccAcceptReceived(final DccAcceptReceived dccAcceptReceived) {
+ final Optional network = getNetwork(dccAcceptReceived.connection());
if (!network.isPresent()) {
return;
}
- Download download = downloads.get(dccAcceptReceived.filename());
- if (download == null) {
+ Collection packDownloads = downloads.get(dccAcceptReceived.filename());
+ if (packDownloads.isEmpty()) {
/* unknown download, ignore. */
return;
}
+ /* check if itâs already downloading. */
+ Collection runningDownloads = FluentIterable.from(packDownloads).filter(FILTER_RUNNING).toSet();
+ if (!runningDownloads.isEmpty()) {
+ eventBus.post(new GenericMessage(String.format("Ignoring offer for %s, itâs already being downloaded.", dccAcceptReceived.filename())));
+ return;
+ }
+
+ /* locate the correct download. */
+ Collection requestedDownload = FluentIterable.from(packDownloads).filter(new Predicate() {
+
+ @Override
+ public boolean apply(Download download) {
+ return download.bot().network().equals(network.get()) && download.bot().name().equalsIgnoreCase(dccAcceptReceived.source().nick().get());
+ }
+ }).toSet();
+
+ /* we did not request this download. */
+ if (requestedDownload.isEmpty()) {
+ return;
+ }
+
+ Download download = requestedDownload.iterator().next();
+
try {
File outputFile = new File(temporaryDirectory, dccAcceptReceived.filename());
if (outputFile.length() != dccAcceptReceived.position()) {
eventBus.post(new GenericError(String.format("Download %s from %s does not start at the right position!")));
logger.log(Level.WARNING, String.format("Download %s from %s: have %d bytes but wants to resume from %d!", dccAcceptReceived.filename(), dccAcceptReceived.source(), outputFile.length(), dccAcceptReceived.position()));
- downloads.remove(download);
+ downloads.removeAll(download.pack().name());
return;
}
OutputStream outputStream = new FileOutputStream(outputFile, true);
@@ -567,11 +723,15 @@ public class Core extends AbstractIdleService {
*/
@Subscribe
public void dccDownloadFinished(DccDownloadFinished dccDownloadFinished) {
- Download download = downloads.get(dccDownloadFinished.dccReceiver().filename());
- if (download == null) {
- /* probably shouldnât happen. */
+
+ /* locate the correct download. */
+ Collection requestedDownload = FluentIterable.from(downloads.get(dccDownloadFinished.dccReceiver().filename())).filter(FILTER_RUNNING).toSet();
+ if (requestedDownload.isEmpty()) {
+ /* this seems wrong. */
+ logger.warning("Download finished but could not be located.");
return;
}
+ Download download = requestedDownload.iterator().next();
try {
download.outputStream().close();
@@ -579,7 +739,7 @@ public class Core extends AbstractIdleService {
file.renameTo(new File(finalDirectory, download.pack().name()));
eventBus.post(new DownloadFinished(download));
dccReceivers.remove(dccDownloadFinished.dccReceiver());
- downloads.remove(download);
+ downloads.removeAll(download.pack().name());
} catch (IOException ioe1) {
/* TODO - handle all the errors. */
logger.log(Level.WARNING, String.format("Could not move file %s to directory %s.", download.filename(), finalDirectory), ioe1);
@@ -594,17 +754,21 @@ public class Core extends AbstractIdleService {
*/
@Subscribe
public void dccDownloadFailed(DccDownloadFailed dccDownloadFailed) {
- Download download = downloads.get(dccDownloadFailed.dccReceiver().filename());
- if (download == null) {
- /* probably shouldnât happen. */
+
+ /* locate the correct download. */
+ Collection requestedDownload = FluentIterable.from(downloads.get(dccDownloadFailed.dccReceiver().filename())).filter(FILTER_RUNNING).toSet();
+ if (requestedDownload.isEmpty()) {
+ /* this seems wrong. */
+ logger.warning("Download finished but could not be located.");
return;
}
+ Download download = requestedDownload.iterator().next();
try {
Closeables.close(download.outputStream(), true);
eventBus.post(new DownloadFailed(download));
dccReceivers.remove(dccDownloadFailed.dccReceiver());
- downloads.remove(download);
+ downloads.removeAll(download.pack().name());
} catch (IOException ioe1) {
/* swallow silently. */
}