[Zerofile-svn] SF.net SVN: zerofile: [84] trunk/src
Status: Pre-Alpha
Brought to you by:
karl-bengtsson
Menu
▾
▴
[Zerofile-svn] SF.net SVN: zerofile: [84] trunk/src
|
From: <kar...@us...> - 2007-12-13 14:47:21
|
Revision: 84
http://zerofile.svn.sourceforge.net/zerofile/?rev=84&view=rev
Author: karl-bengtsson
Date: 2007-12-13 06:47:19 -0800 (Thu, 13 Dec 2007)
Log Message:
-----------
bugfix for problems with sending files containing whitespace in file names
Modified Paths:
--------------
trunk/src/HttpServer.java
trunk/src/XMPPLinkLocalChatSession.java
trunk/src/ZeroFile.java
Modified: trunk/src/HttpServer.java
===================================================================
--- trunk/src/HttpServer.java 2007-12-13 14:17:44 UTC (rev 83)
+++ trunk/src/HttpServer.java 2007-12-13 14:47:19 UTC (rev 84)
@@ -160,7 +160,7 @@
if(temp.equals("GET"))
{
String fileName = s.nextToken();
- fileName = fileName.replaceFirst("/","");
+ fileName = fileName.replaceFirst("/","").replace("%20"," ");
FileInputStream fis = null ;
boolean fileExists = false;
Modified: trunk/src/XMPPLinkLocalChatSession.java
===================================================================
--- trunk/src/XMPPLinkLocalChatSession.java 2007-12-13 14:17:44 UTC (rev 83)
+++ trunk/src/XMPPLinkLocalChatSession.java 2007-12-13 14:47:19 UTC (rev 84)
@@ -62,7 +62,7 @@
String fileTransferStanza = "<message to=\""+_chatPartner.getServiceName()+"\" from=\""+ZeroconfRegistration.getMyServiceName()+"\"><body></body>";
fileTransferStanza += "<x xmlns=\"jabber:x:oob\">";
fileTransferStanza += "<url type=\"file\" size=\""+String.valueOf(sizeOfFile)+"\">";
- fileTransferStanza += "http://"+InetAddress.getLocalHost().getHostAddress()+":"+_httpServer.getPort()+"/"+filnamn+"</url></x></message>";
+ fileTransferStanza += "http://"+InetAddress.getLocalHost().getHostAddress()+":"+_httpServer.getPort()+"/"+filnamn.replace(" ", "%20")+"</url></x></message>";
_toRemoteHost.print(fileTransferStanza);
_toRemoteHost.flush();
}
@@ -144,7 +144,7 @@
if (stanza.contains("<x xmlns=\"jabber:x:oob\">"))
{
String urlToFile = XMPPDOMParser.getUrlFromFileTransferStanza(stanza);
- String fileName = urlToFile.substring(urlToFile.lastIndexOf("/")+1);
+ String fileName = urlToFile.substring(urlToFile.lastIndexOf("/")+1).replace("%20"," ");
if (ZeroFileSettings.getCheckBox().equals("true"))
{
ZeroFile.downloadFileFromHTTP(XMPPDOMParser.getUrlFromFileTransferStanza(stanza));
Modified: trunk/src/ZeroFile.java
===================================================================
--- trunk/src/ZeroFile.java 2007-12-13 14:17:44 UTC (rev 83)
+++ trunk/src/ZeroFile.java 2007-12-13 14:47:19 UTC (rev 84)
@@ -62,9 +62,9 @@
{
String localFileName;
if (!ZeroFileSettings.getDownloadFolder().equals(""))
- localFileName = ZeroFileSettings.getDownloadFolder() +"/"+ address.substring(lastSlashIndex + 1);
+ localFileName = ZeroFileSettings.getDownloadFolder() +"/"+ address.substring(lastSlashIndex + 1).replace("%20"," ");
else
- localFileName = System.getProperty("user.home") +"/"+ address.substring(lastSlashIndex + 1);
+ localFileName = System.getProperty("user.home") +"/"+ address.substring(lastSlashIndex + 1).replace("%20"," ");
URL url = new URL(address);
out = new BufferedOutputStream(
new FileOutputStream(localFileName));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
