move hostname stuff to connect methods
[jFCPlib.git] / src / net / pterodactylus / fcp / highlevel / HighLevelClient.java
index d139ce2..5de3aa2 100644 (file)
@@ -85,6 +85,7 @@ import net.pterodactylus.fcp.TestDDAResponse;
 import net.pterodactylus.fcp.URIGenerated;
 import net.pterodactylus.fcp.UnknownNodeIdentifier;
 import net.pterodactylus.fcp.UnknownPeerNoteType;
+import net.pterodactylus.fcp.WatchGlobal;
 
 /**
  * A high-level client that allows simple yet full-featured access to a Freenet
@@ -104,12 +105,6 @@ public class HighLevelClient {
        /** The name of the client. */
        private final String clientName;
 
-       /** The address of the node. */
-       private InetAddress address;
-
-       /** The port number of the node. */
-       private int port;
-
        /** The FCP connection to the node. */
        private FcpConnection fcpConnection;
 
@@ -119,7 +114,10 @@ public class HighLevelClient {
        /** The listener for the connection. */
        private HighLevelClientFcpListener highLevelClientFcpListener = new HighLevelClientFcpListener();
 
-       /** The callback for {@link #connect()}. */
+       /** The listeners for progress events. */
+       private List<HighLevelProgressListener> highLevelProgressListeners = Collections.synchronizedList(new ArrayList<HighLevelProgressListener>());
+
+       /** The callback for {@link #connect(String)}. */
        private HighLevelCallback<ConnectResult> connectCallback;
 
        /** Mapping from request identifiers to callbacks. */
@@ -146,60 +144,9 @@ public class HighLevelClient {
         * 
         * @param clientName
         *            The name of the client
-        * @throws UnknownHostException
-        *             if the hostname of the node can not be resolved.
-        */
-       public HighLevelClient(String clientName) throws UnknownHostException {
-               this(clientName, "localhost");
-       }
-
-       /**
-        * Creates a new high-level client that connects to a node on the given
-        * host.
-        * 
-        * @param clientName
-        *            The name of the client
-        * @param host
-        *            The hostname of the node
-        * @throws UnknownHostException
-        *             if the hostname of the node can not be resolved.
-        */
-       public HighLevelClient(String clientName, String host) throws UnknownHostException {
-               this(clientName, host, FcpConnection.DEFAULT_PORT);
-       }
-
-       /**
-        * Creates a new high-level client that connects to a node on the given
-        * host.
-        * 
-        * @param clientName
-        *            The name of the client
-        * @param host
-        *            The hostname of the node
-        * @param port
-        *            The port number of the node
-        * @throws UnknownHostException
-        *             if the hostname of the node can not be resolved.
         */
-       public HighLevelClient(String clientName, String host, int port) throws UnknownHostException {
-               this(clientName, InetAddress.getByName(host), port);
-       }
-
-       /**
-        * Creates a new high-level client that connects to a node at the given
-        * address.
-        * 
-        * @param clientName
-        *            The name of the client
-        * @param address
-        *            The address of the node
-        * @param port
-        *            The port number of the node
-        */
-       public HighLevelClient(String clientName, InetAddress address, int port) {
+       public HighLevelClient(String clientName) {
                this.clientName = clientName;
-               this.address = address;
-               this.port = port;
        }
 
        //
@@ -248,6 +195,41 @@ public class HighLevelClient {
                }
        }
 
+       /**
+        * Adds a high-level progress listener.
+        * 
+        * @param highLevelProgressListener
+        *            The high-level progress listener to add
+        */
+       public void addHighLevelProgressListener(HighLevelProgressListener highLevelProgressListener) {
+               highLevelProgressListeners.add(highLevelProgressListener);
+       }
+
+       /**
+        * Removes a high-level progress listener.
+        * 
+        * @param highLevelProgressListener
+        *            The high-level progress listener to remove
+        */
+       public void removeHighLevelProgressListener(HighLevelProgressListener highLevelProgressListener) {
+               highLevelProgressListeners.remove(highLevelProgressListener);
+       }
+
+       /**
+        * Notifies all listeners that the request with the given identifier made
+        * some progress.
+        * 
+        * @param identifier
+        *            The identifier of the request
+        * @param highLevelProgress
+        *            The progress of the request
+        */
+       private void fireProgressReceived(String identifier, HighLevelProgress highLevelProgress) {
+               for (HighLevelProgressListener highLevelProgressListener: highLevelProgressListeners) {
+                       highLevelProgressListener.progressReceived(identifier, highLevelProgress);
+               }
+       }
+
        //
        // ACCESSORS
        //
@@ -263,6 +245,16 @@ public class HighLevelClient {
                return fcpConnection;
        }
 
+       /**
+        * Returns whether the node is connected.
+        * 
+        * @return <code>true</code> if the node is currently connected,
+        *         <code>false</code> otherwise
+        */
+       public boolean isConnected() {
+               return fcpConnection != null;
+       }
+
        //
        // ACTIONS
        //
@@ -270,11 +262,47 @@ public class HighLevelClient {
        /**
         * Connects the client.
         * 
+        * @param hostname
+        *            The hostname of the node
+        * @return A callback with a connection result
+        * @throws UnknownHostException
+        *             if the hostname can not be resolved
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        */
+       public HighLevelCallback<ConnectResult> connect(String hostname) throws UnknownHostException, IOException {
+               return connect(hostname, 9481);
+       }
+
+       /**
+        * Connects the client.
+        * 
+        * @param hostname
+        *            The hostname of the node
+        * @param port
+        *            The port number of the node
         * @return A callback with a connection result
+        * @throws UnknownHostException
+        *             if the hostname can not be resolved
         * @throws IOException
         *             if an I/O error occurs communicating with the node
         */
-       public HighLevelCallback<ConnectResult> connect() throws IOException {
+       public HighLevelCallback<ConnectResult> connect(String hostname, int port) throws UnknownHostException, IOException {
+               return connect(InetAddress.getByName(hostname), port);
+       }
+
+       /**
+        * Connects the client.
+        * 
+        * @param address
+        *            The address of the node
+        * @param port
+        *            The port number of the node
+        * @return A callback with a connection result
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        */
+       public HighLevelCallback<ConnectResult> connect(InetAddress address, int port) throws IOException {
                fcpConnection = new FcpConnection(address, port);
                fcpConnection.addFcpListener(highLevelClientFcpListener);
                fcpConnection.connect();
@@ -308,6 +336,21 @@ public class HighLevelClient {
        }
 
        /**
+        * Sets whether to watch the global queue.
+        * 
+        * @param enabled
+        *            <code>true</code> to watch the global queue in addition to
+        *            the client-local queue, <code>false</code> to only watch the
+        *            client-local queue
+        * @throws IOException
+        *             if an I/O error occurs communicating with the node
+        */
+       public void setWatchGlobal(boolean enabled) throws IOException {
+               WatchGlobal watchGlobal = new WatchGlobal(enabled);
+               fcpConnection.sendMessage(watchGlobal);
+       }
+
+       /**
         * Gets a list of all peers from the node.
         * 
         * @return A callback with the peer list
@@ -471,7 +514,10 @@ public class HighLevelClient {
         *            if there was no exception
         */
        private void disconnect(Throwable throwable) {
-               fcpConnection.close();
+               if (fcpConnection != null) {
+                       fcpConnection.close();
+               }
+               fcpConnection = null;
                fireClientDisconnected(throwable);
        }
 
@@ -1017,10 +1063,9 @@ public class HighLevelClient {
                                downloadResult.setFatallyFailedBlocks(simpleProgress.getFatallyFailed());
                                downloadResult.setTotalFinalized(simpleProgress.isFinalizedTotal());
                                downloadCallback.progressUpdated();
-                               return;
                        }
-                       /* unknown identifier? */
-                       logger.warning("unknown identifier for SimpleProgress: " + identifier);
+                       HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, simpleProgress.getTotal(), simpleProgress.getRequired(), simpleProgress.getSucceeded(), simpleProgress.getFailed(), simpleProgress.getFatallyFailed(), simpleProgress.isFinalizedTotal());
+                       fireProgressReceived(identifier, highLevelProgress);
                }
 
                /**