import net.pterodactylus.irc.ConnectionBuilder;
import net.pterodactylus.irc.DccReceiver;
import net.pterodactylus.irc.event.ChannelJoined;
+import net.pterodactylus.irc.event.ChannelLeft;
import net.pterodactylus.irc.event.ChannelMessageReceived;
import net.pterodactylus.irc.event.ConnectionEstablished;
+import net.pterodactylus.irc.event.DccDownloadFailed;
import net.pterodactylus.irc.event.DccDownloadFinished;
import net.pterodactylus.irc.event.DccSendReceived;
+import net.pterodactylus.irc.event.PrivateMessageReceived;
import net.pterodactylus.irc.util.MessageCleaner;
import net.pterodactylus.irc.util.RandomNickname;
import net.pterodactylus.xdcc.core.event.BotAdded;
import net.pterodactylus.xdcc.core.event.CoreStarted;
+import net.pterodactylus.xdcc.core.event.DownloadFailed;
import net.pterodactylus.xdcc.core.event.DownloadFinished;
import net.pterodactylus.xdcc.core.event.DownloadStarted;
+import net.pterodactylus.xdcc.core.event.GenericMessage;
+import net.pterodactylus.xdcc.core.event.MessageReceived;
import net.pterodactylus.xdcc.data.Bot;
import net.pterodactylus.xdcc.data.Channel;
import net.pterodactylus.xdcc.data.Download;
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.inject.Inject;
private final Map<String, Download> downloads = Maps.newHashMap();
/** The current DCC receivers. */
- private final Collection<DccReceiver> dccReceivers = Sets.newHashSet();
+ private final Collection<DccReceiver> dccReceivers = Lists.newArrayList();
/**
* Creates a new core.
}
/**
+ * Removes bots that leave a channel, or channels when it’s us that’s leaving.
+ *
+ * @param channelLeft
+ * The channel left event
+ */
+ @Subscribe
+ public void channelLeft(ChannelLeft channelLeft) {
+ Optional<Network> network = getNetwork(channelLeft.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ Bot bot = networkBots.get(network.get(), channelLeft.client().nick().get());
+ if (bot == null) {
+ /* maybe it was us? */
+ if (channelLeft.connection().isSource(channelLeft.client())) {
+ Optional<Channel> channel = getChannel(network.get(), channelLeft.channel());
+ if (!channel.isPresent()) {
+ /* maybe it was an extra channel? */
+ channel = getExtraChannel(network.get(), channelLeft.channel());
+ if (!channel.isPresent()) {
+ /* okay, whatever. */
+ return;
+ }
+
+ extraChannels.remove(channel);
+ } else {
+ channels.remove(channel.get());
+ }
+
+ eventBus.post(new GenericMessage(String.format("Left Channel %s on %s.", channel.get().name(), channel.get().network().name())));
+ }
+
+ return;
+ }
+
+ networkBots.remove(network.get(), channelLeft.client().nick().get());
+ }
+
+ /**
* If a message on a channel is received, it is parsed for pack information
* with is then added to a bot.
*
}
/**
+ * Forward all private messages to every console.
+ *
+ * @param privateMessageReceived
+ * The private message recevied event
+ */
+ @Subscribe
+ public void privateMessageReceived(PrivateMessageReceived privateMessageReceived) {
+ eventBus.post(new MessageReceived(privateMessageReceived.source(), privateMessageReceived.message()));
+ }
+
+ /**
* Starts a DCC download.
*
* @param dccSendReceived
try {
download.outputStream().close();
File file = new File(download.filename());
- file.renameTo(new File(finalDirectory, download.filename()));
+ file.renameTo(new File(finalDirectory, download.pack().name()));
eventBus.post(new DownloadFinished(download));
+ dccReceivers.remove(dccDownloadFinished.dccReceiver());
+ downloads.remove(download);
} 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);
}
}
+ /**
+ * Closes the output stream and notifies all listeners of the failure.
+ *
+ * @param dccDownloadFailed
+ * The DCC download failed event
+ */
+ @Subscribe
+ public void dccDownloadFailed(DccDownloadFailed dccDownloadFailed) {
+ Download download = downloads.get(dccDownloadFailed.dccReceiver().filename());
+ if (download == null) {
+ /* probably shouldn’t happen. */
+ return;
+ }
+
+ try {
+ Closeables.close(download.outputStream(), true);
+ eventBus.post(new DownloadFailed(download));
+ dccReceivers.remove(dccDownloadFailed.dccReceiver());
+ downloads.remove(download);
+ } catch (IOException ioe1) {
+ /* swallow silently. */
+ }
+ }
+
//
// PRIVATE METHODS
//
*/
public Optional<Channel> getChannel(Network network, String channelName) {
for (Channel channel : channels) {
- if (channel.network().equals(network) && (channel.name().equals(channelName))) {
+ if (channel.network().equals(network) && (channel.name().equalsIgnoreCase(channelName))) {
+ return Optional.of(channel);
+ }
+ }
+ return Optional.absent();
+ }
+
+ /**
+ * Returns the extra channel for the given network and name.
+ *
+ * @param network
+ * The network the channel is located on
+ * @param channelName
+ * The name of the channel
+ * @return The extra channel, or {@link Optional#absent()} if no extra channel
+ * matching the given network and name was found
+ */
+ public Optional<Channel> getExtraChannel(Network network, String channelName) {
+ for (Channel channel : extraChannels) {
+ if (channel.network().equals(network) && (channel.name().equalsIgnoreCase(channelName))) {
return Optional.of(channel);
}
}
projects / xudocci.git / blobdiff