I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2005-10-17 dust

Browse Source 
* Exchange the remaining URL with EepGet in Sucker.
    * Allow /TOPIC irc command.
This commit is contained in:
dust
2005-10-18 03:14:01 +00:00
committed by zzz
parent 731e26e7d6
commit 2d70103f88
3 changed files with 57 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java
View File

@ -14,6 +14,7 @@ import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper; import net.i2p.data.DataHelper;
import net.i2p.data.Destination; import net.i2p.data.Destination;
import net.i2p.util.EventDispatcher; import net.i2p.util.EventDispatcher;
import net.i2p.util.I2PThread;
import net.i2p.util.Log; import net.i2p.util.Log;
public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable { public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable {
@ -81,9 +82,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
try { try {
i2ps = createI2PSocket(dest); i2ps = createI2PSocket(dest);
i2ps.setReadTimeout(readTimeout); i2ps.setReadTimeout(readTimeout);
Thread in = new Thread(new IrcInboundFilter(s,i2ps)); Thread in = new I2PThread(new IrcInboundFilter(s,i2ps));
in.start(); in.start();
Thread out = new Thread(new IrcOutboundFilter(s,i2ps)); Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps));
out.start(); out.start();
} catch (Exception ex) { } catch (Exception ex) {
if (_log.shouldLog(Log.ERROR)) if (_log.shouldLog(Log.ERROR))
@ -268,7 +269,8 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
"QUIT", "QUIT",
"PART", "PART",
"WALLOPS", "WALLOPS",
"ERROR" "ERROR",
"TOPIC"
}; };
if(field[0].charAt(0)==':') if(field[0].charAt(0)==':')
@ -338,7 +340,8 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
"PING", "PING",
"KICK", "KICK",
"HELPME", "HELPME",
"RULES" "RULES",
"TOPIC"
}; };
if(field[0].length()==0) if(field[0].length()==0)

107
apps/syndie/java/src/net/i2p/syndie/Sucker.java
View File

