Changeset 843

Timestamp:

02/05/14 15:30:07 (10 years ago)

Author:

jts21

Message:

Implement uploading images to FrameServer so other people can see them

Location:

trunk

Files:

• releases/Expeditee.jar (modified) ( previous)
• src/org/expeditee/gui/FrameUtils.java (modified) (2 diffs)
• src/org/expeditee/items/Picture.java (modified) (2 diffs)
• src/org/expeditee/network/FrameShare.java (modified) (8 diffs)
• src/org/expeditee/network/ImageSaver.java (modified) (3 diffs)
• src/org/expeditee/network/ImageServer.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -1831 +1831 @@
 //                      continue;
 //              }
-                out.getParentFile().mkdirs();
+                copyFile(file, out, true);
+        }
+    }
+    
+    /**
+     * @param src
+     * @param dst
+     * @throws IOException
+     */
+    public static void copyFile(File src, File dst, boolean overWrite) throws IOException {
+        if(!overWrite && dst.exists())
+                return;
+        dst.getParentFile().mkdirs();
                 FileOutputStream fOut = null;
                 FileInputStream fIn = null;
                 try {
                         // System.out.println(out.getPath());
-                        fOut = new FileOutputStream(out);
-                        fIn = new FileInputStream(file);
+                        fOut = new FileOutputStream(dst);
+                        fIn = new FileInputStream(src);
                         byte[] bBuffer = new byte[1024];
                         int nLen;
@@ -1854 +1866 @@
                         }
                 }
-                
-        }
     }
 

trunk/src/org/expeditee/items/Picture.java

@@ -26 +26 @@
 
 import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.stats.Logger;
 
@@ -740 +742 @@
                 return _fileName;
         }
