package net.pterodactylus.xdcc.core;
import static java.lang.String.format;
+import static java.util.stream.Collectors.toSet;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.inviteOnly;
import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.time.Duration;
+import java.time.Instant;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
/** The logger. */
private static final Logger logger = Logger.getLogger(Core.class.getName());
+ private final Instant startup = Instant.now();
private final Object syncObject = new Object();
/** The event bus. */
private final EventBus eventBus;
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(),
+ Connection connection = entry.getValue();
+ return new ConnectedNetwork(network, connection.hostname(),
+ connection.port(),
+ connection.getUptime().orElse(Duration.ofSeconds(0)),
+ connection.nickname(),
channels.stream()
.filter((channel) -> channel.network()
.equals(network))
return downloads.values();
}
+ public Duration getUptime() {
+ return Duration.between(startup, Instant.now());
+ }
+
//
// ACTIONS
//
return;
}
- /* get connection. */
- Connection connection = networkConnections.get(bot.network());
- if (connection == null) {
- /* request for unknown network? */
- return;
- }
-
/* stop the DCC receiver. */
if (download.get().dccReceiver() != null) {
download.get().dccReceiver().stop();
downloads.remove(pack.name(), download.get());
}
+ /* get connection. */
+ Connection connection = networkConnections.get(bot.network());
+ if (connection == null) {
+ /* request for unknown network? */
+ return;
+ }
+
/* remove the request from the bot, too. */
try {
connection.sendMessage(bot.name(), String.format("XDCC %s", (download.get().dccReceiver() != null) ? "CANCEL" : "REMOVE"));
.map(Channel::network)
.distinct()
.filter((network) -> !networkConnections.containsKey(network))
- .collect(Collectors.toSet());
+ .collect(toSet());
if (missingNetworks.isEmpty()) {
if (!missingChannels.isEmpty()) {
}
Map<Long, Network> timesForNextConnects = new TreeMap<>(missingNetworks.stream()
- .collect(Collectors.toMap(connectionBackoff::getBackoff, Function.identity(), (network, ignore) -> network)));
+ .collect(Collectors.toMap(connectionBackoff::getConnectionTime, Function.identity(), (network, ignore) -> network)));
Optional<Entry<Long, Network>> firstNetwork = Optional.fromNullable(timesForNextConnects.entrySet().stream().findFirst().orElse(null));
if (!firstNetwork.isPresent()) {
continue;
}
- if (firstNetwork.get().getKey() > 0) {
- eventBus.post(new GenericMessage(String.format("Waiting %d minutes to connect to %s...", TimeUnit.MILLISECONDS.toMinutes(firstNetwork.get().getKey()), firstNetwork.get().getValue().name())));
+ if (firstNetwork.get().getKey() > System.currentTimeMillis()) {
+ eventBus.post(new GenericMessage(String.format("Will connect to %2$s at %1$tH:%1$tM...", firstNetwork.get().getKey(), firstNetwork.get().getValue().name())));
synchronized (syncObject) {
try {
- syncObject.wait(firstNetwork.get().getKey());
+ syncObject.wait(firstNetwork.get().getKey() - System.currentTimeMillis());
} catch (InterruptedException ie1) {
/* ignore. */
}
if (!isRunning()) {
break;
}
+ if (firstNetwork.get().getKey() > System.currentTimeMillis()) {
+ continue;
+ }
}
connectNetwork(firstNetwork.get().getValue());
* The connection to remove
*/
private void removeConnection(Connection connection) {
+ logger.debug(String.format("Removing Connection %s...", connection));
Optional<Network> network = getNetwork(connection);
if (!network.isPresent()) {
+ logger.debug(String.format("Connection %s did not belong to any network.", connection));
return;
}
+ logger.debug(String.format("Connection %s belongs to network %s.", connection, network.get()));
networkConnections.remove(network.get());
- if (!connection.established()) {
- return;
- }
/* find all channels that need to be removed. */
for (Collection<Channel> channels : ImmutableList.of(joinedChannels, extraChannels)) {
if (!joinedChannel.network().equals(network.get())) {
continue;
}
-
+ logger.debug(String.format("Channel %s will be removed.", joinedChannel));
channelIterator.remove();
}
}
.values().stream()
.filter(bot -> bot.channel()
.equalsIgnoreCase(channel.get().name()))
- .collect(Collectors.toSet());
+ .collect(toSet());
botsToRemove.stream()
.forEach(bot -> networkBots.row(network.get())
.remove(bot.name()));
+ channelBanManager.ban(channel.get());
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() == inviteOnly) {
- channelBanManager.ban(channel.get());
+ format("%s requires nickname registration, suspending join for a day.",
+ channel.get())));
+ } else if (channelNotJoined.reason() == inviteOnly) {
eventBus.post(new GenericMessage(
format("%s is invite-only, suspending join for a day.",
channel.get())));
- return;
- }
- if (channelNotJoined.reason() == banned) {
- channelBanManager.ban(channel.get());
+ } else if (channelNotJoined.reason() == banned) {
eventBus.post(new GenericMessage(
format("Banned from %s, suspending join for a day.",
channel.get())));
- return;
+ } else {
+ eventBus.post(new GenericMessage(
+ format("Could not join %s: %s", channelNotJoined.channel(),
+ channelNotJoined.reason())));
}
-
- eventBus.post(new GenericMessage(
- format("Could not join %s: %s", channelNotJoined.channel(),
- channelNotJoined.reason())));
}
/**
"Kicked from %s by %s: %s",
kickedFromChannel.channel(),
kickedFromChannel.kicker(),
- kickedFromChannel.reason().or("<unknown>")
+ kickedFromChannel.reason().orElse("<unknown>")
)));
}
}
return;
}
- Collection<Download> packDownloads = downloads.get(dccSendReceived.filename());
- if (packDownloads.isEmpty()) {
- /* unknown download, ignore. */
- return;
- }
+ Set<Download> openDownloads = downloads.values().stream()
+ .filter(download -> download.bot().name().equalsIgnoreCase(dccSendReceived.source().nick().orNull()))
+ .filter(download -> download.dccReceiver() == null)
+ .collect(toSet());
- /* check if it’s already downloading. */
- Collection<Download> 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())));
+ if (openDownloads.isEmpty()) {
+ /* I don't think we requested this. */
+ eventBus.post(new GenericMessage(format("Ignoring offer for %s, no open download from %s.", dccSendReceived.filename(), dccSendReceived.source())));
return;
}
- /* locate the correct download. */
- Collection<Download> requestedDownload = FluentIterable.from(packDownloads).filter(new Predicate<Download>() {
-
- @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()) {
+ /* check if it’s already downloading. */
+ if (downloads.values().stream().anyMatch(download -> download.filename().equals(dccSendReceived.filename()) && download.dccReceiver() != null)) {
+ eventBus.post(new GenericMessage(format("Ignoring offer for %s, it’s already being downloaded.", dccSendReceived.filename())));
return;
}
- Download download = requestedDownload.iterator().next();
+ Download download = openDownloads.stream()
+ .filter(it -> it.filename().equals(dccSendReceived.filename()))
+ .findFirst()
+ .orElse(openDownloads.iterator().next());
+ eventBus.post(new GenericMessage(format("Downloading %s from %s as %s.", dccSendReceived.filename(), dccSendReceived.source(), download.filename())));
/* check if the file already exists. */
File outputFile = new File(temporaryDirectory, dccSendReceived.filename());
projects / xudocci.git / blobdiff