package net.pterodactylus.xdcc.core;
+import static java.lang.String.format;
import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
import static net.pterodactylus.xdcc.data.Download.FILTER_RUNNING;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import net.pterodactylus.irc.Connection;
import net.pterodactylus.irc.ConnectionBuilder;
import net.pterodactylus.irc.event.ChannelJoined;
import net.pterodactylus.irc.event.ChannelLeft;
import net.pterodactylus.irc.event.ChannelMessageReceived;
+import net.pterodactylus.irc.event.ChannelNotJoined;
import net.pterodactylus.irc.event.ClientQuit;
import net.pterodactylus.irc.event.ConnectionClosed;
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.KickedFromChannel;
import net.pterodactylus.irc.event.NicknameChanged;
import net.pterodactylus.irc.event.PrivateMessageReceived;
import net.pterodactylus.irc.event.PrivateNoticeReceived;
import com.google.common.io.Closeables;
import com.google.common.util.concurrent.AbstractExecutionThreadService;
import com.google.inject.Inject;
+import org.apache.log4j.Logger;
/**
* The core of XDCC Downloader.
try {
connection.sendMessage(bot.name(), "XDCC SEND " + pack.id());
} catch (IOException ioe1) {
- logger.log(Level.WARNING, "Could not send message to bot!", ioe1);
+ logger.warn("Could not send message to bot!", ioe1);
}
}
try {
connection.sendMessage(bot.name(), String.format("XDCC %s", (download.get().dccReceiver() != null) ? "CANCEL" : "REMOVE"));
} catch (IOException ioe1) {
- logger.log(Level.WARNING, String.format("Could not cancel DCC from %s (%s)!", bot.name(), bot.network().name()), ioe1);
+ logger.warn(String.format("Could not cancel DCC from %s (%s)!", bot.name(), bot.network().name()), ioe1);
}
}
eventBus.post(new GenericMessage(String.format("Trying to join %s on %s...", channel.name(), network.get().name())));
connectionEstablished.connection().joinChannel(channel.name());
} catch (IOException ioe1) {
- logger.log(Level.WARNING, String.format("Could not join %s on %s!", channel.name(), network.get().name()), ioe1);
+ logger.warn(String.format("Could not join %s on %s!", channel.name(), network.get().name()), ioe1);
}
}
}
}
}
+ @Subscribe
+ public void channelNotJoined(ChannelNotJoined channelNotJoined) {
+ Optional<Network> network = getNetwork(channelNotJoined.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ eventBus.post(new GenericMessage(
+ format("Could not join %s/%s: %s", channelNotJoined.channel(),
+ network.get(), channelNotJoined.reason())));
+ }
+
/**
* Removes bots that leave a channel, or channels when it’s us that’s leaving.
*
networkBots.remove(network.get(), channelLeft.client().nick().get());
}
+ @Subscribe
+ public void kickedFromChannel(KickedFromChannel kickedFromChannel) {
+ Optional<Network> network = getNetwork(kickedFromChannel.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ /* have we been kicked? */
+ if (nicknameMatchesConnection(kickedFromChannel.connection(), kickedFromChannel.kickee())) {
+ Optional<Channel> channel = getChannel(network.get(), kickedFromChannel.channel());
+ if (!channel.isPresent()) {
+ /* maybe it was an extra channel? */
+ channel = getExtraChannel(network.get(), kickedFromChannel.channel());
+ if (!channel.isPresent()) {
+ /* okay, whatever. */
+ return;
+ }
+
+ extraChannels.remove(channel);
+ } else {
+ channels.remove(channel.get());
+ }
+ eventBus.post(new GenericMessage(format(
+ "Kicked from %s/%s by %s: %s",
+ kickedFromChannel.channel(), network.get(),
+ kickedFromChannel.kicker(),
+ kickedFromChannel.reason().or("<unknown>")
+ )));
+ }
+ }
+
+ private boolean nicknameMatchesConnection(Connection connection, String nickname) {
+ return connection.nickname().equalsIgnoreCase(nickname);
+ }
+
/**
* Removes a client (which may be a bot) from the table of known bots.
*
/* add pack. */
bot.addPack(pack.get());
- logger.fine(String.format("Bot %s now has %d packs.", bot, bot.packs().size()));
+ logger.debug(String.format("Bot %s now has %d packs.", bot, bot.packs().size()));
}
/**
return;
}
- eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.reply().source().get(), network.get(), privateNoticeReceived.text())));
+ eventBus.post(new GenericMessage(String.format("Notice from %s (%s): %s", privateNoticeReceived.source(), network.get(), privateNoticeReceived.text())));
}
/**
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()));
+ logger.warn(String.format("Download %s from %s: have %d bytes but wants to resume from %d!", dccAcceptReceived.filename(), dccAcceptReceived.source(), outputFile.length(), dccAcceptReceived.position()));
downloads.removeAll(download.pack().name());
return;
Collection<Download> 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.");
+ logger.warn("Download finished but could not be located.");
return;
}
Download download = requestedDownload.iterator().next();
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);
+ logger.warn(String.format("Could not move file %s to directory %s.", download.filename(), finalDirectory), ioe1);
}
}
Collection<Download> 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.");
+ logger.warn("Download finished but could not be located.");
return;
}
Download download = requestedDownload.iterator().next();
@Subscribe
public void replyReceived(ReplyReceived replyReceived) {
- logger.log(Level.FINEST, String.format("%s: %s", replyReceived.connection().hostname(), replyReceived.reply()));
+ logger.trace(String.format("%s: %s", replyReceived.connection().hostname(), replyReceived.reply()));
}
//