diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java index e7e25260b..c99494b24 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java +++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java @@ -127,7 +127,7 @@ public class I2PSnarkServlet extends HttpServlet { } } else if ( (newURL != null) && (newURL.trim().length() > "http://.i2p/".length()) ) { _manager.addMessage("Fetching " + newURL); - I2PThread fetch = new I2PThread(new FetchAndAdd(newURL), "Fetch and add"); + I2PThread fetch = new I2PThread(new FetchAndAdd(_manager, newURL), "Fetch and add"); fetch.start(); } else { // no file or URL specified @@ -267,56 +267,6 @@ public class I2PSnarkServlet extends HttpServlet { } } - private class FetchAndAdd implements Runnable { - private String _url; - public FetchAndAdd(String url) { - _url = url; - } - public void run() { - _url = _url.trim(); - File file = I2PSnarkUtil.instance().get(_url, false); - try { - if ( (file != null) && (file.exists()) && (file.length() > 0) ) { - _manager.addMessage("Torrent fetched from " + _url); - FileInputStream in = null; - try { - in = new FileInputStream(file); - MetaInfo info = new MetaInfo(in); - String name = info.getName(); - name = name.replace('/', '_'); - name = name.replace('\\', '_'); - name = name.replace('&', '+'); - name = name.replace('\'', '_'); - name = name.replace('"', '_'); - name = name.replace('`', '_'); - name = name + ".torrent"; - File torrentFile = new File(_manager.getDataDir(), name); - - String canonical = torrentFile.getCanonicalPath(); - - if (torrentFile.exists()) { - if (_manager.getTorrent(canonical) != null) - _manager.addMessage("Torrent already running: " + name); - else - _manager.addMessage("Torrent already in the queue: " + name); - } else { - FileUtil.copy(file.getAbsolutePath(), canonical, true); - _manager.addTorrent(canonical); - } - } catch (IOException ioe) { - _manager.addMessage("Torrent at " + _url + " was not valid: " + ioe.getMessage()); - } finally { - try { in.close(); } catch (IOException ioe) {} - } - } else { - _manager.addMessage("Torrent was not retrieved from " + _url); - } - } finally { - if (file != null) file.delete(); - } - } - } - private List getSortedSnarks(HttpServletRequest req) { Set files = _manager.listTorrentFiles(); TreeSet fileNames = new TreeSet(files); // sorts it alphabetically @@ -635,4 +585,57 @@ public class I2PSnarkServlet extends HttpServlet { private static final String TABLE_FOOTER = "\n"; private static final String FOOTER = ""; -} \ No newline at end of file +} + + +class FetchAndAdd implements Runnable { + private SnarkManager _manager; + private String _url; + public FetchAndAdd(SnarkManager mgr, String url) { + _manager = mgr; + _url = url; + } + public void run() { + _url = _url.trim(); + File file = I2PSnarkUtil.instance().get(_url, false); + try { + if ( (file != null) && (file.exists()) && (file.length() > 0) ) { + _manager.addMessage("Torrent fetched from " + _url); + FileInputStream in = null; + try { + in = new FileInputStream(file); + MetaInfo info = new MetaInfo(in); + String name = info.getName(); + name = name.replace('/', '_'); + name = name.replace('\\', '_'); + name = name.replace('&', '+'); + name = name.replace('\'', '_'); + name = name.replace('"', '_'); + name = name.replace('`', '_'); + name = name + ".torrent"; + File torrentFile = new File(_manager.getDataDir(), name); + + String canonical = torrentFile.getCanonicalPath(); + + if (torrentFile.exists()) { + if (_manager.getTorrent(canonical) != null) + _manager.addMessage("Torrent already running: " + name); + else + _manager.addMessage("Torrent already in the queue: " + name); + } else { + FileUtil.copy(file.getAbsolutePath(), canonical, true); + _manager.addTorrent(canonical); + } + } catch (IOException ioe) { + _manager.addMessage("Torrent at " + _url + " was not valid: " + ioe.getMessage()); + } finally { + try { in.close(); } catch (IOException ioe) {} + } + } else { + _manager.addMessage("Torrent was not retrieved from " + _url); + } + } finally { + if (file != null) file.delete(); + } + } +} diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 7b68e5b30..6d439f396 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.53 $ $Date: 2006/02/16 15:44:09 $"; - public final static String VERSION = "0.6.1.11"; + public final static String ID = "$Revision: 1.54 $ $Date: 2006/02/21 10:20:17 $"; + public final static String VERSION = "0.6.1.12"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index da3d25d89..ca31d712b 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,11 @@ -$Id: history.txt,v 1.420 2006/02/25 15:41:52 jrandom Exp $ +$Id: history.txt,v 1.421 2006/02/26 16:30:58 jrandom Exp $ + +* 2006-02-27 0.6.1.12 released + +2006-02-27 jrandom + * Adjust the jbigi.jar to use the athlon-optimized jbigi on windows/amd64 + machines, rather than the generic jbigi (until we have an athlon64 + optimized version) 2006-02-26 jrandom * Switch from the bouncycastle to the gnu-crypto implementation for diff --git a/initialNews.xml b/initialNews.xml index b29b64fb2..a1b90b812 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + - + • -2006-02-21: -0.6.1.11 released -with some critical SSU fixes - please upgrade as soon as possible. -
-• -2006-02-21: -0.6.1.9 and earlier users: Many network servers -(squid.i2p, dev.i2p, cvs.i2p, www.i2p, syndiemedia.i2p and others) -will be disconnected from the "old" network shortly. -Please upgrade to 0.6.1.11 as soon as possible. +2006-02-27: +0.6.1.12 released +with some useful SSU and peer selection fixes - please upgrade as soon as possible.
• 2006-02-21: diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index fb3d758a0..05b30a50f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.361 $ $Date: 2006/02/25 15:41:52 $"; - public final static String VERSION = "0.6.1.11"; - public final static long BUILD = 6; + public final static String ID = "$Revision: 1.362 $ $Date: 2006/02/26 16:30:57 $"; + public final static String VERSION = "0.6.1.12"; + public final static long BUILD = 0; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);