apps/addressbook/java/src/net/i2p/addressbook/CommandLine.java

+package net.i2p.addressbook;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import net.i2p.CoreVersion;
+
+/**
+ * Simple command line access to various utilities.
+ * Not a public API. Subject to change.
+ * Apps and plugins should use specific classes.
+ *
+ * @since 0.9.55
+ */
+public class CommandLine extends net.i2p.util.CommandLine {
+
+    protected static final List<String> ACLASSES = Arrays.asList(new String[] {
+        "net.i2p.addressbook.HostTxtParser",
+        "net.i2p.router.naming.BlockfileNamingService",
+        "net.metanotion.io.block.BlockFile",
+    });
+
+    protected CommandLine() {}
+
+    public static void main(String args[]) {
+        List<String> classes = new ArrayList<String>(ACLASSES.size() + CLASSES.size());
+        classes.addAll(ACLASSES);
+        classes.addAll(CLASSES);
+        if (args.length > 0) {
+            exec(args, classes);
+        }
+        usage(classes);
+        System.exit(1);
+    }
+
+    private static void usage(List<String> classes) {
+        System.err.println("I2P Address book version " + CoreVersion.VERSION + '\n' +
+                           "USAGE: java -jar /path/to/addressbook.jar command [args]");
+        printCommands(classes);
+    }
+}

apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java

+/*
+ * Copyright (c) 2004 Ragnarok
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.i2p.addressbook;
+
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.naming.NamingServiceUpdater;
+import net.i2p.util.I2PAppThread;
+
+/**
+ * A thread that waits five minutes, then runs the addressbook daemon.  
+ * 
+ * @author Ragnarok
+ *
+ */
+public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
+
+    private final String[] args;
+    private final Daemon daemon;
+
+    /**
+     * Construct a DaemonThread with the command line arguments args.
+     * @param args
+     * A String array to pass to Daemon.main().
+     */
+    public DaemonThread(String[] args) {
+        this.args = args;
+        daemon = new Daemon();
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Runnable#run()
+     */
+    @Override
+    public void run() {
+        //try {
+        //    Thread.sleep(5 * 60 * 1000);
+        //} catch (InterruptedException exp) {
+        //}
+        I2PAppContext.getGlobalContext().namingService().registerUpdater(this);
+        try {
+            if (args != null && args.length > 0 && args[0].equals("test"))
+                daemon.test(args);
+            else
+                daemon.run(args);
+        } finally {
+            I2PAppContext.getGlobalContext().namingService().unregisterUpdater(this);
+        }
+    }
+
+    public void halt() {
+        daemon.stop();
+        interrupt();
+    }
+
+    /**
+     *  The NamingServiceUpdater interface.
+     *  While this may be called directly, the recommended way
+     *  is to call I2PAppContext.namingService().requestUpdate(Properties)
+     *  which will call this.
+     *
+     *  @param options ignored, may be null
+     *  @since 0.8.7
+     */
+    public void update(Properties options) {
+        interrupt();
+    }
+}

apps/addressbook/java/src/net/i2p/addressbook/HostTxtIterator.java

