From a0e9d894a6e2d1ee1b0bb7796474c50aaab4663b Mon Sep 17 00:00:00 2001 From: Manoel Silva <69607669+manoelmms@users.noreply.github.com> Date: Fri, 11 Mar 2022 09:52:39 -0300 Subject: [PATCH] =?UTF-8?q?Remo=C3=A7=C3=A3o=20de=20arquivos=20desnecess?= =?UTF-8?q?=C3=A1rios=20e=20Coment=C3=A1rios=20extras?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../ic/trabalhofinal/FileUploadService.java | 1 + .../ufrj/ic/trabalhofinal/MusicResource.java | 1 + .../ufrj/ic/trabalhofinal/SalvarResource.java | 4 + .../ic/trabalhofinal/css/music-resource.css | 113 ------------------ .../ic/trabalhofinal/css/salvar-resource.css | 78 ------------ .../ic/trabalhofinal/css/upload-resource.css | 81 ------------- target/TrabalhoFinal-1.0-SNAPSHOT.war | Bin 86076 -> 86079 bytes .../ic/trabalhofinal/FileUploadService.class | Bin 3263 -> 3263 bytes .../ufrj/ic/trabalhofinal/MusicResource.class | Bin 9717 -> 9717 bytes .../ic/trabalhofinal/SalvarResource.class | Bin 4229 -> 4229 bytes .../ic/trabalhofinal/FileUploadService.class | Bin 3263 -> 3263 bytes .../ufrj/ic/trabalhofinal/MusicResource.class | Bin 9717 -> 9717 bytes .../ic/trabalhofinal/SalvarResource.class | Bin 4229 -> 4229 bytes 14 files changed, 7 insertions(+), 273 deletions(-) delete mode 100644 src/main/java/br/ufrj/ic/trabalhofinal/css/music-resource.css delete mode 100644 src/main/java/br/ufrj/ic/trabalhofinal/css/salvar-resource.css delete mode 100644 src/main/java/br/ufrj/ic/trabalhofinal/css/upload-resource.css diff --git a/README.md b/README.md index 036e3df..e51dd60 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Esta é uma aplicação feita para o projeto final de Computação II em 2021.2 ## Funcionamento -- Ao fazer deploy do .war no GlassFish 5, o caminho para a página inicial é em ***/TrabalhoFinal-1.0-SNAPSHOT/api/file*** +- Ao fazer deploy do .war no GlassFish 5 usando Java 1.8 (Temurin-1.8), o caminho para a página inicial é em ***/TrabalhoFinal-1.0-SNAPSHOT/api/file*** - Na página inicial, será requisitado o MP3 a ser lido ou modificado[^1]: diff --git a/src/main/java/br/ufrj/ic/trabalhofinal/FileUploadService.java b/src/main/java/br/ufrj/ic/trabalhofinal/FileUploadService.java index 906f854..40c7fc3 100644 --- a/src/main/java/br/ufrj/ic/trabalhofinal/FileUploadService.java +++ b/src/main/java/br/ufrj/ic/trabalhofinal/FileUploadService.java @@ -37,6 +37,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) } } + //Nomes com & dão problema ao ler private String nameWithoutAmpersand(String filename) { StringBuilder str = new StringBuilder(); diff --git a/src/main/java/br/ufrj/ic/trabalhofinal/MusicResource.java b/src/main/java/br/ufrj/ic/trabalhofinal/MusicResource.java index 9cb8c0a..c482173 100644 --- a/src/main/java/br/ufrj/ic/trabalhofinal/MusicResource.java +++ b/src/main/java/br/ufrj/ic/trabalhofinal/MusicResource.java @@ -110,6 +110,7 @@ private static LinkedHashMap genresMap() { return genres; } + //Gera um Select dos gêneros usando um for-loop no genresMap, pois o ID3v23 só permite gêneros predefinidos private static String GenreHtmlSelect() throws IOException, UnsupportedTagException, InvalidDataException { LinkedHashMap genres = genresMap(); LinkedHashMap mutableInfoMP3 = MusicApplication.mutableData(MusicApplication.FILEPATH); diff --git a/src/main/java/br/ufrj/ic/trabalhofinal/SalvarResource.java b/src/main/java/br/ufrj/ic/trabalhofinal/SalvarResource.java index a004540..65096dd 100644 --- a/src/main/java/br/ufrj/ic/trabalhofinal/SalvarResource.java +++ b/src/main/java/br/ufrj/ic/trabalhofinal/SalvarResource.java @@ -40,12 +40,14 @@ public String Salvar(@QueryParam("título") @DefaultValue("") String titulo, byte[] albumImageData = null; String mimeType = null; + //Uma tag ID3v2 pode ter uma capa de álbum, logo é necessário salvar if (mp3file.hasId3v2Tag()) { oldId3v2Tag = mp3file.getId3v2Tag(); albumImageData = oldId3v2Tag.getAlbumImage(); mimeType = oldId3v2Tag.getAlbumImageMimeType(); } + //remove o antigo para colocar os novos parâmetros sem interferência mp3file.removeId3v2Tag(); ID3v2 id3v2Tag; id3v2Tag = new ID3v24Tag(); @@ -64,10 +66,12 @@ public String Salvar(@QueryParam("título") @DefaultValue("") String titulo, id3v2Tag.setUrl(url); id3v2Tag.setEncoder(encoder); + //Se for selecionado "nenhum" como gênero não será configurado um gênero if (!genero.equals("-1")) { id3v2Tag.setGenre(Integer.parseInt(genero)); } + //Se a tag suporta capa, será recolocado aqui if (oldId3v2Tag != null) { id3v2Tag.setAlbumImage(albumImageData, mimeType); } diff --git a/src/main/java/br/ufrj/ic/trabalhofinal/css/music-resource.css b/src/main/java/br/ufrj/ic/trabalhofinal/css/music-resource.css deleted file mode 100644 index cf79c1e..0000000 --- a/src/main/java/br/ufrj/ic/trabalhofinal/css/music-resource.css +++ /dev/null @@ -1,113 +0,0 @@ -*{ - margin: 0; - padding: 0; - box-sizing: border-box; - font-family: Verdana, SansSerif; -} - -body{ - background-color: #13293D; -} - -nav{ - display: flex; - justify-content: space-between; - align-items: center; - background: #006494; - height: 8vh; -} - -h1{ - color: white; - margin-left: 3vh; - -} - -a{ - color: white; - text-decoration: none; - margin-right: 3vh; -} - -a:hover{ - color: red; - opacity: 0.8; -} - -main{ - margin-top: 3vh; - display: grid; - grid-gap: 20px; - height: 89vh; -} - -form, .immutables{ - width: 99%; - background: #E8F1F2; - padding: 35px 35px; - margin-left: 5px; - margin-right: 5px; - border-radius: 10px; - grid-row: 2; -} - -form{ - grid-column: 2; -} - -fieldset{ - font-size: 15px; - display: flex; - flex-wrap: wrap; - justify-content: space-between; - border: none; -} - - -legend, h2{ - font-size: 40px; - margin-bottom: 10px; - font-weight: 500; -} - -.form-div{ - width: calc(100%/2 - 20px); - margin-bottom: 1vh; -} - -input, select{ - height: 30px; - width: 100%; - padding-left: 15px; - border-radius: 10px; - border: 2px; - border-style: inset; -} - -.mutable-label{ - font-weight: 500; - margin-bottom: 10px; -} - -.immutables{ - grid-column: 1; -} - -.immutables ul{ - list-style: none; -} - -.immutables li{ - margin-top: 5px; -} - -.immutables li::before{ - content: "■"; - padding-right: 8px; -} - -h1{ - text-align: center; - justify-content: center; - color: white; -} diff --git a/src/main/java/br/ufrj/ic/trabalhofinal/css/salvar-resource.css b/src/main/java/br/ufrj/ic/trabalhofinal/css/salvar-resource.css deleted file mode 100644 index 30be0ea..0000000 --- a/src/main/java/br/ufrj/ic/trabalhofinal/css/salvar-resource.css +++ /dev/null @@ -1,78 +0,0 @@ -*{ - margin: 0; - padding: 0; - box-sizing: border-box; - font-family: Verdana, SansSerif; -} - -body{ - background-color: #13293D; - vertical-align: top; -} - -h1{ - color: white; - margin-left: 3vh; -} - -nav{ - display: flex; - justify-content: space-between; - align-items: center; - background: #006494; - height: 8vh; -} - -a{ - color: white; - text-decoration: none; -} - -a:hover{ - color: red; - opacity: 0.8; - margin-right: 3vh; -} - -main{ - width: 75vh; - height: 75vh; - background: #E8F1F2; - margin: auto; - top: 50%; - vertical-align: auto; - padding: 20px 35px 10px; - border-radius: 10px; - -} - -h2{ - flex-direction: column; - justify-content: center; - align-items: center; - display: flex; - width: 100%; -} - - - -download-div{ - position: absolute; - grid-row: 2/5; - background-color: rgba(0, 0, 255, 0.1); - border-radius: 10px; - margin-bottom: 10px; -} - -#download-image{ - width: 100%; - height: 100%; - color: black; - margin-bottom: auto; - background-color: rgba(0, 0, 255, 0.1);; -} - -#download-image:hover{ - color: black; - background-color: rgba(9, 236, 100, 0.2);; -} \ No newline at end of file diff --git a/src/main/java/br/ufrj/ic/trabalhofinal/css/upload-resource.css b/src/main/java/br/ufrj/ic/trabalhofinal/css/upload-resource.css deleted file mode 100644 index 5099b0d..0000000 --- a/src/main/java/br/ufrj/ic/trabalhofinal/css/upload-resource.css +++ /dev/null @@ -1,81 +0,0 @@ -*{ - margin: 0; - padding: 0; - box-sizing: border-box; - font-family: Verdana, SansSerif; -} - -body{ - background-color: #13293D; - display: flex; - align-items: center; - justify-content: center; -} - -form{ - width: 75vh; - height: 75vh; - background: #E8F1F2; - margin: 5px; - padding: 20px 35px 10px; - border-radius: 10px; - display: grid; - box-sizing: border-box; - grid-template-rows: repeat(5, auto); - text-align: center; -} - -h1, label{ - display: flex; - text-align: center; - justify-content: center; - align-items: center; -} - -.file-selector{ - grid-row: 2/5; - background: rgba(0, 0, 255, 0.1); - border-radius: 10px; - margin-bottom: 10px; -} - -label{ - display: flex; - position: relative; - width: 100%; - height: 100%; - color: black; - align-items: center; - flex-direction: column; - justify-content: center ; - cursor: pointer; -} - - -#file{ - position: absolute; - bottom: 20px; - left: 20px; -} - -::file-selector-button { - display: none; -} - - -#enviar{ - border: none; - margin-left: auto; - margin-right: auto; - border-radius: 10px; - width: 50%; - text-decoration: none; - display: inline-block; - font-size: 16px; - background-color: rgba(0, 0, 255, 0.1);; -} - -#enviar:hover, .file-selector:hover{ - background-color: rgba(133, 25, 150, 0.1); -} - diff --git a/target/TrabalhoFinal-1.0-SNAPSHOT.war b/target/TrabalhoFinal-1.0-SNAPSHOT.war index 767b5a2a9d464d1157d77cdd7470fa5520e442cd..11210e86cc7942aa1775be2ee11c928a6e0bb8e9 100644 GIT binary patch delta 9464 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 delta 9481 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 BCh-6O diff --git a/target/TrabalhoFinal-1.0-SNAPSHOT/WEB-INF/classes/br/ufrj/ic/trabalhofinal/FileUploadService.class b/target/TrabalhoFinal-1.0-SNAPSHOT/WEB-INF/classes/br/ufrj/ic/trabalhofinal/FileUploadService.class index aed2696f739a771656b5077d68dfeefa8ef4ef16..6e45b1b1614cc78c2ac7ec57b563a2683a712031 100644 GIT binary patch delta 37 rcmdllxnFXF1COK@0|$c+gAju*gA9WngC>Ik5b7|PF&IydJMg8`6l#$Yr#k|zxSf@TIH diff --git a/target/TrabalhoFinal-1.0-SNAPSHOT/WEB-INF/classes/br/ufrj/ic/trabalhofinal/MusicResource.class b/target/TrabalhoFinal-1.0-SNAPSHOT/WEB-INF/classes/br/ufrj/ic/trabalhofinal/MusicResource.class index 2942c5077827c6352a5b29bcde41915328fe2d2e..a60b63760bddcc3c4dd26b62ea633b0805a62df5 100644 GIT binary patch delta 64 zcmezB{ndK|qoQsx0}De50~bRX1201bgEm7Yg9$?wgBL?JLlZ+S!!CvfhW9|$Cx#YA THiovzdW!oQyEea5WM=^Y8GsQj delta 64 zcmezB{ndK|qoQsR0}Dej0~bRn12024gEm72g9$?=gBL>;LlZ*{!!Cw;hW8AO44)X9 U8QB6&Ebm*2h5 zI=N2%U8D04pHhm_zGZY|4djgEO%=>SStwa5TdCNn+N#;9`}Jk7;SkQFrjwSlwo6cM ey6*ZOL3XGkmHnys_v4`IsOF^Mtm&fV frtKbR55JzeUV8gZIk5b7|PF&IydJMg8`6l#$Yr#k|zxSf@TIH diff --git a/target/classes/br/ufrj/ic/trabalhofinal/MusicResource.class b/target/classes/br/ufrj/ic/trabalhofinal/MusicResource.class index 2942c5077827c6352a5b29bcde41915328fe2d2e..a60b63760bddcc3c4dd26b62ea633b0805a62df5 100644 GIT binary patch delta 64 zcmezB{ndK|qoQsx0}De50~bRX1201bgEm7Yg9$?wgBL?JLlZ+S!!CvfhW9|$Cx#YA THiovzdW!oQyEea5WM=^Y8GsQj delta 64 zcmezB{ndK|qoQsR0}Dej0~bRn12024gEm72g9$?=gBL>;LlZ*{!!Cw;hW8AO44)X9 U8QB6&Ebm*2h5 zI=N2%U8D04pHhm_zGZY|4djgEO%=>SStwa5TdCNn+N#;9`}Jk7;SkQFrjwSlwo6cM ey6*ZOL3XGkmHnys_v4`IsOF^Mtm&fV frtKbR55JzeUV8gZ