* i2psnark:

- Check for dup magnet torrent when adding torrent file - Add exotrack.i2p (ticket #403) - Disable spellcheck in textarea
2011-02-07 19:27:55 +00:00
parent 86e663b2b4
commit 6c1f5dd5a9
5 changed files with 28 additions and 5 deletions
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@ -525,13 +525,13 @@ public class SnarkManager implements Snark.CompleteListener {
     *  Caller must verify this torrent is not already added.
     *  @throws RuntimeException via Snark.fatal()
     */
-    public void addTorrent(String filename) { addTorrent(filename, false); }
+    private void addTorrent(String filename) { addTorrent(filename, false); }

    /**
     *  Caller must verify this torrent is not already added.
     *  @throws RuntimeException via Snark.fatal()
     */
-    public void addTorrent(String filename, boolean dontAutoStart) {
+    private void addTorrent(String filename, boolean dontAutoStart) {
        if ((!dontAutoStart) && !_util.connected()) {
            addMessage(_("Connecting to I2P"));
            boolean ok = _util.connect();
@ -578,6 +578,15 @@ public class SnarkManager implements Snark.CompleteListener {
                        fis = null;
                    } catch (IOException e) {}
                    
+                    // This test may be a duplicate, but not if we were called
+                    // from the DirMonitor, which only checks for dup torrent file names.
+                    Snark snark = getTorrentByInfoHash(info.getInfoHash());
+                    if (snark != null) {
+                        // TODO - if the existing one is a magnet, delete it and add the metainfo instead?
+                        addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName()));
+                        return;
+                    }
+
                    if (!TrackerClient.isValidAnnounce(info.getAnnounce())) {
                        if (_util.shouldUseOpenTrackers() && _util.getOpenTrackers() != null) {
                            addMessage(_("Warning - No I2P trackers in \"{0}\", will announce to I2P open trackers and DHT only.", info.getName()));
@ -1180,6 +1189,9 @@ public class SnarkManager implements Snark.CompleteListener {
        }
    }

+    /**
+     *  caller must synchronize on _snarks
+     */
    private void monitorTorrents(File dir) {
        String fileNames[] = dir.list(TorrentFilenameFilter.instance());
        List<String> foundNames = new ArrayList(0);
@ -1261,6 +1273,7 @@ public class SnarkManager implements Snark.CompleteListener {
       "Postman", "http://tracker2.postman.i2p/announce.php=http://tracker2.postman.i2p/"
       ,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
 //       , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
+       ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
    };
    
    /** comma delimited list of name=announceURL=baseURL for the trackers to be displayed */
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@ -1381,7 +1381,7 @@ public class I2PSnarkServlet extends Default {
        }
        out.write("<tr><td>");
        out.write(_("I2CP options"));
-        out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" >"
+        out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" spellcheck=\"false\" >"
                  + opts.toString() + "</textarea><br>\n");

        out.write("<tr><td>&nbsp;<td><input type=\"submit\" value=\"");
@ -1833,7 +1833,8 @@ public class I2PSnarkServlet extends Default {
            icon = "html";
        else if (mime.equals("text/plain") || plc.endsWith(".nfo"))
            icon = "page";
-        else if (mime.equals("application/java-archive") || plc.endsWith(".war"))
+        else if (mime.equals("application/java-archive") || plc.endsWith(".war") ||
+                 plc.endsWith(".deb"))
            icon = "package";
        else if (plc.endsWith(".xpi2p"))
            icon = "plugin";
--- a/history.txt
+++ b/history.txt
@ -1,3 +1,11 @@
+2011-02-07 zzz
+    * i2psnark:
+      - Check for dup magnet torrent when adding torrent file
+      - Add exotrack.i2p (ticket #403)
+      - Disable spellcheck in textarea
+    * i2ptunnel: Generate error message when i2ptunnel.config save fails
+                 (ticket #404)
+
 2011-02-06 zzz
    * i2psnark: Fix maggot links, and magnet links with trailing parameters (thx user)

--- a/installer/resources/hosts.txt
+++ b/installer/resources/hosts.txt
@ -325,3 +325,4 @@ i2plugins.i2p=7oQz2gHOxFXxXTI6uGMk1Giv9UmviBhbubWKDjDqW1Rxvmm55tvC1znaAAZoV0X6YP
 i2pbote.i2p=~taSfBfeiMM5fW~qwUGZr4kAXmSoentWVjlQhTCKWhVj04KV34tLguNQEpHb1cA2eIwlkTpY0TPYUVKt866jLgQEteuIImmNuStVgm6DWh4baPqI22oSNC7O-4EW6PJy1tT9nr1NXu5p4w2jY4P4Css76xthaf6Z5YUOWAIwnMlptyac-qFHmjmU3CFqvKQgBnA4NB0ts7Y2~TcvciANllfsjfsMgFdg--FYpKiwC8bSsTHKJ3~oGb6osMqql~Vzr6kvIzfLnvabbuW8wjG2JvATBuJ3IY-BN59KdT84nc00SuMgmt1ywVvHOl0~n8Cjr1hASYiJ2FTxEQRbQ9WRaxbnk5BO~yeiedCsjw7ImsSES3GzcU5zVVx9p3bgx7P~X0h52VripL6bovj9YJznN3qw0eRCJGjY-du8azFNV6~6ZZ6ss14RNC~HKIzlhR7F5kF~4H2wfC1EdNlmm1cI0iYRdEdwSSVX47LngHyK-ZQbVZOGeEeCU8J8Vhk~8WdLAAAA
 planet.i2p=W0omtMApOdlTkgJoct08QnzDkeb~xc60df5Cx3k3qqOFmyEkRB65NdpSdvldI5STmXmXlZe68f8Hu1dfBMmKvfpBFMpP-mRVYuHbEa4N1dRkp3AOswZFO51lSC~MVPMZKGHAv0cfv5WFaJ9nfuaR7iYYWJF11xotoPTMbJdB-I3XPC8rxHI-73ATlOD4cU9oZ6BYcBE0dun9zw4IHBcRpnFRx~s-TkevNfPnBqujB-NNgA8a5s~QUj0h3FwwUWsNB8f1Uwy~DwoQh7pMp6dsZ3umEyBn2HaXZasSmbzB30qkQRs9vrAtIFdIzCQ~8gI2cHdHEPgExUQX~xlM8QZEgnLXSfS93asWPdpitv~KT7bO-35BgTBdCozHTCcvys6bYJ24UnkFVBE0D2L0t98neelWkJSaEU0QzxdRphoCZY8OABQIaS4qw6PEFD1Un1vxNCh~TDFWcYBZ3Rqsc~ISW0wF7oOS6-DPT3q5O8cGLc8iAEdRchrU9XyAHAKVlEZxAAAA
 outproxy2.h2ik.i2p=zjXqVu1pnPpsR0DnqiIlAidy8GSLznEupTrb~vUg-NELU3~Gmbqc-soJlYu69VyQdZxVGNZ1PsgacjJwxtd8otZ~lgqsJV2aDJdzDIClEj9hYM4hV4ClHdZQnEOEHj1fc5TK7n31o3jr94kz6ZtdG9eL7F~YIE7EcADJ7ECg-wz05~xj8NK4gH67mMSCHgX92RTQRTGFtxxrPkVRLD8GE069wGmRpV9xt3wZqn12ijdo1HjNMbqxZfSbulscm0M2~qy4fwzF1OYWSg5-~NY02iNygwKYhG2CdgDyFALVGvHfJ-wzZ~pKj62-c8HVg1qHE6B1bKKO5GID03JoRAlEeZFkrqqmUQyQvzxhlUJlcnaBOaCoIm9L8999cHQj7-JHJTTvJ2TltvSbj1TcyoIFEdSyW22TJGRMoopezPoCERhemy79cb~SvsK46m4J7hBDjQl7Rgzp-uC5aSMEN3PU2g1w5A3DWxodUy2Zzg~moJaKbeS8Vf~mLVEt63djlFMxAAAA
+exotrack.i2p=Ly1vs4plBuGisqlMiQOjhVkXFZPBMy9joSCrus~tuLXBRXDrPYG9WXJMzY4gb3LiW0VVawv0kLgikX8eeeruXmgKwQW5zB9UPSP0CQnXTRelE3Jn7lev~re4woHvgS-EGBwWikxqXF3f7W8-LhieI0JhBZxItiWhJJME07oncW0kgS8UIMl0wqN2Y-p0sryFCN056TfGNTXigfxrSLqKnpi6a2OyEkF62qvRID3qXzRque0vKQjqvavq2mqxjFrSgLUoyKod5h9Px6qK08gtoAyDKMLPk7fPgReYKj6awiOxRSGfsMpZD3~ZuV0Sts2XtCau3S3myYMIDe5oKziPtZRIej4KBDxT0YYIw5v4RoqzqF88gNgHDfkPZ25JKTOt5xGcPTG8kwYrtx39PX6NrJmv-I~LUz6sZZlIW24k1qbO7zBxZ6mazldQY1~FJGXzn5MNzsxp44iOZdMDJJh18N0Psthk2hqlQOS4L0Ss1Odm1czhBxf1Y~j3L-QsMttcAAAA
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@ -18,7 +18,7 @@ public class RouterVersion {
    /** deprecated */
    public final static String ID = "Monotone";
    public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 4;
+    public final static long BUILD = 5;

    /** for example "-test" */
    public final static String EXTRA = "";