+/*
+ * Copyright (c) 2004 Ragnarok
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.i2p.addressbook;
+
+import java.io.BufferedReader;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+import net.i2p.client.naming.HostTxtEntry;
+import net.i2p.data.DataHelper;
+
+/**
+ *  A class to iterate through a hosts.txt or config file without
+ *  reading the whole thing into memory.
+ *  Keys are always converted to lower case.
+ *
+ *  Callers should iterate all the way through or call close()
+ *  to ensure the underlying stream is closed.
+ *
+ *  This is not used for config files.
+ *  It is only used for subscriptions.
+ *
+ *  @since 0.8.7, renamed from ConfigIterator in 0.9.26
+ */
+class HostTxtIterator implements Iterator<Map.Entry<String, HostTxtEntry>>, Closeable {
+
+    private BufferedReader input;
+    private MapEntry next;
+
+    /**
+     *  A dummy iterator in which hasNext() is always false.
+     */
+    public HostTxtIterator() {}
+
+    /**
+     *  An iterator over the key/value pairs in the file.
+     */
+    public HostTxtIterator(File file) throws IOException {
+            FileInputStream fileStream = new FileInputStream(file);
+            input = new BufferedReader(new InputStreamReader(fileStream, "UTF-8"));
+    }
+
+    public boolean hasNext() {
+        if (input == null)
+            return false;
+        if (next != null)
+            return true;
+        try {
+            String inputLine;
+            while ((inputLine = input.readLine()) != null) {
+                HostTxtEntry he = HostTxtParser.parse(inputLine, true);
+                if (he == null)
+                    continue;
+                next = new MapEntry(he.getName(), he);
+                return true;
+            }
+        } catch (IOException ioe) {}
+        try { input.close(); } catch (IOException ioe) {}
+        input = null;
+        next = null;
+        return false;
+    }
+
+    /**
+     *  'remove' entries will be returned with a null key,
+     *  and the value will contain a null name, null dest,
+     *  and non-null props.
+     */
+    public Map.Entry<String, HostTxtEntry> next() {
+        if (!hasNext())
+            throw new NoSuchElementException();
+        Map.Entry<String, HostTxtEntry> rv = next;
+        next = null;
+        return rv;
+    }
+
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void close() {
+        if (input != null) {
+            try { input.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    /**
+     *  The object returned by the iterator.
+     */
+    private static class MapEntry implements Map.Entry<String, HostTxtEntry> {
+        private final String key;
+        private final HostTxtEntry value;
+
+        public MapEntry(String k, HostTxtEntry v) {
+            key = k;
+            value = v;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public HostTxtEntry getValue() {
+            return value;
+        }
+
+        public HostTxtEntry setValue(HostTxtEntry v) {
+            throw new UnsupportedOperationException();
+        }
+
+        public int hashCode() {
+            return key.hashCode() ^ value.hashCode();
+        }
+
+        public boolean equals(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            @SuppressWarnings("unchecked")
+            Map.Entry<Object, Object> e = (Map.Entry<Object, Object>) o;
+            return key.equals(e.getKey()) && value.equals(e.getValue());
+        }
+    }
+}

apps/addressbook/java/src/addressbook/Log.java → apps/addressbook/java/src/net/i2p/addressbook/Log.java

@@ -19,23 +19,27 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-package addressbook;
+package net.i2p.addressbook;
 
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.Date;
 
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataHelper;
+import net.i2p.util.SecureFileOutputStream;
+
 /**
  * A simple log with automatic time stamping.
  * 
  * @author Ragnarok
  *  
  */
-public class Log {
+class Log {
 
-    private File file;
+    private final File file;
 
     /**
      * Construct a Log instance that writes to the File file.
@@ -54,14 +58,17 @@ public class Log {
      *            A String containing a message to append to the log.
      */
     public void append(String entry) {
+        BufferedWriter bw = null;
         try {
-            BufferedWriter bw = new BufferedWriter(new FileWriter(this.file,
-                    true));
-            String timestamp = new Date().toString();
+            bw = new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(this.file,
+                    true), "UTF-8"));
+            String timestamp = DataHelper.formatTime(I2PAppContext.getGlobalContext().clock().now());
             bw.write(timestamp + " -- " + entry);
             bw.newLine();
-            bw.close();
         } catch (IOException exp) {
+        } finally {
+            if (bw != null)
+                try { bw.close(); } catch (IOException ioe) {}
         }
     }
 
@@ -70,7 +77,9 @@ public class Log {
      * 
      * @return The File that the log is writing to.
      */
+/****
     public File getFile() {
         return this.file;
     }
-}
\ No newline at end of file
+****/
+}

apps/addressbook/java/src/net/metanotion/Dummy.java

+package net.metanotion;
+
+/**  
+ * Exists only to enable package.html to be included in javadoc.
+ * http://java.sun.com/j2se/javadoc/faq/index.html#packagewithoutjavafiles
+ */
+abstract class Dummy {}