package net.pterodactylus.xdcc.core;
+import static java.lang.String.format;
+import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
+import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
+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 java.util.stream.Collectors;
import net.pterodactylus.irc.Connection;
-import net.pterodactylus.irc.ConnectionBuilder;
+import net.pterodactylus.irc.ConnectionFactory;
import net.pterodactylus.irc.DccReceiver;
+import net.pterodactylus.irc.DefaultConnection;
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 net.pterodactylus.irc.event.ReplyReceived;
-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.MessageReceived;
import net.pterodactylus.xdcc.data.Bot;
import net.pterodactylus.xdcc.data.Channel;
+import net.pterodactylus.xdcc.data.ConnectedNetwork;
import net.pterodactylus.xdcc.data.Download;
import net.pterodactylus.xdcc.data.Network;
import net.pterodactylus.xdcc.data.Pack;
import net.pterodactylus.xdcc.data.Server;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
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.
/** The logger. */
private static final Logger logger = Logger.getLogger(Core.class.getName());
+ private final Object syncObject = new Object();
/** The event bus. */
private final EventBus eventBus;
+ private final ConnectionFactory connectionFactory;
+ private final ChannelBanManager channelBanManager =
+ new ChannelBanManager();
/** The temporary directory to download files to. */
private final String temporaryDirectory;
* The directory to move finished files to
*/
@Inject
- public Core(EventBus eventBus, String temporaryDirectory, String finalDirectory) {
+ public Core(EventBus eventBus, ConnectionFactory connectionFactory, String temporaryDirectory, String finalDirectory) {
this.eventBus = eventBus;
+ this.connectionFactory = connectionFactory;
this.temporaryDirectory = temporaryDirectory;
this.finalDirectory = finalDirectory;
}
*
* @return All connected networks
*/
- public Collection<Network> connectedNetworks() {
- return Lists.newArrayList(Optional.presentInstances(FluentIterable.from(networkConnections.values()).transform(new Function<Connection, Optional<Network>>() {
- @Override
- public Optional<Network> apply(Connection connection) {
- return getNetwork(connection);
- }
- })));
+ public Collection<ConnectedNetwork> connectedNetworks() {
+ return networkConnections.entrySet().stream().map((entry) -> {
+ Network network = entry.getKey();
+ Collection<Bot> bots = networkBots.row(network).values();
+ int packCount = bots.stream().mapToInt((bot) -> bot.packs().size()).reduce((a, b) -> a + b).orElse(0);
+ return new ConnectedNetwork(network, entry.getValue().hostname(),
+ entry.getValue().port(), entry.getValue().nickname(),
+ channels.stream()
+ .filter((channel) -> channel.network()
+ .equals(network))
+ .map(Channel::name)
+ .collect(Collectors.<String>toList()),
+ extraChannels.stream()
+ .filter((channel) -> channel.network()
+ .equals(network))
+ .map(Channel::name)
+ .collect(Collectors.<String>toList()),
+ bots.size(), packCount);
+ }).collect(Collectors.<ConnectedNetwork>toList());
}
/**
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);
}
}
@Override
protected void run() throws Exception {
while (isRunning()) {
- try {
- Thread.sleep(TimeUnit.MINUTES.toMillis(1));
- } catch (InterruptedException ie1) {
- /* ignore. */
+ synchronized (syncObject) {
+ try {
+ syncObject.wait(TimeUnit.MINUTES.toMillis(1));
+ } catch (InterruptedException ie1) {
+ /* ignore. */
+ }
+ }
+ if (!isRunning()) {
+ break;
}
/* find channels that should be monitored but are not. */
continue;
}
+ /* are we banned from this channel? */
+ if (channelBanManager.isBanned(channel)) {
+ continue;
+ }
+
connectNetwork(channel.network());
Connection connection = networkConnections.get(channel.network());
if (connection.established()) {
}
@Override
- protected void shutDown() {
+ protected void triggerShutdown() {
+ synchronized (syncObject) {
+ syncObject.notifyAll();
+ }
}
//
return;
}
Server server = servers.get((int) (Math.random() * servers.size()));
- Connection connection = new ConnectionBuilder(eventBus).connect(server.hostname()).port(server.unencryptedPorts().iterator().next()).build();
+ Connection connection = connectionFactory.createConnection(server.hostname(),
+ server.unencryptedPorts().iterator().next());
connection.username(RandomNickname.get()).realName(RandomNickname.get());
networkConnections.put(network, connection);
- connection.start();
+ connection.open();
}
}
if (!network.isPresent()) {
return;
}
+ if (!connection.established()) {
+ return;
+ }
/* find all channels that need to be removed. */
for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
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);
}
}
}
* @param connectionFailed
* The connection failed event
*/
+ @Subscribe
public void connectionFailed(ConnectionFailed connectionFailed) {
removeConnection(connectionFailed.connection());
}
return;
}
+ channelBanManager.unban(channel.get());
joinedChannels.add(channel.get());
logger.info(String.format("Joined Channel %s on %s.", channelJoined.channel(), network.get().name()));
}
}
+ @Subscribe
+ public void channelNotJoined(ChannelNotJoined channelNotJoined) {
+ Optional<Network> network = getNetwork(channelNotJoined.connection());
+ if (!network.isPresent()) {
+ return;
+ }
+
+ Optional<Channel> channel = getChannel(network.get(), channelNotJoined.channel());
+ if (!channel.isPresent()) {
+ eventBus.post(new GenericMessage(format("Could not join %s but didn’t try to join, either.", channel.get())));
+ return;
+ }
+
+ /* remove all bots for this channel, we might have been kicked. */
+ Collection<Bot> botsToRemove = networkBots.row(network.get())
+ .values().stream()
+ .filter(bot -> bot.channel()
+ .equalsIgnoreCase(channel.get().name()))
+ .collect(Collectors.toSet());
+ botsToRemove.stream()
+ .forEach(bot -> networkBots.row(network.get())
+ .remove(bot.name()));
+
+ if (channelNotJoined.reason() == registeredNicknamesOnly) {
+ channels.remove(channel.get());
+ eventBus.post(new GenericMessage(
+ format("Not trying to join %s anymore.", channel.get())));
+ return;
+ }
+ if (channelNotJoined.reason() == banned) {
+ channelBanManager.ban(channel.get());
+ eventBus.post(new GenericMessage(
+ format("Banned from %s, suspending join for a day.",
+ channel.get())));
+ return;
+ }
+
+ eventBus.post(new GenericMessage(
+ format("Could not join %s: %s", channelNotJoined.channel(),
+ 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.get());
+ } else {
+ joinedChannels.remove(channel.get());
+ }
+ eventBus.post(new GenericMessage(format(
+ "Kicked from %s by %s: %s",
+ kickedFromChannel.channel(),
+ 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.
*
*/
@Subscribe
public void channelMessageReceived(ChannelMessageReceived channelMessageReceived) {
- String message = MessageCleaner.getDefaultInstance().clean(channelMessageReceived.message());
+ String message = getDefaultInstance().clean(channelMessageReceived.message());
if (!message.startsWith("#")) {
/* most probably not a pack announcement. */
return;
Bot bot;
synchronized (networkBots) {
if (!networkBots.contains(network.get(), channelMessageReceived.source().nick().get())) {
- bot = new Bot(network.get(), channelMessageReceived.source().nick().get());
+ bot = new Bot(network.get(), channelMessageReceived.channel(),
+ channelMessageReceived.source().nick().get());
networkBots.put(network.get(), channelMessageReceived.source().nick().get(), bot);
eventBus.post(new BotAdded(bot));
} else {
/* 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()));
}
//
projects / xudocci.git / blobdiff