@ -7,15 +7,9 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.Socket;
import java.net.SocketAddress;
import java.net.URL;
import java.net.URLConnection;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -23,7 +17,6 @@ import java.util.ListIterator;
//import sun.security.provider.SHA; //import sun.security.provider.SHA;
import com.sun.syndication.feed.atom.Entry;
import com.sun.syndication.feed.synd.SyndCategory; import com.sun.syndication.feed.synd.SyndCategory;
import com.sun.syndication.feed.synd.SyndContent; import com.sun.syndication.feed.synd.SyndContent;
import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndEntry;
@ -50,6 +43,8 @@ public class Sucker {
private boolean importEnclosures=true; private boolean importEnclosures=true;
private boolean importRefs=true; private boolean importRefs=true;
private boolean pendingEndLink; private boolean pendingEndLink;
private boolean shouldProxy;
private int proxyPortNum;
public Sucker() {} public Sucker() {}
@ -96,22 +91,14 @@ public class Sucker {
if(idx==0) if(idx==0)
idx=x; idx=x;
baseUrl=urlToLoad.substring(0,idx); baseUrl=urlToLoad.substring(0,idx);
System.out.println("BaseUrl: "+baseUrl);
System.out.println("Processing: "+urlToLoad);
return true; return true;
} }
public void suck() { public void suck() {
URL feedUrl;
SyndFeed feed; SyndFeed feed;
int i;
//if (proxyHost != null && proxyPort != null) {
// // Set proxy
// System.setProperty("http.proxyHost", proxyHost);
// System.setProperty("http.proxyPort", proxyPort);
//}
// //
try { try {
@ -141,8 +128,8 @@ public class Sucker {
SyndFeedInput input = new SyndFeedInput(); SyndFeedInput input = new SyndFeedInput();
boolean shouldProxy = false; shouldProxy = false;
int proxyPortNum = -1; proxyPortNum = -1;
if ( (proxyHost != null) && (proxyPort != null) ) { if ( (proxyHost != null) && (proxyPort != null) ) {
try { try {
proxyPortNum = Integer.parseInt(proxyPort); proxyPortNum = Integer.parseInt(proxyPort);
@ -206,14 +193,15 @@ public class Sucker {
System.out.println("new: " + messageId); System.out.println("new: " + messageId);
if (convertToSml(e, ""+messageNumber)) { if (convertToSml(e, ""+messageNumber)) {
hos.write(messageId.getBytes());
hos.write("\n".getBytes());
if (pushScript != null) { if (pushScript != null) {
if (!execPushScript(""+messageNumber, time)) if (!execPushScript(""+messageNumber, time)) {
System.out.println("push failed"); System.out.println("################## push failed");
else }else {
System.out.println("push success"); System.out.println("push success");
hos.write(messageId.getBytes());
hos.write("\n".getBytes());
}
} }
} }
messageNumber++; messageNumber++;
@ -285,7 +273,6 @@ public class Sucker {
private boolean convertToSml(SyndEntry e, String messageName) { private boolean convertToSml(SyndEntry e, String messageName) {
// Create message // Create message
File messageFile = new File(messageName);
FileOutputStream fos; FileOutputStream fos;
messagePath=outputDir+"/"+messageName; messagePath=outputDir+"/"+messageName;
try { try {
@ -376,14 +363,15 @@ public class Sucker {
private String htmlTagToSmlTag(String htmlTag) { private String htmlTagToSmlTag(String htmlTag) {
String ret=""; String ret="";
String htmlTagLowerCase=htmlTag.toLowerCase();
if(importEnclosures && htmlTag.startsWith("<img")) if(importEnclosures && htmlTagLowerCase.startsWith("<img"))
{ {
System.out.println("Found image tag: "+htmlTag); System.out.println("Found image tag: "+htmlTag);
int a,b; int a,b;
a=htmlTag.indexOf("src=\"")+5; a=htmlTagLowerCase.indexOf("src=\"")+5;
b=a+1; b=a+1;
while(htmlTag.charAt(b)!='\"') while(htmlTagLowerCase.charAt(b)!='\"')
b++; b++;
String imageLink=htmlTag.substring(a,b); String imageLink=htmlTag.substring(a,b);
@ -394,11 +382,11 @@ public class Sucker {
ret += "[img attachment=\""+""+ attachmentCounter +"\"]"; ret += "[img attachment=\""+""+ attachmentCounter +"\"]";
a=htmlTag.indexOf("alt=\"")+5; a=htmlTagLowerCase.indexOf("alt=\"")+5;
if(a>=5) if(a>=5)
{ {
b=a+1; b=a+1;
while(htmlTag.charAt(b)!='\"') while(htmlTagLowerCase.charAt(b)!='\"')
b++; b++;
String altText=htmlTag.substring(a,b); String altText=htmlTag.substring(a,b);
ret+=altText; ret+=altText;
@ -416,14 +404,14 @@ public class Sucker {
return ret; return ret;
} }
if(importRefs && htmlTag.startsWith("<a ")) if(importRefs && htmlTagLowerCase.startsWith("<a "))
{ {
System.out.println("Found link tag: "+htmlTag); System.out.println("Found link tag: "+htmlTag);
int a,b; int a,b;
a=htmlTag.indexOf("href=\"")+6; a=htmlTagLowerCase.indexOf("href=\"")+6;
b=a+1; b=a+1;
while(htmlTag.charAt(b)!='\"') while(htmlTagLowerCase.charAt(b)!='\"')
b++; b++;
String link=htmlTag.substring(a,b); String link=htmlTag.substring(a,b);
if(link.indexOf("http")<0) if(link.indexOf("http")<0)
@ -439,49 +427,44 @@ public class Sucker {
return ret; return ret;
} }
if ("</a>".equals(htmlTag)) { if ("</a>".equals(htmlTagLowerCase)) {
if (pendingEndLink) if (pendingEndLink)
return "[/link]"; return "[/link]";
} }
if("<b>".equals(htmlTag)) if("<b>".equals(htmlTagLowerCase))
return "[b]"; return "[b]";
if("</b>".equals(htmlTag)) if("</b>".equals(htmlTagLowerCase))
return "[/b]"; return "[/b]";
if("<i>".equals(htmlTag)) if("<i>".equals(htmlTagLowerCase))
return "[i]"; return "[i]";
if("</i>".equals(htmlTag)) if("</i>".equals(htmlTagLowerCase))
return "[/i]"; return "[/i]";
return null; return null;
} }
private void fetchAttachment(String link) { private void fetchAttachment(String link) {
System.out.println("Fetch attachment from: "+link);
String attachmentPath = messagePath+"."+attachmentCounter;
try {
link=link.replaceAll("&amp;","&");
URL attachmentUrl = new URL(link);
InputStream is = attachmentUrl.openStream();
FileOutputStream fos = new FileOutputStream(attachmentPath);
while(true)
{
int i =is.read();
if(i<0)
break;
fos.write(i);
}
} catch (MalformedURLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
System.out.println("Fetch attachment from: "+link);
String attachmentPath = messagePath+"."+attachmentCounter;
link=link.replaceAll("&amp;","&");
int numRetries = 2;
File fetched = new File(attachmentPath);
// we use eepGet, since it retries and doesn't leak DNS requests like URL does
EepGet get = new EepGet(I2PAppContext.getGlobalContext(), shouldProxy, proxyHost, proxyPortNum,
numRetries, fetched.getAbsolutePath(), link);
SuckerFetchListener lsnr = new SuckerFetchListener();
get.addStatusListener(lsnr);
get.fetch();
boolean ok = lsnr.waitForSuccess();
if (!ok) {
System.err.println("Unable to retrieve the url after " + numRetries + " tries.");
fetched.delete();
return;
}
attachmentCounter++; attachmentCounter++;
} }

6
history.txt
View File

@ -1,4 +1,8 @@
$Id: history.txt,v 1.298 2005/10/14 11:26:31 jrandom Exp $ $Id: history.txt,v 1.299 2005/10/17 19:39:46 jrandom Exp $
2005-10-17 dust
* Exchange the remaining URL with EepGet in Sucker.
* Allow /TOPIC irc command.
2005-10-17 jrandom 2005-10-17 jrandom
* Allow an env prop to configure whether we want to use the backwards * Allow an env prop to configure whether we want to use the backwards