+        
+        public String getPath() {
+                return _path;
+        }
+        
+        /**
+         * Copies the image to the default images folder and updates the reference to it in Expeditee
+         * Used for correcting image references for FrameShare
+         */
+        public void moveToImagesFolder() {
+                File f = new File(getPath());
+                // if the file is not in the default images folder, copy it there
+                if(! f.getParentFile().equals(new File(FrameIO.IMAGES_PATH))) {
+                        try {
+                                File f2 = new File(FrameIO.IMAGES_PATH + f.getName());
+                FrameUtils.copyFile(f, f2, false);
+                f = f2;
+            } catch (IOException e) {
+                e.printStackTrace();
+                f = null;
+            }
+                }
+                _path = f.getPath();
+                _fileName = f.getName();
+                updateSource();
+        }
 
         protected String getTagText() {

trunk/src/org/expeditee/network/FrameShare.java

@@ -3 +3 @@
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -17 +17 @@
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 
@@ -27 +28 @@
 import org.expeditee.io.FrameReader;
 import org.expeditee.io.FrameWriter;
+import org.expeditee.items.Item;
+import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
 import org.expeditee.settings.network.NetworkSettings;
@@ -61 +64 @@
 
         private FrameShare(int port) {
-                this();
+        this();
                 _port = port;
 
@@ -253 +256 @@
         
         /**
-         * Sends an image to the server,
-         * So that other users can view the image on the server frames
-         * 
-         * @param imageName
-         * @param peerName
+         * Send a list of images that may need to be uploaded
+         * Then wait for a response (in form of a list of shorts denoting which files to keep)
+         * Then send each file in sequence
+         * @author jts21
+         *
          */
-        public void sendImage(String imageName, String peerName) {
+        private class ImageSender extends Thread {
                 
+                private List<File> imageFiles;
+                private Peer peer;
+                
+                public ImageSender(List<File> imageFiles, Peer peer) {
+                        super("ImageSender");
+                        this.imageFiles = imageFiles;
+                        this.peer = peer;
+                }
+                
+                @Override
+                public void run() {
+                        System.out.println("Sending images to server");
+                        try(Socket socket = new Socket(peer.getAddress(), peer.getPort() + ImageSaver.OFFSET)) {
+                                socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get() * 2);
+                                OutputStream os = socket.getOutputStream();
+                                // send the list of filenames to the server
+                                int numFiles = imageFiles.size();
+                                if(numFiles > 255) {
+                                        throw new Exception("Too many images on the frame");
+                                }
+                os.write((byte) (numFiles & 0xFF));
+                // send the list of different files
+                                for(File f : imageFiles) {
+                                        byte[] fileName = f.getName().getBytes();
+                        int fileNameLen = fileName.length;
+                        if(fileNameLen > 255) {
+                                        throw new Exception("Filename too long");
+                                }
+                        os.write((byte) ((fileNameLen) & 0xFF));
+                        os.write(fileName);
+                                }
+                                // the server sends indices of files it wants, send their data
+                                InputStream is = socket.getInputStream();
+                                int i = -1;
+                                while((i = is.read()) != -1 && i < imageFiles.size()) {
+                                        File f = imageFiles.get(i);
+                                        System.out.println("... sending " + f.getName());
+                                        ImageServer.sendImage(f, socket);
+                                }
+                        } catch(Exception e) {
+                                e.printStackTrace();
+                        }
+                }
         }
         
@@ -266 +312 @@
                 try(Socket socket = new Socket(peer.getAddress(), peer.getPort() + ImageServer.OFFSET)) {
                 socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get() * 2);
-                byte[] fileName = imageName.getBytes();
+                byte[] fileName = imageName.getBytes(ImageServer.CHARSET);
                 int fileNameLen = fileName.length;
-                byte[] data = new byte[2 + fileNameLen];
-                data[0] = (byte) ((fileNameLen >> 8) & 0xFF);
-                data[1] = (byte) ((fileNameLen) & 0xFF);
-                System.arraycopy(fileName, 0, data, 2, fileNameLen);
-                socket.getOutputStream().write(data);
-                socket.getOutputStream().flush();
+                OutputStream os = socket.getOutputStream();
+                os.write((byte) ((fileNameLen) & 0xFF));
+                os.write(fileName);
+                os.flush();
                 socket.shutdownOutput();
-                InputStream is = socket.getInputStream();
-            // file length is the first 4 bytes
-            int fileLen = (is.read() << 24) | (is.read() << 16) | (is.read() << 8) | is.read();
-            // if the above reads failed, fileLen will be -1
-            if(fileLen <= 0) {
-                return false;
-            }
-            System.out.println("Receiving " + new String(fileName, ImageServer.CHARSET) + " (" + fileLen + " bytes)");
-            File f = new File(FrameIO.IMAGES_PATH + imageName);
-            f.getParentFile().mkdirs();
-            FileOutputStream out = new FileOutputStream(f);
-            // file is the remaining bytes of the stream
-            byte[] buf = null;
-            if(fileLen > 1024) {
-                buf = new byte[1024];
-                while(fileLen > 1024) {
-                        is.read(buf);
-                        out.write(buf);
-                        fileLen -= 1024;
-                }
-            }
-            buf = new byte[fileLen];
-            is.read(buf);
-                out.write(buf);
-                out.flush();
-            out.close();
+                boolean ret = ImageSaver.recvImage(new File(FrameIO.IMAGES_PATH + imageName), socket);
                 socket.close();
-                return true;
+                return ret;
                 } catch(Exception e) {
                         e.printStackTrace();
@@ -371 +390 @@
 
                 Peer peer = _peers.get(toSave.getPath().toLowerCase());
+                
+                List<File> imageFiles = new LinkedList<File>();
+                for(Item i : toSave.getItems()) {
+                        if(i instanceof Picture) {
+                                ((Picture) i).moveToImagesFolder();
+                                File f = new File(((Picture) i).getPath());
+                                if(f != null && f.isFile() && !imageFiles.contains(f)) {
+                                        imageFiles.add(f);
+                                }
+                        }
+                }
+                new ImageSender(imageFiles, peer).start();
+                
                 String fileContents = "";
                 // Now read the frame from the file contents
@@ -488 +520 @@
             if (args.length != 1) {
 
-                // Work out the 'program name' (i.e. this class), but done in a general 
-                //   way in case class name is changed at a later date
-                StackTraceElement[] stack = Thread.currentThread ().getStackTrace ();
-                StackTraceElement main = stack[stack.length - 1];
-                String mainClass = main.getClassName ();
-
-                System.err.println("Usage: java " + mainClass + " port-number");
-                System.exit(1);
+                // Work out the 'program name' (i.e. this class), but done in a general 
+                //   way in case class name is changed at a later date
+                StackTraceElement[] stack = Thread.currentThread ().getStackTrace ();
+                StackTraceElement main = stack[stack.length - 1];
+                String mainClass = main.getClassName ();
+    
+                System.err.println("Usage: java " + mainClass + " port-number");
+                System.exit(1);
             }
             
+            MessageBay.suppressMessages(true);
+            
             String port_str = args[0];
 
             try {
-                int port = Integer.parseInt(port_str);
-
-                init(port);
+                int port = Integer.parseInt(port_str);
+    
+                init(port);
             }
             catch (Exception e) {

trunk/src/org/expeditee/network/ImageSaver.java

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.expeditee.gui.FrameIO;
 
 public class ImageSaver extends DefaultServer {
+        
+        public static boolean recvImage(File file, Socket socket) throws IOException {
+                InputStream is = socket.getInputStream();
+        // file length is the first 4 bytes
+        int fileLen = (is.read() << 24) | (is.read() << 16) | (is.read() << 8) | is.read();
+        // if the above reads failed, fileLen will be -1
+        if(fileLen <= 0) {
+                return false;
+        }
+        System.out.println("Receiving " + file.getName() + " (" + fileLen + " bytes)");
+        file.getParentFile().mkdirs();
+        FileOutputStream out = new FileOutputStream(file);
+        // file is the remaining bytes of the stream
+        byte[] buf = null;
+        if(fileLen > 1024) {
+                buf = new byte[1024];
+                while(fileLen > 1024) {
+                        is.read(buf);
+                        out.write(buf);
+                        fileLen -= 1024;
+                }
+        }
+        buf = new byte[fileLen];
+        is.read(buf);
+                out.write(buf);
+                out.flush();
+        out.close();
+        return true;
+        }
         
         /**
@@ -20 +52 @@
         private static class ImageReceiver extends Thread {
                 
-                private Socket client;
+                private Socket socket;
                 
                 public ImageReceiver(Socket client) {
                         super("ImageReceiver");
-                        this.client = client;
+                        this.socket = client;
                 }
                 
@@ -30 +62 @@
                 public void run() {
                         try {
-                                this.client.shutdownOutput();
-                                InputStream is = this.client.getInputStream();
-                                // file name length is the first 2 bytes
-                    int fileNameLen = (is.read() << 8) | is.read();
-                    // file length is the next 4 bytes
-                    int fileLen = (is.read() << 24) | (is.read() << 16) | (is.read() << 8) | is.read();
-                    // file name is the remaining bytes of the header, encoded in UTF-8
-                    byte[] fileName = new byte[fileNameLen];
-                    is.read(fileName);
-                    File f = new File(FrameIO.IMAGES_PATH + new String(fileName, ImageServer.CHARSET));
-                    f.mkdirs();
-                    // file is the remaining bytes of the stream
-                    byte[] fileData = new byte[fileLen];
-                    is.read(fileData);
-                    // write the file
-                    FileOutputStream out = new FileOutputStream(f);
-                    out.write(fileData);
-                    out.close();
-                    this.client.close();
+                                InputStream is = this.socket.getInputStream();
+                                OutputStream os = this.socket.getOutputStream();
+                                // number of files is the first byte
+                                int numFiles = is.read();
+                                if(numFiles == -1)
+                                        return;
+                                // read the filenames
+                                File[] files = new File[numFiles];
+                                List<Integer> wantFiles = new ArrayList<Integer>();
+                                for(int i = 0; i < numFiles; i++) {
+                                        int fileNameLen = is.read();
+                                        byte[] fileName = new byte[fileNameLen];
+                                        is.read(fileName);
+                                        files[i] = new File(FrameIO.IMAGES_PATH + new String(fileName, ImageServer.CHARSET));
+                                        // pick out which files we want
+                                        if(!files[i].exists()) {
+                                                wantFiles.add(i);
+                                                os.write(i);
+                                        }
+                                }
+                                // get the files
+                                for(Integer i : wantFiles) {
+                                        recvImage(files[i], socket);
+                                }
+                    this.socket.close();
             } catch (IOException e) {
                     e.printStackTrace();

trunk/src/org/expeditee/network/ImageServer.java

@@ -1 +1 @@
 package org.expeditee.network;
 
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -13 +13 @@
 
 public class ImageServer extends DefaultServer {
+        
+        public static void sendImage(File file, Socket socket) throws IOException {
+                OutputStream os = socket.getOutputStream();
+        // send the file over the socket
+        int fileLen = (int) file.length();
+        System.out.println("Sending " + file.getName() + " (" + fileLen + " bytes)");
+        byte[] fileLenBytes = new byte[4];
+        fileLenBytes[0] = (byte) ((fileLen >> 24) & 0xFF);
+        fileLenBytes[1] = (byte) ((fileLen >> 16) & 0xFF);
+        fileLenBytes[2] = (byte) ((fileLen >> 8) & 0xFF);
+        fileLenBytes[3] = (byte) ((fileLen) & 0xFF);
+        os.write(fileLenBytes);
+        FileInputStream in = new FileInputStream(file);
+        byte[] buf = null;
+        if(in.available() > 1024) {
+                buf = new byte[1024];
+                while(in.available() > 1024) {
+                        in.read(buf);
+                        os.write(buf);
+                }
+        }
+        buf = new byte[in.available()];
+        in.read(buf);
+                os.write(buf);
+                os.flush();
+                in.close();
+        }
         
         /**
@@ -22 +49 @@
         private static class ImageSender extends Thread {
                 
-                private Socket client;
+                private Socket socket;
                 
                 public ImageSender(Socket client) {
                         super("ImageSender");
-                        this.client = client;
+                        this.socket = client;
                 }
                 
@@ -32 +59 @@
                 public void run() {
                         try {
-                                BufferedOutputStream os = new BufferedOutputStream(this.client.getOutputStream());
-                                InputStream is = this.client.getInputStream();
-                                // file name length is the first 2 bytes
-                    int fileNameLen = (is.read() << 8) | is.read();
+                                InputStream is = this.socket.getInputStream();
+                                // file name length is the first byte
+                    int fileNameLen = is.read();
+                    if(fileNameLen <= 0)
+                        return;
                     // file name is the remaining bytes of the stream, encoded in UTF-8
                     byte[] fileName = new byte[fileNameLen];
                     is.read(fileName);
-                    this.client.shutdownInput();
-                    File f = new File(FrameIO.IMAGES_PATH + new String(fileName, ImageServer.CHARSET));
-                    if(f.exists()) {
-                        // send the file over the socket
-                        int fileLen = (int) f.length();
-                        System.out.println("Sending " + new String(fileName, ImageServer.CHARSET) + " (" + fileLen + " bytes)");
-                        byte[] fileLenBytes = new byte[4];
-                        fileLenBytes[0] = (byte) ((fileLen >> 24) & 0xFF);
-                        fileLenBytes[1] = (byte) ((fileLen >> 16) & 0xFF);
-                        fileLenBytes[2] = (byte) ((fileLen >> 8) & 0xFF);
-                        fileLenBytes[3] = (byte) ((fileLen) & 0xFF);
-                        os.write(fileLenBytes);
-                        FileInputStream in = new FileInputStream(f);
-                        byte[] buf = null;
-                        if(in.available() > 1024) {
-                                buf = new byte[1024];
-                                while(in.available() > 1024) {
-                                        in.read(buf);
-                                        os.write(buf);
-                                }
-                        }
-                        buf = new byte[in.available()];
-                        in.read(buf);
-                                os.write(buf);
-                                os.flush();
-                                in.close();
-                    }
-                this.client.close();
+                    this.socket.shutdownInput();
+                    sendImage(new File(FrameIO.IMAGES_PATH + new String(fileName, ImageServer.CHARSET)), socket);
+                this.socket.close();
             } catch (IOException e) {
                     e.printStackTrace();