From 76d315724773dee550ba5a5035ad3823cd8ab127 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Tue, 25 Apr 2017 10:26:48 +0200 Subject: [PATCH 01/11] travis push to dockerhub --- .travis.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51c40faf..e28f2031 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,19 @@ before_install: - sudo apt-get -qq update - sudo apt-get -y -q install tesseract-ocr tesseract-ocr-fra tesseract-ocr-jpn - sudo apt-get -y -q install haveged && sudo service haveged start +after_success: + - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - export REPO=sismics/docs + - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` + - docker build -f Dockerfile -t $REPO:$COMMIT . + - docker tag $REPO:$COMMIT $REPO:$TAG + - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER + - docker push $REPO env: global: - - TESSDATA_PREFIX=/usr/share/tesseract-ocr - - LC_NUMERIC=C \ No newline at end of file + - TESSDATA_PREFIX=/usr/share/tesseract-ocr + - LC_NUMERIC=C + - secure: LRGpjWORb0qy6VuypZjTAfA8uRHlFUMTwb77cenS9PPRBxuSnctC531asS9Xg3DqC5nsRxBBprgfCKotn5S8nBSD1ceHh84NASyzLSBft3xSMbg7f/2i7MQ+pGVwLncusBU6E/drnMFwZBleo+9M8Tf96axY5zuUp90MUTpSgt0= + - secure: bCDDR6+I7PmSkuTYZv1HF/z98ANX/SFEESUCqxVmV5Gs0zFC0vQXaPJQ2xaJNRop1HZBFMZLeMMPleb0iOs985smpvK2F6Rbop9Tu+Vyo0uKqv9tbZ7F8Nfgnv9suHKZlL84FNeUQZJX6vsFIYPEJ/r7K5P/M0PdUy++fEwxEhU= + - secure: ewXnzbkgCIHpDWtaWGMa1OYZJ/ki99zcIl4jcDPIC0eB3njX/WgfcC6i0Ke9mLqDqwXarWJ6helm22sNh+xtQiz6isfBtBX+novfRt9AANrBe3koCMUemMDy7oh5VflBaFNP0DVb8LSCnwf6dx6ZB5E9EB8knvk40quc/cXpGjY= + - COMMIT=${TRAVIS_COMMIT::8} From 60021e512341e830ffa6ca378ab61d34f3730216 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Tue, 25 Apr 2017 10:39:58 +0200 Subject: [PATCH 02/11] build prod package before pushing to dockerhub --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e28f2031..6415cfd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ before_install: - sudo apt-get -y -q install tesseract-ocr tesseract-ocr-fra tesseract-ocr-jpn - sudo apt-get -y -q install haveged && sudo service haveged start after_success: - - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS + - mvn -Pprod -DskipTests clean install + - docker login -u $DOCKER_USER -p $DOCKER_PASS - export REPO=sismics/docs - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` - docker build -f Dockerfile -t $REPO:$COMMIT . From 6b0106e3850a09343f4900b11bbc5ce9b7dafc82 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Tue, 25 Apr 2017 11:09:18 +0200 Subject: [PATCH 03/11] update readme with docker instructions --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d2f9eb4f..0228e56a 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,16 @@ Download -------- The latest release is downloadable here: in WAR format. -You will need a Java webapp server to run it, like [Jetty](http://eclipse.org/jetty/) or [Tomcat](http://tomcat.apache.org/) +You will need a Java webapp server to run it, like [Jetty](http://eclipse.org/jetty/) or [Tomcat](http://tomcat.apache.org/). +The default admin password is "admin". Don't forget to change it before going to production. + +Install with Docker +------------------- + +From a Docker host, run this command to download and install Sismics Docs. The server will run on . +The default admin password is "admin". Don't forget to change it before going to production. + + docker run --rm --name sismics_docs_latest -d -p 8100:8080 -v sismics_docs_latest:/data sismics/docs:latest How to build Docs from the sources ---------------------------------- From c352b94b38e55a3e50f68b165b2a02eec800a53f Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:25:20 +0200 Subject: [PATCH 04/11] Closes #126: click to copy --- .../webapp/src/app/docs/controller/document/DocumentView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js index 1c1ce194..c8615295 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js @@ -100,7 +100,8 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta var title = 'Shared document'; var msg = 'You can share this document by giving this link. ' + 'Note that everyone having this link can see the document.
' + - ''; + ''; var btns = [ {result: 'unshare', label: 'Unshare', cssClass: 'btn-danger'}, {result: 'close', label: 'Close'} From e38bdbe50801106e34961ec2e26bf51a460a5458 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:27:24 +0200 Subject: [PATCH 05/11] Closes #128: Delete cursor on comment delete button --- docs-web/src/main/webapp/src/partial/docs/document.view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html index 3e94f557..8525d2eb 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.view.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html @@ -107,7 +107,7 @@

{{ comment.content }}
{{ comment.create_date | date: 'yyyy-MM-dd' }} - Delete

From 5f7d2f2a685bbc876b059376e1de036486fdf206 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:31:59 +0200 Subject: [PATCH 06/11] Closes #129: bigger checkbox --- .../src/main/webapp/src/partial/docs/document.default.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.default.html b/docs-web/src/main/webapp/src/partial/docs/document.default.html index c15b146b..dd0a6aca 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.default.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.default.html @@ -10,9 +10,9 @@ -
+
- +
From cbfa4b1c417c8932cf707feab35facbf47a3acb8 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:32:55 +0200 Subject: [PATCH 07/11] Closes #127: Edit -> Save --- docs-web/src/main/webapp/src/partial/docs/document.edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.edit.html b/docs-web/src/main/webapp/src/partial/docs/document.edit.html index 68fca1e4..30e9fc9b 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.edit.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.edit.html @@ -129,7 +129,7 @@
- +
From 3274b4c79ae2b520cc91bc0c2466d2359e8762a4 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:34:21 +0200 Subject: [PATCH 08/11] Closes #130: Fix document language icon --- docs-web/src/main/webapp/src/partial/docs/document.view.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.html b/docs-web/src/main/webapp/src/partial/docs/document.view.html index 8525d2eb..017c0b1e 100644 --- a/docs-web/src/main/webapp/src/partial/docs/document.view.html +++ b/docs-web/src/main/webapp/src/partial/docs/document.view.html @@ -40,9 +40,10 @@

- {{ document.title }} {{ document.create_date | date: 'yyyy-MM-dd' }} + {{ document.title }} + + {{ document.create_date | date: 'yyyy-MM-dd' }} by {{ document.creator }} -

From dcc7fe55f4711590499000373bbc5ec873600aeb Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 7 May 2017 01:39:20 +0200 Subject: [PATCH 09/11] Closes #125: Confirmation before deleting a comment --- .../docs/controller/document/DocumentView.js | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js index c8615295..41281950 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentView.js @@ -23,7 +23,7 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta */ $scope.comment = ''; $scope.addComment = function() { - if ($scope.comment.length == 0) { + if ($scope.comment.length === 0) { return; } @@ -40,8 +40,19 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta * Delete a comment. */ $scope.deleteComment = function(comment) { - Restangular.one('comment', comment.id).remove().then(function() { - $scope.comments.splice($scope.comments.indexOf(comment), 1); + var title = 'Delete comment'; + var msg = 'Do you really want to delete this comment?'; + var btns = [ + {result: 'cancel', label: 'Cancel'}, + {result: 'ok', label: 'OK', cssClass: 'btn-primary'} + ]; + + $dialog.messageBox(title, msg, btns, function (result) { + if (result === 'ok') { + Restangular.one('comment', comment.id).remove().then(function() { + $scope.comments.splice($scope.comments.indexOf(comment), 1); + }); + } }); }; @@ -57,7 +68,7 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta ]; $dialog.messageBox(title, msg, btns, function (result) { - if (result == 'ok') { + if (result === 'ok') { Restangular.one('document', document.id).remove().then(function() { $scope.loadDocuments(); $state.go('document.default'); @@ -74,7 +85,7 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta templateUrl: 'partial/docs/document.share.html', controller: 'DocumentModalShare' }).result.then(function (name) { - if (name == null) { + if (name === null) { return; } @@ -108,11 +119,11 @@ angular.module('docs').controller('DocumentView', function ($scope, $state, $sta ]; $dialog.messageBox(title, msg, btns, function (result) { - if (result == 'unshare') { + if (result === 'unshare') { // Unshare this document and update the local shares Restangular.one('share', share.id).remove().then(function () { $scope.document.acls = _.reject($scope.document.acls, function(s) { - return share.id == s.id; + return share.id === s.id; }); }); } From 330de495dbffa24aa999da13f8fda642a04f5bdc Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Sun, 11 Jun 2017 11:33:30 +0200 Subject: [PATCH 10/11] #118: extract text content from text plain files (WIP) --- .../com/sismics/docs/core/util/FileUtil.java | 10 ++-- .../com/sismics/docs/core/util/PdfUtil.java | 28 ++++++--- .../com/sismics/util/mime/MimeTypeUtil.java | 36 ++++++----- .../docs/rest/TestDocumentResource.java | 59 +++++++++++++++++++ docs-web/src/test/resources/file/document.txt | 2 + 5 files changed, 106 insertions(+), 29 deletions(-) create mode 100644 docs-web/src/test/resources/file/document.txt diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java b/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java index 2a005fce..a12637fa 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java +++ b/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java @@ -64,11 +64,12 @@ public class FileUtil { private static String ocrFile(InputStream inputStream, String language) { Tesseract instance = Tesseract.getInstance(); String content = null; - BufferedImage image = null; + BufferedImage image; try { image = ImageIO.read(inputStream); } catch (IOException e) { log.error("Error reading the image", e); + return null; } // Upscale and grayscale the image @@ -92,10 +93,9 @@ public class FileUtil { * Save a file on the storage filesystem. * * @param inputStream Unencrypted input stream - * @param pdf + * @param pdfInputStream PDF input stream * @param file File to save * @param privateKey Private key used for encryption - * @throws Exception */ public static void save(InputStream inputStream, InputStream pdfInputStream, File file, String privateKey) throws Exception { Cipher cipher = EncryptionUtil.getEncryptionCipher(privateKey); @@ -114,9 +114,8 @@ public class FileUtil { * @param inputStream Unencrypted input stream * @param pdfInputStream Unencrypted PDF input stream * @param cipher Cipher to use for encryption - * @throws Exception */ - public static void saveVariations(File file, InputStream inputStream, InputStream pdfInputStream, Cipher cipher) throws Exception { + private static void saveVariations(File file, InputStream inputStream, InputStream pdfInputStream, Cipher cipher) throws Exception { BufferedImage image = null; if (ImageUtil.isImage(file.getMimeType())) { image = ImageIO.read(inputStream); @@ -151,7 +150,6 @@ public class FileUtil { * Remove a file from the storage filesystem. * * @param file File to delete - * @throws IOException */ public static void delete(File file) throws IOException { Path storedFile = DirectoryUtil.getStorageDirectory().resolve(file.getId()); diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java b/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java index f1268545..7ef06102 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java +++ b/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java @@ -86,7 +86,6 @@ public class PdfUtil { * @param inputStream InputStream * @param reset Reset the stream after usage * @return PDF input stream - * @throws Exception */ public static InputStream convertToPdf(File file, InputStream inputStream, boolean reset) throws Exception { if (file.getMimeType().equals(MimeType.APPLICATION_PDF)) { @@ -101,18 +100,36 @@ public class PdfUtil { if (file.getMimeType().equals(MimeType.OPEN_DOCUMENT_TEXT)) { return convertOpenDocumentText(inputStream, reset); } - + + if (file.getMimeType().equals(MimeType.TEXT_PLAIN) || file.getMimeType().equals(MimeType.TEXT_CSV)) { + return convertTextPlain(inputStream, reset); + } + // PDF conversion not necessary/possible return null; } - + + /** + * Convert a text plain document to PDF. + * + * @param inputStream Unecnrypted input stream + * @param reset Reset the stream after usage + * @return PDF input stream + */ + private static InputStream convertTextPlain(InputStream inputStream, boolean reset) throws Exception { + if (reset) { + inputStream.reset(); + } + // TODO Create a PDF from the text plain + return null; + } + /** * Convert an open document text file to PDF. * * @param inputStream Unencrypted input stream * @param reset Reset the stream after usage * @return PDF input stream - * @throws Exception */ private static InputStream convertOpenDocumentText(InputStream inputStream, boolean reset) throws Exception { ByteArrayOutputStream pdfOutputStream = new ByteArrayOutputStream(); @@ -131,7 +148,6 @@ public class PdfUtil { * @param inputStream Unencrypted input stream * @param reset Reset the stream after usage * @return PDF input stream - * @throws Exception */ private static InputStream convertOfficeDocument(InputStream inputStream, boolean reset) throws Exception { ByteArrayOutputStream pdfOutputStream = new ByteArrayOutputStream(); @@ -153,7 +169,6 @@ public class PdfUtil { * @param metadata Add a page with metadata * @param margin Margins in millimeters * @return PDF input stream - * @throws IOException */ public static InputStream convertToPdf(DocumentDto documentDto, List fileList, boolean fitImageToPage, boolean metadata, int margin) throws Exception { @@ -282,7 +297,6 @@ public class PdfUtil { * * @param inputStream PDF document * @return Render of the first page - * @throws IOException */ public static BufferedImage renderFirstPage(InputStream inputStream) throws IOException { try (PDDocument pdfDocument = PDDocument.load(inputStream)) { diff --git a/docs-core/src/main/java/com/sismics/util/mime/MimeTypeUtil.java b/docs-core/src/main/java/com/sismics/util/mime/MimeTypeUtil.java index 124d03ab..740a6c7c 100644 --- a/docs-core/src/main/java/com/sismics/util/mime/MimeTypeUtil.java +++ b/docs-core/src/main/java/com/sismics/util/mime/MimeTypeUtil.java @@ -78,22 +78,26 @@ public class MimeTypeUtil { */ public static String getFileExtension(String mimeType) { switch (mimeType) { - case MimeType.APPLICATION_ZIP: - return "zip"; - case MimeType.IMAGE_GIF: - return "gif"; - case MimeType.IMAGE_JPEG: - return "jpg"; - case MimeType.IMAGE_PNG: - return "png"; - case MimeType.APPLICATION_PDF: - return "pdf"; - case MimeType.OPEN_DOCUMENT_TEXT: - return "odt"; - case MimeType.OFFICE_DOCUMENT: - return "docx"; - default: - return "bin"; + case MimeType.APPLICATION_ZIP: + return "zip"; + case MimeType.IMAGE_GIF: + return "gif"; + case MimeType.IMAGE_JPEG: + return "jpg"; + case MimeType.IMAGE_PNG: + return "png"; + case MimeType.APPLICATION_PDF: + return "pdf"; + case MimeType.OPEN_DOCUMENT_TEXT: + return "odt"; + case MimeType.OFFICE_DOCUMENT: + return "docx"; + case MimeType.TEXT_PLAIN: + return "txt"; + case MimeType.TEXT_CSV: + return "csv"; + default: + return "bin"; } } diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java index 6af38820..d463613e 100644 --- a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java +++ b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java @@ -545,4 +545,63 @@ public class TestDocumentResource extends BaseJerseyTest { Assert.assertTrue(fileBytes.length > 0); // Images rendered from PDF differ in size from OS to OS due to font issues Assert.assertEquals(MimeType.IMAGE_JPEG, MimeTypeUtil.guessMimeType(fileBytes, null)); } + + /** + * Test plain text extraction. + * + * @throws Exception e + */ + @Test + public void testPlainTextExtraction() throws Exception { + // Login document_docx + clientUtil.createUser("document_plain"); + String documentPlainToken = clientUtil.login("document_plain"); + + // Create a document + long create1Date = new Date().getTime(); + JsonObject json = target().path("/document").request() + .cookie(TokenBasedSecurityFilter.COOKIE_NAME, documentPlainToken) + .put(Entity.form(new Form() + .param("title", "My super title document 1") + .param("description", "My super description for document 1") + .param("language", "eng") + .param("create_date", Long.toString(create1Date))), JsonObject.class); + String document1Id = json.getString("id"); + Assert.assertNotNull(document1Id); + + // Add a PDF file + String file1Id; + try (InputStream is = Resources.getResource("file/document.txt").openStream()) { + StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("file", is, "document.txt"); + try (FormDataMultiPart multiPart = new FormDataMultiPart()) { + json = target() + .register(MultiPartFeature.class) + .path("/file").request() + .cookie(TokenBasedSecurityFilter.COOKIE_NAME, documentPlainToken) + .put(Entity.entity(multiPart.field("id", document1Id).bodyPart(streamDataBodyPart), + MediaType.MULTIPART_FORM_DATA_TYPE), JsonObject.class); + file1Id = json.getString("id"); + Assert.assertNotNull(file1Id); + } + } + + // Search documents by query in full content + json = target().path("/document/list") + .queryParam("search", "full:love") + .request() + .cookie(TokenBasedSecurityFilter.COOKIE_NAME, documentPlainToken) + .get(JsonObject.class); + Assert.assertTrue(json.getJsonArray("documents").size() == 1); + + // Get the file thumbnail data + Response response = target().path("/file/" + file1Id + "/data") + .queryParam("size", "thumb") + .request() + .cookie(TokenBasedSecurityFilter.COOKIE_NAME, documentPlainToken) + .get(); + InputStream is = (InputStream) response.getEntity(); + byte[] fileBytes = ByteStreams.toByteArray(is); + Assert.assertTrue(fileBytes.length > 0); // Images rendered from PDF differ in size from OS to OS due to font issues + Assert.assertEquals(MimeType.IMAGE_JPEG, MimeTypeUtil.guessMimeType(fileBytes, null)); + } } \ No newline at end of file diff --git a/docs-web/src/test/resources/file/document.txt b/docs-web/src/test/resources/file/document.txt new file mode 100644 index 00000000..58b1387f --- /dev/null +++ b/docs-web/src/test/resources/file/document.txt @@ -0,0 +1,2 @@ +This is a test document +Please love me \ No newline at end of file From e0214a6a9f969e17fc454f615bb9dae031377203 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Mon, 31 Jul 2017 01:51:23 +0200 Subject: [PATCH 11/11] Closes #118: create pdf from text plain files --- .../com/sismics/docs/core/util/FileUtil.java | 28 +++++----- .../com/sismics/docs/core/util/PdfUtil.java | 55 +++++++++++-------- .../docs/rest/TestDocumentResource.java | 32 +++++------ docs-web/src/test/resources/file/document.txt | 4 +- 4 files changed, 64 insertions(+), 55 deletions(-) diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java b/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java index a12637fa..515a0d3f 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java +++ b/docs-core/src/main/java/com/sismics/docs/core/util/FileUtil.java @@ -1,26 +1,24 @@ package com.sismics.docs.core.util; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.nio.file.Files; -import java.nio.file.Path; - -import javax.crypto.Cipher; -import javax.crypto.CipherInputStream; -import javax.crypto.CipherOutputStream; -import javax.imageio.ImageIO; - +import com.sismics.docs.core.model.jpa.File; +import com.sismics.tess4j.Tesseract; +import com.sismics.util.ImageUtil; import org.imgscalr.Scalr; import org.imgscalr.Scalr.Method; import org.imgscalr.Scalr.Mode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.sismics.docs.core.model.jpa.File; -import com.sismics.tess4j.Tesseract; -import com.sismics.util.ImageUtil; +import javax.crypto.Cipher; +import javax.crypto.CipherInputStream; +import javax.crypto.CipherOutputStream; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; /** * File entity utilities. diff --git a/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java b/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java index 7ef06102..c6b8971a 100644 --- a/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java +++ b/docs-core/src/main/java/com/sismics/docs/core/util/PdfUtil.java @@ -1,18 +1,16 @@ package com.sismics.docs.core.util; -import java.awt.image.BufferedImage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import javax.imageio.ImageIO; - +import com.google.common.base.Charsets; +import com.google.common.base.Strings; +import com.google.common.io.CharStreams; +import com.google.common.io.Closer; +import com.lowagie.text.*; +import com.lowagie.text.pdf.PdfWriter; +import com.sismics.docs.core.dao.jpa.dto.DocumentDto; +import com.sismics.docs.core.model.jpa.File; +import com.sismics.docs.core.util.pdf.PdfPage; +import com.sismics.util.ImageUtil; +import com.sismics.util.mime.MimeType; import org.apache.pdfbox.io.MemoryUsageSetting; import org.apache.pdfbox.multipdf.PDFMergerUtility; import org.apache.pdfbox.pdmodel.PDDocument; @@ -32,13 +30,14 @@ import org.odftoolkit.odfdom.doc.OdfTextDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Strings; -import com.google.common.io.Closer; -import com.sismics.docs.core.dao.jpa.dto.DocumentDto; -import com.sismics.docs.core.model.jpa.File; -import com.sismics.docs.core.util.pdf.PdfPage; -import com.sismics.util.ImageUtil; -import com.sismics.util.mime.MimeType; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; /** * PDF utilities. @@ -120,8 +119,20 @@ public class PdfUtil { if (reset) { inputStream.reset(); } - // TODO Create a PDF from the text plain - return null; + + Document output = new Document(PageSize.A4, 40, 40, 40, 40); + ByteArrayOutputStream pdfOutputStream = new ByteArrayOutputStream(); + PdfWriter.getInstance(output, pdfOutputStream); + + output.open(); + String content = CharStreams.toString(new InputStreamReader(inputStream, Charsets.UTF_8)); + Font font = FontFactory.getFont(FontFactory.COURIER); + Paragraph paragraph = new Paragraph(content, font); + paragraph.setAlignment(Element.ALIGN_LEFT); + output.add(paragraph); + output.close(); + + return new ByteArrayInputStream(pdfOutputStream.toByteArray()); } /** diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java index d463613e..a6989d09 100644 --- a/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java +++ b/docs-web/src/test/java/com/sismics/docs/rest/TestDocumentResource.java @@ -1,7 +1,17 @@ package com.sismics.docs.rest; -import java.io.InputStream; -import java.util.Date; +import com.google.common.io.ByteStreams; +import com.google.common.io.Resources; +import com.sismics.docs.core.util.DirectoryUtil; +import com.sismics.util.filter.TokenBasedSecurityFilter; +import com.sismics.util.mime.MimeType; +import com.sismics.util.mime.MimeTypeUtil; +import org.glassfish.jersey.media.multipart.FormDataMultiPart; +import org.glassfish.jersey.media.multipart.MultiPartFeature; +import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart; +import org.joda.time.format.DateTimeFormat; +import org.junit.Assert; +import org.junit.Test; import javax.json.JsonArray; import javax.json.JsonObject; @@ -10,20 +20,8 @@ import javax.ws.rs.core.Form; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; - -import org.glassfish.jersey.media.multipart.FormDataMultiPart; -import org.glassfish.jersey.media.multipart.MultiPartFeature; -import org.glassfish.jersey.media.multipart.file.StreamDataBodyPart; -import org.joda.time.format.DateTimeFormat; -import org.junit.Assert; -import org.junit.Test; - -import com.google.common.io.ByteStreams; -import com.google.common.io.Resources; -import com.sismics.docs.core.util.DirectoryUtil; -import com.sismics.util.filter.TokenBasedSecurityFilter; -import com.sismics.util.mime.MimeType; -import com.sismics.util.mime.MimeTypeUtil; +import java.io.InputStream; +import java.util.Date; /** * Exhaustive test of the document resource. @@ -569,7 +567,7 @@ public class TestDocumentResource extends BaseJerseyTest { String document1Id = json.getString("id"); Assert.assertNotNull(document1Id); - // Add a PDF file + // Add a plain text file String file1Id; try (InputStream is = Resources.getResource("file/document.txt").openStream()) { StreamDataBodyPart streamDataBodyPart = new StreamDataBodyPart("file", is, "document.txt"); diff --git a/docs-web/src/test/resources/file/document.txt b/docs-web/src/test/resources/file/document.txt index 58b1387f..5c0a4679 100644 --- a/docs-web/src/test/resources/file/document.txt +++ b/docs-web/src/test/resources/file/document.txt @@ -1,2 +1,4 @@ This is a test document -Please love me \ No newline at end of file +Please love me +&é"'(-è_çà)=$^ù* +조선글 \ No newline at end of file