Changeset 6c1f5dd


Ignore:
Timestamp:
Feb 7, 2011 7:27:55 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3f3385f
Parents:
86e663b
Message:
  • i2psnark:
    • Check for dup magnet torrent when adding torrent file
    • Add exotrack.i2p (ticket #403)
    • Disable spellcheck in textarea
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

    r86e663b r6c1f5dd  
    526526     *  @throws RuntimeException via Snark.fatal()
    527527     */
    528     public void addTorrent(String filename) { addTorrent(filename, false); }
     528    private void addTorrent(String filename) { addTorrent(filename, false); }
    529529
    530530    /**
     
    532532     *  @throws RuntimeException via Snark.fatal()
    533533     */
    534     public void addTorrent(String filename, boolean dontAutoStart) {
     534    private void addTorrent(String filename, boolean dontAutoStart) {
    535535        if ((!dontAutoStart) && !_util.connected()) {
    536536            addMessage(_("Connecting to I2P"));
     
    579579                    } catch (IOException e) {}
    580580                   
     581                    // This test may be a duplicate, but not if we were called
     582                    // from the DirMonitor, which only checks for dup torrent file names.
     583                    Snark snark = getTorrentByInfoHash(info.getInfoHash());
     584                    if (snark != null) {
     585                        // TODO - if the existing one is a magnet, delete it and add the metainfo instead?
     586                        addMessage(_("Torrent with this info hash is already running: {0}", snark.getBaseName()));
     587                        return;
     588                    }
     589
    581590                    if (!TrackerClient.isValidAnnounce(info.getAnnounce())) {
    582591                        if (_util.shouldUseOpenTrackers() && _util.getOpenTrackers() != null) {
     
    11811190    }
    11821191
     1192    /**
     1193     *  caller must synchronize on _snarks
     1194     */
    11831195    private void monitorTorrents(File dir) {
    11841196        String fileNames[] = dir.list(TorrentFilenameFilter.instance());
     
    12621274       ,"Welterde", "http://tracker.welterde.i2p/a=http://tracker.welterde.i2p/stats?mode=top5"
    12631275//       , "CRSTRACK", "http://b4G9sCdtfvccMAXh~SaZrPqVQNyGQbhbYMbw6supq2XGzbjU4NcOmjFI0vxQ8w1L05twmkOvg5QERcX6Mi8NQrWnR0stLExu2LucUXg1aYjnggxIR8TIOGygZVIMV3STKH4UQXD--wz0BUrqaLxPhrm2Eh9Hwc8TdB6Na4ShQUq5Xm8D4elzNUVdpM~RtChEyJWuQvoGAHY3ppX-EJJLkiSr1t77neS4Lc-KofMVmgI9a2tSSpNAagBiNI6Ak9L1T0F9uxeDfEG9bBSQPNMOSUbAoEcNxtt7xOW~cNOAyMyGydwPMnrQ5kIYPY8Pd3XudEko970vE0D6gO19yoBMJpKx6Dh50DGgybLQ9CpRaynh2zPULTHxm8rneOGRcQo8D3mE7FQ92m54~SvfjXjD2TwAVGI~ae~n9HDxt8uxOecAAvjjJ3TD4XM63Q9TmB38RmGNzNLDBQMEmJFpqQU8YeuhnS54IVdUoVQFqui5SfDeLXlSkh4vYoMU66pvBfWbAAAA.i2p/tracker/announce.php=http://crstrack.i2p/tracker/"
     1276       ,"Exotrack", "http://blbgywsjubw3d2zih2giokakhe3o2cko7jtte4risb3hohbcoyva.b32.i2p/announce.php=http://exotrack.i2p/"
    12641277    };
    12651278   
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    r86e663b r6c1f5dd  
    13821382        out.write("<tr><td>");
    13831383        out.write(_("I2CP options"));
    1384         out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" >"
     1384        out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" spellcheck=\"false\" >"
    13851385                  + opts.toString() + "</textarea><br>\n");
    13861386
     
    18341834        else if (mime.equals("text/plain") || plc.endsWith(".nfo"))
    18351835            icon = "page";
    1836         else if (mime.equals("application/java-archive") || plc.endsWith(".war"))
     1836        else if (mime.equals("application/java-archive") || plc.endsWith(".war") ||
     1837                 plc.endsWith(".deb"))
    18371838            icon = "package";
    18381839        else if (plc.endsWith(".xpi2p"))
  • history.txt

    r86e663b r6c1f5dd  
     12011-02-07 zzz
     2    * i2psnark:
     3      - Check for dup magnet torrent when adding torrent file
     4      - Add exotrack.i2p (ticket #403)
     5      - Disable spellcheck in textarea
     6    * i2ptunnel: Generate error message when i2ptunnel.config save fails
     7                 (ticket #404)
     8
    192011-02-06 zzz
    210    * i2psnark: Fix maggot links, and magnet links with trailing parameters (thx user)
  • installer/resources/hosts.txt

    r86e663b r6c1f5dd  
    326326planet.i2p=W0omtMApOdlTkgJoct08QnzDkeb~xc60df5Cx3k3qqOFmyEkRB65NdpSdvldI5STmXmXlZe68f8Hu1dfBMmKvfpBFMpP-mRVYuHbEa4N1dRkp3AOswZFO51lSC~MVPMZKGHAv0cfv5WFaJ9nfuaR7iYYWJF11xotoPTMbJdB-I3XPC8rxHI-73ATlOD4cU9oZ6BYcBE0dun9zw4IHBcRpnFRx~s-TkevNfPnBqujB-NNgA8a5s~QUj0h3FwwUWsNB8f1Uwy~DwoQh7pMp6dsZ3umEyBn2HaXZasSmbzB30qkQRs9vrAtIFdIzCQ~8gI2cHdHEPgExUQX~xlM8QZEgnLXSfS93asWPdpitv~KT7bO-35BgTBdCozHTCcvys6bYJ24UnkFVBE0D2L0t98neelWkJSaEU0QzxdRphoCZY8OABQIaS4qw6PEFD1Un1vxNCh~TDFWcYBZ3Rqsc~ISW0wF7oOS6-DPT3q5O8cGLc8iAEdRchrU9XyAHAKVlEZxAAAA
    327327outproxy2.h2ik.i2p=zjXqVu1pnPpsR0DnqiIlAidy8GSLznEupTrb~vUg-NELU3~Gmbqc-soJlYu69VyQdZxVGNZ1PsgacjJwxtd8otZ~lgqsJV2aDJdzDIClEj9hYM4hV4ClHdZQnEOEHj1fc5TK7n31o3jr94kz6ZtdG9eL7F~YIE7EcADJ7ECg-wz05~xj8NK4gH67mMSCHgX92RTQRTGFtxxrPkVRLD8GE069wGmRpV9xt3wZqn12ijdo1HjNMbqxZfSbulscm0M2~qy4fwzF1OYWSg5-~NY02iNygwKYhG2CdgDyFALVGvHfJ-wzZ~pKj62-c8HVg1qHE6B1bKKO5GID03JoRAlEeZFkrqqmUQyQvzxhlUJlcnaBOaCoIm9L8999cHQj7-JHJTTvJ2TltvSbj1TcyoIFEdSyW22TJGRMoopezPoCERhemy79cb~SvsK46m4J7hBDjQl7Rgzp-uC5aSMEN3PU2g1w5A3DWxodUy2Zzg~moJaKbeS8Vf~mLVEt63djlFMxAAAA
     328exotrack.i2p=Ly1vs4plBuGisqlMiQOjhVkXFZPBMy9joSCrus~tuLXBRXDrPYG9WXJMzY4gb3LiW0VVawv0kLgikX8eeeruXmgKwQW5zB9UPSP0CQnXTRelE3Jn7lev~re4woHvgS-EGBwWikxqXF3f7W8-LhieI0JhBZxItiWhJJME07oncW0kgS8UIMl0wqN2Y-p0sryFCN056TfGNTXigfxrSLqKnpi6a2OyEkF62qvRID3qXzRque0vKQjqvavq2mqxjFrSgLUoyKod5h9Px6qK08gtoAyDKMLPk7fPgReYKj6awiOxRSGfsMpZD3~ZuV0Sts2XtCau3S3myYMIDe5oKziPtZRIej4KBDxT0YYIw5v4RoqzqF88gNgHDfkPZ25JKTOt5xGcPTG8kwYrtx39PX6NrJmv-I~LUz6sZZlIW24k1qbO7zBxZ6mazldQY1~FJGXzn5MNzsxp44iOZdMDJJh18N0Psthk2hqlQOS4L0Ss1Odm1czhBxf1Y~j3L-QsMttcAAAA
  • router/java/src/net/i2p/router/RouterVersion.java

    r86e663b r6c1f5dd  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 4;
     21    public final static long BUILD = 5;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.