Cambios cortos

.idea/workspace.xml

@@ -4,23 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="0c5e7f40-d6e0-4cdf-8175-c288dac24af5" name="Changes" comment="Modulo 1">
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/media/Globals.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/media/MediaPlayer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/rmi/client/SpotifyClientImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/rmi/client/stream/unit/PlaySong.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/rmi/common/SpotifyClient.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/rmi/common/SpotifyServer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/stream/ClientStream.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/spotify/stream/ServerStream.java" afterDir="false" />
+    <list default="true" id="0c5e7f40-d6e0-4cdf-8175-c288dac24af5" name="Changes" comment="Modulo 2">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/spotify/client/Client.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/spotify/common/Spotify.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/spotify/rmi/common/Spotify.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/spotify/common/Strings.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/spotify/server/Launcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/spotify/rmi/server/Launcher.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/spotify/server/SpotifyImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/spotify/rmi/server/SpotifyServerImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/spotify/utils/MultiMap.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/spotify/rmi/server/utils/MultiMap.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/spotify/rmi/client/stream/unit/PlaySong.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/spotify/rmi/client/stream/unit/PlaySong.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/spotify/stream/ServerStream.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/spotify/stream/ServerStream.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,7 +94,8 @@
       <workItem from="1716049349162" duration="8581000" />
       <workItem from="1716058954613" duration="24000" />
       <workItem from="1716193421391" duration="5004000" />
-      <workItem from="1716289481350" duration="1623000" />
+      <workItem from="1716289481350" duration="3207000" />
+      <workItem from="1716300799328" duration="59000" />
     </task>
     <task id="LOCAL-00001" summary="l">
       <option name="closed" value="true" />
@@ -141,7 +129,15 @@
       <option name="project" value="LOCAL" />
       <updated>1716058967465</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="Modulo 2">
+      <option name="closed" value="true" />
+      <created>1716291241956</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1716291241956</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -163,6 +159,7 @@
     <MESSAGE value="Copias" />
     <MESSAGE value="Clase nueva del pdf" />
     <MESSAGE value="Modulo 1" />
-    <option name="LAST_COMMIT_MESSAGE" value="Modulo 1" />
+    <MESSAGE value="Modulo 2" />
+    <option name="LAST_COMMIT_MESSAGE" value="Modulo 2" />
   </component>
 </project>
\ No newline at end of file

src/spotify/rmi/client/stream/unit/PlaySong.java

 package spotify.rmi.client.stream.unit;
 
+import spotify.media.Media;
 import spotify.rmi.common.*;
 import spotify.rmi.client.SpotifyClientImpl;
+
+import java.rmi.Naming;
+
 public class PlaySong {
     public static void main(String [ ] args) {
+        String host = "localHost";
+
+        try {
+            SpotifyServer orServer = (SpotifyServer) Naming.lookup("rmi://"+host+"/ObjetoSpotify");
+            Spotify or = (Spotify) Naming.lookup("rmi://"+host+"/ObjetoSpotify");
+
+            String respuesta = or.auth("hector", "1234");
+            System.out.println("[Respuesta: "+respuesta+"]");
+
+            Media media = new Media("cancion");
 
+            or.add2L(media);
+
+            String respMedia = orServer.startMedia(media);
+
+
+        } catch (java.rmi.RemoteException re) {
+            System.err.println("<Cliente: Excepción RMI: "+re);
+            re.printStackTrace();
+        } catch (Exception e) {
+            System.err.println("<Cliente: Excepcion: "+e);
+            e.printStackTrace();
+        }
     }
 
 }

src/spotify/stream/ServerStream.java

 package spotify.stream;
 import spotify.media.Globals;
 import spotify.rmi.common.SpotifyClient;
-import spotify.rmi.server.Utils;
 import java.io.*;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -28,7 +27,6 @@ public class ServerStream implements Runnable{
             System.out.println("--Stream Waiting...");
             Socket sock = servsock.accept();
             System.out.println("--Accepted connection : " + sock+"\n");
-            Utils.logMsg(streamLog, Utils.nowDate()+Globals.log_stream+sock);
             OutputStream os = null;
             FileInputStream fis = null;
             BufferedInputStream bis = null;
@@ -51,7 +49,6 @@ public class ServerStream implements Runnable{
                 }
                 os.flush();
                 System.out.println("--Done. (Sent total: " + total + ")");
-                Utils.logMsg(streamLog, Utils.nowDate()+Globals.log_stream_end+total);
             } catch (InterruptedException | IOException e) {
                 e.printStackTrace();
             }finally {