Changeset 838

Timestamp:

02/05/14 11:15:35 (10 years ago)

Author:

jts21

Message:

Implement automatically downloading images from FrameShare servers. Also includes code for uploading images, but that's not ready yet.

Location:

trunk

Files:

• releases/Expeditee.jar (modified) ( previous)
• src/org/expeditee/items/ItemUtils.java (modified) (4 diffs)
• src/org/expeditee/network/DefaultServer.java (modified) (2 diffs)
• src/org/expeditee/network/FrameShare.java (modified) (4 diffs)
• src/org/expeditee/network/ImageSaver.java (added)
• src/org/expeditee/network/ImageServer.java (added)

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

@@ -26 +26 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
+import org.expeditee.network.FrameShare;
 import org.expeditee.settings.folders.FolderSettings;
 
@@ -344 +345 @@
          *         not found.
          */
-        public static Picture CreatePicture(Text source, ImageObserver observer) {
+        public static Picture CreatePicture(Text source, ImageObserver observer, boolean tryRemote) {
                 String text = source.getText();
                 String path = "";
@@ -398 +399 @@
                                 path = file.getPath();
 
-                        // if the image isn't found by now, give up.
+                        // if the image isn't found by now, try remote servers
                         file = new File(path);
                         if (!file.exists() || file.isDirectory()) {
+                        if(tryRemote && FrameShare.getInstance().loadImage(fileName, null)) {
+                                // call CreatePicture again, but with tryRemote set to false so we won't get into an infinite loop
+                                // if something goes wrong with finding the downloaded image
+                                return CreatePicture(source, observer, false);
+                        }
                                 return null;
                         }
@@ -417 +423 @@
                 }
 
+        }
+        
+        public static Picture CreatePicture(Text source, ImageObserver observer) {
+                return CreatePicture(source, observer, true);
         }
 

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

@@ -10 +10 @@
         protected static final int FRAMENAME_PACKET_LENGTH = 1000;
         
-        private boolean _stop = false;
+        protected boolean _stop = false;
         protected DatagramSocket socket = null;
 
@@ -19 +19 @@
         public DefaultServer(Runnable target) {
                 super(target);
+        }
+        
+        protected DefaultServer(String name) {
+                super(name);
         }
 

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

@@ -2 +2 @@
 
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -8 +11 @@
 import java.net.DatagramSocket;
 import java.net.InetAddress;
+import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -47 +51 @@
             _servers.add(new InfServer(_port));
             _servers.add(new InfUpdate(_port));
+            _servers.add(new ImageServer(_port));
+            _servers.add(new ImageSaver(_port));
 
         }
@@ -203 +209 @@
 
                 return frame;
+        }
+        
+        /**
+         * Downloads an image from the server (if it exists),
+         * Saves it locally in the default image folder,
+         * Then returns the filename
+         * 
+         * @param imageName
+         * @param peerName
+         * @return true if the image was successfully downloaded and saved in the default images folder
+         */
+        public boolean loadImage(String imageName, String peerName) {
+                boolean result = false;
+                try {
+                        if (peerName == null) {
+                                for (Peer peer : _peers.values()) {
+                                        try {
+                                                result = getImage(imageName, peer);
+                                                if(!result) {
+                                                        continue;
+                                                }
+                                                peerName = peer.getName();
+                                                break;
+                                        } catch (Exception e) {
+                                                e.printStackTrace();
+                                        }
+                                }
+                        } else {
+                                try {
+                                        Peer peer = _peers.get(peerName.toLowerCase());
+                                        if (peer != null) {
+                                                result = getImage(imageName, peer);
+                                        }
+                                } catch (Exception e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                } catch(Exception e) {
+                        e.printStackTrace();
+                }
+                return result;
+        }
+        
+        /**
+         * Sends an image to the server,
+         * So that other users can view the image on the server frames
+         * 
+         * @param imageName
+         * @param peerName
+         */
+        public void sendImage(String imageName, String peerName) {
+                
+        }
+        
+        private boolean getImage(String imageName, Peer peer) throws IOException {
+                try(Socket socket = new Socket(peer.getAddress(), peer.getPort() + ImageServer.OFFSET)) {
+                socket.setSoTimeout(NetworkSettings.FrameShareTimeout.get() * 2);
+                byte[] fileName = imageName.getBytes();
+                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();
+                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();
+                socket.close();
+                return true;
+                } catch(Exception e) {
+                        e.printStackTrace();
+                        return false;
+                }
         }