Final

Author: manoelmms

.idea/runConfigurations.xml

@@ -1,3 +1,8 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
 import javax.ws.rs.GET;

src/main/java/br/ufrj/ic/trabalhofinal/ErroResource.java

@@ -1,10 +1,19 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.URLDecoder;
 
 import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 @WebServlet("/api/download/*")
 public class FileDownloadService extends HttpServlet {

src/main/java/br/ufrj/ic/trabalhofinal/FileDownloadService.java

@@ -1,3 +1,8 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
 import javax.servlet.ServletException;

src/main/java/br/ufrj/ic/trabalhofinal/FileUploadService.java

@@ -1,3 +1,8 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
 import com.mpatric.mp3agic.*;
@@ -6,8 +11,7 @@
 import java.util.LinkedHashMap;
 
 import javax.servlet.annotation.MultipartConfig;
-import javax.swing.text.StyledEditorKit;
-import javax.ws.rs.*;
+import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
 
@@ -39,7 +43,7 @@ protected static LinkedHashMap<String, Object> immutableData(String filepath) th
             mp3Info.put("tamanho", (mp3file.getLength() + " bytes"));
             mp3Info.put("taxa de bits", mp3file.getBitrate() + " kbps " + "(" + vbrString(mp3file.isVbr())+")");
             mp3Info.put("versão do MP3", mp3file.getVersion());
-            mp3Info.put("taxa de amostragem", mp3file.getSampleRate() + "Hz");
+            mp3Info.put("taxa de amostragem", mp3file.getSampleRate() + " Hz");
             mp3Info.put("channel", mp3file.getChannelMode());
             mp3Info.put("id3v1", englishBoolToPortugueseHave(mp3file.hasId3v1Tag()));
             mp3Info.put("id3v2", englishBoolToPortugueseHave(mp3file.hasId3v2Tag()));

src/main/java/br/ufrj/ic/trabalhofinal/MusicApplication.java

@@ -1,3 +1,8 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
 import com.mpatric.mp3agic.InvalidDataException;
@@ -56,7 +61,7 @@ private static String immutableObjectsHTML() throws IOException, UnsupportedTagE
         Map<String, Object> immutableInfoMP3 = MusicApplication.immutableData(MusicApplication.FILEPATH);
 
         String immutablesHtml = "<div class=immutables>";
-        immutablesHtml += "<h2>Dados imutáveis</h2>";
+        immutablesHtml += "<h2>Dados do Arquivo</h2>";
         immutablesHtml += "<ul>";
 
         for (Map.Entry<String, Object> tags : immutableInfoMP3.entrySet()) {
@@ -70,10 +75,10 @@ private static String immutableObjectsHTML() throws IOException, UnsupportedTagE
 
     private static String htmlForm(String filename) throws IOException, UnsupportedTagException, InvalidDataException {
         LinkedHashMap<String, String> mutableInfoMP3 = MusicApplication.mutableData(MusicApplication.FILEPATH);
-        mutableInfoMP3.put("filename", filename.replace(".mp3", ""));
+        mutableInfoMP3.put("nome do arquivo", filename.replace(".mp3", ""));
 
         String formHtml = "<form method=\"GET\" action=\"salvar\">";
-        formHtml += "<fieldset><legend>Dados mutáveis</legend>";
+        formHtml += "<fieldset><legend>Metadados do MP3</legend>";
 
         for (Map.Entry<String,String> tags : mutableInfoMP3.entrySet()) {
             formHtml += "<div class=\"form-div\">";

src/main/java/br/ufrj/ic/trabalhofinal/MusicResource.java

@@ -1,3 +1,8 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
 import com.mpatric.mp3agic.ID3v2;
@@ -6,6 +11,7 @@
 
 import javax.ws.rs.*;
 
+
 @Path("/salvar")
 public class SalvarResource {
 
@@ -24,7 +30,7 @@ public String Salvar(@QueryParam("título") @DefaultValue("") String titulo,
                          @QueryParam("url") @DefaultValue("") String url,
                          @QueryParam("encoder") @DefaultValue("") String encoder,
                          @QueryParam("artista do álbum") @DefaultValue("") String artAlbum,
-                         @QueryParam("filename") @DefaultValue("") String filename){
+                         @QueryParam("nome do arquivo") @DefaultValue("") String filename){
 
         try {
             filename += ".mp3";
@@ -84,7 +90,7 @@ private static String sucessoHTML(String filename) {
                 "<h1>Download do Arquivo</h1><p><a href=\"file\">Escolher outra música →</a></p>" +
                 "</nav></header>" +
                 "<main>"+
-                "<h2>Sucesso no Upload!</h2>" +
+                "<h2>Alterado com Sucesso!</h2>" +
                 "<div id=\"download-div\">" +
                 "<form method=\"GET\" action=\"download\\" + filename + "\">" +
                 "<input id=\"download-image\" type=\"submit\" value=\"Download\">\n" +

src/main/java/br/ufrj/ic/trabalhofinal/SalvarResource.java

@@ -1,3 +1,8 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
 public class Styles {

src/main/java/br/ufrj/ic/trabalhofinal/Styles.java

@@ -1,6 +1,13 @@
+/*
+ *Manoel Marcelo da Silva (DRE: 121088349)
+ *Lucas de Lyra Monteiro (DRE: 121039714)
+ */
+
 package br.ufrj.ic.trabalhofinal;
 
-import javax.ws.rs.*;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 
 @Path("/file") //Página Inicial
 public class UploadResource{