From 916217df4f7ab36363db99aafb35451fdb09d71c Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 01:25:24 +0200 Subject: [PATCH 01/46] Make convert-all-pdfs an admin endpoint --- Changelog.md | 3 + .../scala/docspell/backend/JobFactory.scala | 8 +-- .../scala/docspell/backend/ops/OItem.scala | 6 +- .../src/main/resources/docspell-openapi.yml | 58 ++++++++++--------- .../restserver/routes/AttachmentRoutes.scala | 22 ++++--- .../restserver/routes/ItemRoutes.scala | 7 --- 6 files changed, 56 insertions(+), 48 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1f628076..537e7052 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,9 @@ ### Rest API Changes +- Removed `sec/item/convertallpdfs` endpoint in favor for new + `admin/attachments/convertallpdfs` endpoint which is now an admin + task - Removed `sec/collective/previews` endpoint, in favor for new `admin/attachments/generatePreviews` endpoint which is now an admin task to generate previews for all files. The now removed enpoint did diff --git a/modules/backend/src/main/scala/docspell/backend/JobFactory.scala b/modules/backend/src/main/scala/docspell/backend/JobFactory.scala index e1d11a9d..2c1cd242 100644 --- a/modules/backend/src/main/scala/docspell/backend/JobFactory.scala +++ b/modules/backend/src/main/scala/docspell/backend/JobFactory.scala @@ -68,14 +68,14 @@ object JobFactory { args, "Create preview images", now, - submitter.getOrElse(DocspellSystem.taskGroup), + submitter.getOrElse(DocspellSystem.user), Priority.Low, Some(DocspellSystem.allPreviewTaskTracker) ) def convertAllPdfs[F[_]: Sync]( collective: Option[Ident], - account: AccountId, + submitter: Option[Ident], prio: Priority ): F[RJob] = for { @@ -84,11 +84,11 @@ object JobFactory { job = RJob.newJob( id, ConvertAllPdfArgs.taskName, - account.collective, + collective.getOrElse(DocspellSystem.taskGroup), ConvertAllPdfArgs(collective), s"Convert all pdfs not yet converted", now, - account.user, + submitter.getOrElse(DocspellSystem.user), prio, collective .map(c => c / ConvertAllPdfArgs.taskName) diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala b/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala index 135162da..611eacd4 100644 --- a/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala +++ b/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala @@ -181,7 +181,7 @@ trait OItem[F[_]] { */ def convertAllPdf( collective: Option[Ident], - account: AccountId, + submitter: Option[Ident], notifyJoex: Boolean ): F[UpdateResult] @@ -687,11 +687,11 @@ object OItem { def convertAllPdf( collective: Option[Ident], - account: AccountId, + submitter: Option[Ident], notifyJoex: Boolean ): F[UpdateResult] = for { - job <- JobFactory.convertAllPdfs[F](collective, account, Priority.Low) + job <- JobFactory.convertAllPdfs[F](collective, submitter, Priority.Low) _ <- queue.insertIfNew(job) _ <- if (notifyJoex) joex.notifyAllNodes else ().pure[F] } yield UpdateResult.success diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index f4013210..b928b6be 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -1350,6 +1350,37 @@ paths: schema: $ref: "#/components/schemas/BasicResult" + /admin/attachments/convertallpdfs: + post: + operationId: "admin-attachments-convertallpdf" + tags: [Attachment, Admin] + summary: Convert all PDF files not yet converted + description: | + Docspell converts PDF files into PDF/A files by default, if + the OcrMyPDF tool is configured. + + This endpoint can be used to submit a task that runs this on + all files that have not been converted yet in this way. + + This conversion tool has been added in version 0.9.0 and so + older files can be "migrated" this way, or maybe after + enabling the tool (it is optional). + + The task finds all files collective and submits a task for + each file to convert. These tasks are submitted with a low + priority so that normal processing can still proceed. + + The body of the request should be empty. + security: + - adminHeader: [] + responses: + 200: + description: Ok + content: + application/json: + schema: + $ref: "#/components/schemas/BasicResult" + /sec/source: get: operationId: "sec-source-get-all" @@ -1428,33 +1459,6 @@ paths: schema: $ref: "#/components/schemas/BasicResult" - /sec/item/convertallpdfs: - post: - operationId: "sec-item-convert-all-pdfs" - tags: [ Item ] - summary: Convert all non-converted pdfs. - description: | - Submits a job that will find all pdf files that have not been - converted and converts them using the ocrmypdf tool (if - enabled). This tool has been added in version 0.9.0 and so - older files can be "migrated" this way, or maybe after - enabling the tool. - - The task finds all files of the current collective and submits - task for each file to convert. These tasks are submitted with - a low priority so that normal processing can still proceed. - - The body of the request should be empty. - security: - - authTokenHeader: [] - responses: - 200: - description: Ok - content: - application/json: - schema: - $ref: "#/components/schemas/BasicResult" - /sec/item/search: get: operationId: "sec-item-search-by-get" diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala index 85b02b42..2d115380 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala @@ -194,13 +194,21 @@ object AttachmentRoutes { val dsl = Http4sDsl[F] import dsl._ - HttpRoutes.of { case POST -> Root / "generatePreviews" => - for { - res <- backend.item.generateAllPreviews(MakePreviewArgs.StoreMode.Replace, true) - resp <- Ok( - Conversions.basicResult(res, "Generate all previews task submitted.") - ) - } yield resp + HttpRoutes.of { + case POST -> Root / "generatePreviews" => + for { + res <- backend.item.generateAllPreviews(MakePreviewArgs.StoreMode.Replace, true) + resp <- Ok( + Conversions.basicResult(res, "Generate all previews task submitted.") + ) + } yield resp + + case POST -> Root / "convertallpdfs" => + for { + res <- + backend.item.convertAllPdf(None, None, true) + resp <- Ok(Conversions.basicResult(res, "Convert all PDFs task submitted")) + } yield resp } } diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala index 6635550a..8a30f930 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala @@ -47,13 +47,6 @@ object ItemRoutes { import dsl._ HttpRoutes.of { - case POST -> Root / "convertallpdfs" => - for { - res <- - backend.item.convertAllPdf(user.account.collective.some, user.account, true) - resp <- Ok(Conversions.basicResult(res, "Task submitted")) - } yield resp - case GET -> Root / "search" :? QP.Query(q) :? QP.Limit(limit) :? QP.Offset( offset ) :? QP.WithDetails(detailFlag) => From debdf8e7442f8d2bcb516eba5e02087f141ff6e5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 25 Jul 2021 12:17:25 +0200 Subject: [PATCH 02/46] Update bitpeace-core to 0.9.0-M2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 20f713bc..4a5510a5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,7 +7,7 @@ object Dependencies { val BcryptVersion = "0.4" val BetterMonadicForVersion = "0.3.1" - val BitpeaceVersion = "0.9.0-M1" + val BitpeaceVersion = "0.9.0-M2" val CalevVersion = "0.5.4" val CatsParseVersion = "0.3.4" val CirceVersion = "0.14.1" From 58fa0acf11f40c827a230642f92ee3244ce9ec6a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 25 Jul 2021 12:17:35 +0200 Subject: [PATCH 03/46] Update emil-common, emil-doobie, ... to 0.10.0-M2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 20f713bc..b2f270ea 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,7 +13,7 @@ object Dependencies { val CirceVersion = "0.14.1" val ClipboardJsVersion = "2.0.6" val DoobieVersion = "1.0.0-M5" - val EmilVersion = "0.10.0-M1" + val EmilVersion = "0.10.0-M2" val FlexmarkVersion = "0.62.2" val FlywayVersion = "7.11.3" val Fs2Version = "3.0.6" From 558007235bb85274fb0924f247da98c2c9ba80ee Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 19 Jul 2021 14:25:26 +0200 Subject: [PATCH 04/46] Update tika-core to 2.0.0 Include new ODF parser from tika-2.0.0 --- .../exception/WriteLimitReachedException.java | 83 +++ .../odf/FlatOpenDocumentMacroHandler.java | 120 ++++ .../odf/NSNormalizerContentHandler.java | 73 ++- .../parser/odf/OpenDocumentBodyHandler.java | 564 +++++++++++++++++ .../parser/odf/OpenDocumentContentParser.java | 578 +----------------- .../parser/odf/OpenDocumentMacroHandler.java | 60 ++ .../odf/OpenDocumentManifestHandler.java | 45 ++ .../parser/odf/OpenDocumentMetaParser.java | 160 +++-- .../tika/parser/odf/OpenDocumentParser.java | 329 ++++++---- .../parser/xml/AbstractMetadataHandler.java | 52 +- .../AttributeDependantMetadataHandler.java | 34 +- .../parser/xml/AttributeMetadataHandler.java | 30 +- .../apache/tika/parser/xml/DcXMLParser.java | 46 +- .../parser/xml/ElementMetadataHandler.java | 75 ++- .../tika/parser/xml/FictionBookParser.java | 55 +- .../tika/parser/xml/MetadataHandler.java | 33 +- .../parser/xml/TextAndAttributeXMLParser.java | 34 ++ .../org/apache/tika/parser/xml/XMLParser.java | 51 +- .../org/apache/tika/utils/StringUtils.java | 206 +++++++ .../docspell/extract/odf/OdfExtractTest.scala | 2 +- .../scala/docspell/files/TikaMimetype.scala | 4 +- project/Dependencies.scala | 2 +- 22 files changed, 1653 insertions(+), 983 deletions(-) create mode 100644 modules/extract/src/main/java/org/apache/tika/exception/WriteLimitReachedException.java create mode 100644 modules/extract/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java create mode 100644 modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java create mode 100644 modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java create mode 100644 modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentManifestHandler.java create mode 100644 modules/extract/src/main/java/org/apache/tika/parser/xml/TextAndAttributeXMLParser.java create mode 100644 modules/extract/src/main/java/org/apache/tika/utils/StringUtils.java diff --git a/modules/extract/src/main/java/org/apache/tika/exception/WriteLimitReachedException.java b/modules/extract/src/main/java/org/apache/tika/exception/WriteLimitReachedException.java new file mode 100644 index 00000000..2b88a075 --- /dev/null +++ b/modules/extract/src/main/java/org/apache/tika/exception/WriteLimitReachedException.java @@ -0,0 +1,83 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.exception; + +import org.xml.sax.SAXException; + +public class WriteLimitReachedException extends SAXException { + + //in case of (hopefully impossible) cyclic exception + private final static int MAX_DEPTH = 100; + + private final int writeLimit; + public WriteLimitReachedException(int writeLimit) { + this.writeLimit = writeLimit; + } + + @Override + public String getMessage() { + return "Your document contained more than " + writeLimit + + " characters, and so your requested limit has been" + + " reached. To receive the full text of the document," + + " increase your limit. (Text up to the limit is" + + " however available)."; + } + /** + * Checks whether the given exception (or any of it's root causes) was + * thrown by this handler as a signal of reaching the write limit. + * + * @param t throwable + * @return true if the write limit was reached, + * false otherwise + * @since Apache Tika 2.0 + */ + public static boolean isWriteLimitReached(Throwable t) { + return isWriteLimitReached(t, 0); + } + + private static boolean isWriteLimitReached(Throwable t, int depth) { + if (t == null) { + return false; + } + if (depth > MAX_DEPTH) { + return false; + } + if (t instanceof WriteLimitReachedException) { + return true; + } else { + return t.getCause() != null && isWriteLimitReached(t.getCause(), depth + 1); + } + } + + public static void throwIfWriteLimitReached(Exception ex) throws SAXException { + throwIfWriteLimitReached(ex, 0); + } + + private static void throwIfWriteLimitReached(Exception ex, int depth) throws SAXException { + if (ex == null) { + return; + } + if (depth > MAX_DEPTH) { + return; + } + if (ex instanceof WriteLimitReachedException) { + throw (SAXException) ex; + } else { + isWriteLimitReached(ex.getCause(), depth + 1); + } + } +} diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java new file mode 100644 index 00000000..416be0fc --- /dev/null +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/FlatOpenDocumentMacroHandler.java @@ -0,0 +1,120 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.parser.odf; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; + +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; + +import org.apache.tika.extractor.EmbeddedDocumentExtractor; +import org.apache.tika.extractor.EmbeddedDocumentUtil; +import org.apache.tika.io.TikaInputStream; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; +import org.apache.tika.parser.ParseContext; +import org.apache.tika.sax.ContentHandlerDecorator; +import org.apache.tika.utils.XMLReaderUtils; + +/** + * Handler for macros in flat open documents + */ +class FlatOpenDocumentMacroHandler extends ContentHandlerDecorator { + + static String MODULE = "module"; + static String NAME = "name"; + private static String SOURCE_CODE = "source-code"; + private final ContentHandler contentHandler; + private final ParseContext parseContext; + private final StringBuilder macroBuffer = new StringBuilder(); + String macroName = null; + boolean inMacro = false; + private EmbeddedDocumentExtractor embeddedDocumentExtractor; + + FlatOpenDocumentMacroHandler(ContentHandler contentHandler, ParseContext parseContext) { + super(contentHandler); + this.contentHandler = contentHandler; + this.parseContext = parseContext; + } + + @Override + public void startElement(String namespaceURI, String localName, String qName, Attributes attrs) + throws SAXException { + if (MODULE.equals(localName)) { + macroName = XMLReaderUtils.getAttrValue(NAME, attrs); + } else if (SOURCE_CODE.equals(localName)) { + inMacro = true; + } + } + + @Override + public void characters(char[] ch, int start, int length) throws SAXException { + if (inMacro) { + macroBuffer.append(ch, start, length); + } + } + + @Override + public void endElement(String namespaceURI, String localName, String qName) + throws SAXException { + if (SOURCE_CODE.equals(localName)) { + try { + handleMacro(); + } catch (IOException e) { + throw new SAXException(e); + } finally { + resetMacroState(); + } + } + } + + protected void resetMacroState() { + macroBuffer.setLength(0); + macroName = null; + inMacro = false; + } + + protected void handleMacro() throws IOException, SAXException { + + byte[] bytes = macroBuffer.toString().getBytes(StandardCharsets.UTF_8); + + if (embeddedDocumentExtractor == null) { + embeddedDocumentExtractor = + EmbeddedDocumentUtil.getEmbeddedDocumentExtractor(parseContext); + } + Metadata embeddedMetadata = new Metadata(); + if (!isBlank(macroName)) { + embeddedMetadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, macroName); + } + embeddedMetadata.set(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE, + TikaCoreProperties.EmbeddedResourceType.MACRO.toString()); + + if (embeddedDocumentExtractor.shouldParseEmbedded(embeddedMetadata)) { + try (InputStream is = TikaInputStream.get(bytes)) { + embeddedDocumentExtractor + .parseEmbedded(is, contentHandler, embeddedMetadata, false); + } + } + } + + private static boolean isBlank(String s) { + return s == null || s.trim().isEmpty(); + } +} diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java index 80b2301c..2193e83b 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/NSNormalizerContentHandler.java @@ -1,31 +1,32 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.tika.parser.odf; + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.tika.parser.odf; + +import java.io.IOException; +import java.io.StringReader; +import java.util.Locale; -import org.apache.tika.sax.ContentHandlerDecorator; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import java.io.IOException; -import java.io.StringReader; -import java.util.Locale; +import org.apache.tika.sax.ContentHandlerDecorator; /** * Content handler decorator that:
    @@ -35,14 +36,11 @@ import java.util.Locale; */ public class NSNormalizerContentHandler extends ContentHandlerDecorator { - private static final String OLD_NS = - "http://openoffice.org/2000/"; + private static final String OLD_NS = "http://openoffice.org/2000/"; - private static final String NEW_NS = - "urn:oasis:names:tc:opendocument:xmlns:"; + private static final String NEW_NS = "urn:oasis:names:tc:opendocument:xmlns:"; - private static final String DTD_PUBLIC_ID = - "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"; + private static final String DTD_PUBLIC_ID = "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"; public NSNormalizerContentHandler(ContentHandler handler) { super(handler); @@ -57,27 +55,24 @@ public class NSNormalizerContentHandler extends ContentHandlerDecorator { } @Override - public void startElement( - String namespaceURI, String localName, String qName, - Attributes atts) throws SAXException { + public void startElement(String namespaceURI, String localName, String qName, Attributes atts) + throws SAXException { AttributesImpl natts = new AttributesImpl(); for (int i = 0; i < atts.getLength(); i++) { - natts.addAttribute( - mapOldNS(atts.getURI(i)), atts.getLocalName(i), - atts.getQName(i), atts.getType(i), atts.getValue(i)); + natts.addAttribute(mapOldNS(atts.getURI(i)), atts.getLocalName(i), atts.getQName(i), + atts.getType(i), atts.getValue(i)); } super.startElement(mapOldNS(namespaceURI), localName, qName, atts); } @Override public void endElement(String namespaceURI, String localName, String qName) - throws SAXException { + throws SAXException { super.endElement(mapOldNS(namespaceURI), localName, qName); } @Override - public void startPrefixMapping(String prefix, String uri) - throws SAXException { + public void startPrefixMapping(String prefix, String uri) throws SAXException { super.startPrefixMapping(prefix, mapOldNS(uri)); } @@ -87,13 +82,13 @@ public class NSNormalizerContentHandler extends ContentHandlerDecorator { */ @Override public InputSource resolveEntity(String publicId, String systemId) - throws IOException, SAXException { - if ((systemId != null && systemId.toLowerCase(Locale.ROOT).endsWith(".dtd")) - || DTD_PUBLIC_ID.equals(publicId)) { + throws IOException, SAXException { + if ((systemId != null && systemId.toLowerCase(Locale.ROOT).endsWith(".dtd")) || + DTD_PUBLIC_ID.equals(publicId)) { return new InputSource(new StringReader("")); } else { return super.resolveEntity(publicId, systemId); } } -} +} \ No newline at end of file diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java new file mode 100644 index 00000000..544c5ab7 --- /dev/null +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentBodyHandler.java @@ -0,0 +1,564 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.parser.odf; + +import static org.apache.tika.sax.XHTMLContentHandler.XHTML; + +import java.io.IOException; +import java.io.InputStream; +import java.util.BitSet; +import java.util.HashMap; +import java.util.Map; +import java.util.Stack; +import javax.xml.namespace.QName; + +import org.apache.commons.codec.binary.Base64; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.AttributesImpl; + +import org.apache.tika.extractor.EmbeddedDocumentExtractor; +import org.apache.tika.extractor.EmbeddedDocumentUtil; +import org.apache.tika.io.TikaInputStream; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.parser.ParseContext; +import org.apache.tika.sax.ElementMappingContentHandler; +import org.apache.tika.sax.XHTMLContentHandler; +import org.apache.tika.utils.StringUtils; + +/* + Handler for the body element or odt flat files and content.xml of + traditional compressed odt files + */ +class OpenDocumentBodyHandler extends ElementMappingContentHandler { + + public static final String TEXT_NS = "urn:oasis:names:tc:opendocument:xmlns:text:1.0"; + public static final String TABLE_NS = "urn:oasis:names:tc:opendocument:xmlns:table:1.0"; + public static final String STYLE_NS = "urn:oasis:names:tc:opendocument:xmlns:style:1.0"; + public static final String FORMATTING_OBJECTS_NS = + "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"; + public static final String OFFICE_NS = "urn:oasis:names:tc:opendocument:xmlns:office:1.0"; + public static final String SVG_NS = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"; + public static final String PRESENTATION_NS = + "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"; + public static final String DRAW_NS = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"; + public static final String XLINK_NS = "http://www.w3.org/1999/xlink"; + protected static final char[] TAB = new char[]{'\t'}; + private static final String BINARY_DATA = "binary-data"; + private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl(); + /** + * Mappings between ODF tag names and XHTML tag names + * (including attributes). All other tag names/attributes are ignored + * and left out from event stream. + */ + private static final HashMap MAPPINGS = + new HashMap<>(); + private static final char[] SPACE = new char[]{' '}; + private static final String CLASS = "class"; + private static final Attributes ANNOTATION_ATTRIBUTES = buildAttributes(CLASS, "annotation"); + private static final Attributes NOTE_ATTRIBUTES = buildAttributes(CLASS, "note"); + private static final Attributes NOTES_ATTRIBUTES = buildAttributes(CLASS, "notes"); + + static { + // general mappings of text:-tags + MAPPINGS.put(new QName(TEXT_NS, "p"), new TargetElement(XHTML, "p")); + // text:h-tags are mapped specifically in startElement/endElement + MAPPINGS.put(new QName(TEXT_NS, "line-break"), new TargetElement(XHTML, "br")); + MAPPINGS.put(new QName(TEXT_NS, "list-item"), new TargetElement(XHTML, "li")); + MAPPINGS.put(new QName(TEXT_NS, "note"), new TargetElement(XHTML, "span")); + MAPPINGS.put(new QName(OFFICE_NS, "annotation"), new TargetElement(XHTML, + "span")); + MAPPINGS.put(new QName(PRESENTATION_NS, "notes"), new TargetElement(XHTML, + "span")); + MAPPINGS.put(new QName(DRAW_NS, "object"), new TargetElement(XHTML, + "object")); + MAPPINGS.put(new QName(DRAW_NS, "text-box"), new TargetElement(XHTML, "div")); + MAPPINGS.put(new QName(SVG_NS, "title"), new TargetElement(XHTML, "span")); + MAPPINGS.put(new QName(SVG_NS, "desc"), new TargetElement(XHTML, "span")); + MAPPINGS.put(new QName(TEXT_NS, "span"), new TargetElement(XHTML, "span")); + + final HashMap aAttsMapping = new HashMap<>(); + aAttsMapping.put(new QName(XLINK_NS, "href"), new QName("href")); + aAttsMapping.put(new QName(XLINK_NS, "title"), new QName("title")); + MAPPINGS.put(new QName(TEXT_NS, "a"), new TargetElement(XHTML, "a", + aAttsMapping)); + MAPPINGS.put(new QName(DRAW_NS, "a"), new TargetElement(XHTML, "a", + aAttsMapping)); + + // create HTML tables from table:-tags + MAPPINGS.put(new QName(TABLE_NS, "table"), new TargetElement(XHTML, "table")); + // repeating of rows is ignored; for columns, see below! + MAPPINGS.put(new QName(TABLE_NS, "table-row"), new TargetElement(XHTML, "tr")); + // special mapping for rowspan/colspan attributes + final HashMap tableCellAttsMapping = new HashMap<>(); + tableCellAttsMapping + .put(new QName(TABLE_NS, "number-columns-spanned"), new QName("colspan")); + tableCellAttsMapping.put(new QName(TABLE_NS, "number-rows-spanned"), new QName("rowspan")); + /* TODO: The following is not correct, the cell should be repeated not spanned! + * Code generates a HTML cell, spanning all repeated columns, to make the cell look correct. + * Problems may occur when both spanning and repeating is given, which is not allowed by + * spec. + * Cell spanning instead of repeating is not a problem, because OpenOffice uses it + * only for empty cells. + */ + tableCellAttsMapping + .put(new QName(TABLE_NS, "number-columns-repeated"), new QName("colspan")); + MAPPINGS.put(new QName(TABLE_NS, "table-cell"), + new TargetElement(XHTML, "td", tableCellAttsMapping)); + } + + private final ContentHandler handler; + private final ParseContext parseContext; + private final BitSet textNodeStack = new BitSet(); + //have we written the start style tags + //yet for the current text style + boolean hasWrittenStartStyleTags = false; + //if we're in a binary-data tag + boolean inBinaryData = false; + private EmbeddedDocumentExtractor embeddedDocumentExtractor; + private StringBuilder base64BinaryDataBuffer = new StringBuilder(); + private int nodeDepth = 0; + private int completelyFiltered = 0; + private Stack headingStack = new Stack<>(); + private Map paragraphTextStyleMap = new HashMap<>(); + private Map textStyleMap = new HashMap<>(); + private Map listStyleMap = new HashMap<>(); + private String currParagraphStyleName; //paragraph style name + private TextStyle currTextStyle; //this is the text style for particular spans/paragraphs + private String currTextStyleName; + private Stack listStyleStack = new Stack<>(); + private ListStyle listStyle; + // True if we are currently in the named style: + private boolean curUnderlined; + private boolean curBold; + private boolean curItalic; + private int pDepth = 0; + OpenDocumentBodyHandler(ContentHandler handler, ParseContext parseContext) { + super(handler, MAPPINGS); + this.handler = handler; + this.parseContext = parseContext; + } + + private static Attributes buildAttributes(String key, String value) { + AttributesImpl attrs = new AttributesImpl(); + attrs.addAttribute("", key, key, "CDATA", value); + return attrs; + } + + @Override + public void characters(char[] ch, int start, int length) throws SAXException { + if (inBinaryData) { + base64BinaryDataBuffer.append(ch, start, length); + return; + } + // only forward content of tags from text:-namespace + if (completelyFiltered == 0 && nodeDepth > 0 && textNodeStack.get(nodeDepth - 1)) { + if (!hasWrittenStartStyleTags) { + updateStyleTags(); + hasWrittenStartStyleTags = true; + } + super.characters(ch, start, length); + } + } + + // helper for checking tags which need complete filtering + // (with sub-tags) + private boolean needsCompleteFiltering(String namespaceURI, String localName) { + if (TEXT_NS.equals(namespaceURI)) { + return localName.endsWith("-template") || localName.endsWith("-style"); + } + return TABLE_NS.equals(namespaceURI) && "covered-table-cell".equals(localName); + } + //

    can appear inside comments and other things that are already inside

    + //we need to track our pDepth and only output

    if we're at the main level + + // map the heading level to HTML tags + private String getXHTMLHeaderTagName(Attributes atts) { + String depthStr = atts.getValue(TEXT_NS, "outline-level"); + if (depthStr == null) { + return "h1"; + } + + int depth = Integer.parseInt(depthStr); + if (depth >= 6) { + return "h6"; + } else if (depth <= 1) { + return "h1"; + } else { + return "h" + depth; + } + } + + /** + * Check if a node is a text node + */ + private boolean isTextNode(String namespaceURI, String localName) { + if (TEXT_NS.equals(namespaceURI) && !localName.equals("page-number") && + !localName.equals("page-count")) { + return true; + } + if (SVG_NS.equals(namespaceURI)) { + return "title".equals(localName) || "desc".equals(localName); + } + return false; + } + + private void startList(String name) throws SAXException { + String elementName = "ul"; + if (name != null) { + ListStyle style = listStyleMap.get(name); + elementName = style != null ? style.getTag() : "ul"; + listStyleStack.push(style); + } + handler.startElement(XHTML, elementName, elementName, EMPTY_ATTRIBUTES); + } + + private void endList() throws SAXException { + String elementName = "ul"; + if (!listStyleStack.isEmpty()) { + ListStyle style = listStyleStack.pop(); + elementName = style != null ? style.getTag() : "ul"; + } + handler.endElement(XHTML, elementName, elementName); + } + + private void startSpan(String name) throws SAXException { + if (name == null) { + return; + } + currTextStyle = textStyleMap.get(name); + hasWrittenStartStyleTags = false; + } + + private void startParagraph(String styleName) throws SAXException { + if (pDepth == 0) { + handler.startElement(XHTML, "p", "p", EMPTY_ATTRIBUTES); + if (styleName != null) { + currTextStyle = paragraphTextStyleMap.get(styleName); + } + hasWrittenStartStyleTags = false; + } else { + handler.characters(SPACE, 0, SPACE.length); + } + pDepth++; + } + + private void endParagraph() throws SAXException { + closeStyleTags(); + if (pDepth == 1) { + handler.endElement(XHTML, "p", "p"); + } else { + handler.characters(SPACE, 0, SPACE.length); + } + pDepth--; + + } + + private void updateStyleTags() throws SAXException { + + if (currTextStyle == null) { + closeStyleTags(); + return; + } + if (currTextStyle.bold != curBold) { + // Enforce nesting -- must close s and i tags + if (curUnderlined) { + handler.endElement(XHTML, "u", "u"); + curUnderlined = false; + } + if (curItalic) { + handler.endElement(XHTML, "i", "i"); + curItalic = false; + } + if (currTextStyle.bold) { + handler.startElement(XHTML, "b", "b", EMPTY_ATTRIBUTES); + } else { + handler.endElement(XHTML, "b", "b"); + } + curBold = currTextStyle.bold; + } + + if (currTextStyle.italic != curItalic) { + // Enforce nesting -- must close s tag + if (curUnderlined) { + handler.endElement(XHTML, "u", "u"); + curUnderlined = false; + } + if (currTextStyle.italic) { + handler.startElement(XHTML, "i", "i", EMPTY_ATTRIBUTES); + } else { + handler.endElement(XHTML, "i", "i"); + } + curItalic = currTextStyle.italic; + } + + if (currTextStyle.underlined != curUnderlined) { + if (currTextStyle.underlined) { + handler.startElement(XHTML, "u", "u", EMPTY_ATTRIBUTES); + } else { + handler.endElement(XHTML, "u", "u"); + } + curUnderlined = currTextStyle.underlined; + } + } + + private void endSpan() throws SAXException { + updateStyleTags(); + } + + private void closeStyleTags() throws SAXException { + // Close any still open style tags + if (curUnderlined) { + handler.endElement(XHTML, "u", "u"); + curUnderlined = false; + } + if (curItalic) { + handler.endElement(XHTML, "i", "i"); + curItalic = false; + } + if (curBold) { + handler.endElement(XHTML, "b", "b"); + curBold = false; + } + currTextStyle = null; + hasWrittenStartStyleTags = false; + } + + @Override + public void startElement(String namespaceURI, String localName, String qName, Attributes attrs) + throws SAXException { + + if (DRAW_NS.equals(namespaceURI) && "image".equals(localName)) { + String link = attrs.getValue(XLINK_NS, "href"); + AttributesImpl attr = new AttributesImpl(); + if (!StringUtils.isEmpty(link)) { + attr.addAttribute("", "src", "src", "CDATA", "embedded:" + link); + } + handler.startElement(XHTMLContentHandler.XHTML, "img", "img", attr); + handler.endElement(XHTMLContentHandler.XHTML, "img", "img"); + } + + if (BINARY_DATA.equals(localName)) { + inBinaryData = true; + return; + } + // keep track of current node type. If it is a text node, + // a bit at the current depth its set in textNodeStack. + // characters() checks the top bit to determine, if the + // actual node is a text node to print out nodeDepth contains + // the depth of the current node and also marks top of stack. + assert nodeDepth >= 0; + + // Set styles + if (STYLE_NS.equals(namespaceURI) && "style".equals(localName)) { + String family = attrs.getValue(STYLE_NS, "family"); + if ("text".equals(family)) { + currTextStyle = new TextStyle(); + currTextStyleName = attrs.getValue(STYLE_NS, "name"); + } else if ("paragraph".equals(family)) { + currTextStyle = new TextStyle(); + currParagraphStyleName = attrs.getValue(STYLE_NS, "name"); + } + } else if (TEXT_NS.equals(namespaceURI) && "list-style".equals(localName)) { + listStyle = new ListStyle(); + String name = attrs.getValue(STYLE_NS, "name"); + listStyleMap.put(name, listStyle); + } else if (currTextStyle != null && STYLE_NS.equals(namespaceURI) && + "text-properties".equals(localName)) { + String fontStyle = attrs.getValue(FORMATTING_OBJECTS_NS, "font-style"); + if ("italic".equals(fontStyle) || "oblique".equals(fontStyle)) { + currTextStyle.italic = true; + } + String fontWeight = attrs.getValue(FORMATTING_OBJECTS_NS, "font-weight"); + if ("bold".equals(fontWeight) || "bolder".equals(fontWeight) || + (fontWeight != null && Character.isDigit(fontWeight.charAt(0)) && + Integer.parseInt(fontWeight) > 500)) { + currTextStyle.bold = true; + } + String underlineStyle = attrs.getValue(STYLE_NS, "text-underline-style"); + if (underlineStyle != null && !underlineStyle.equals("none")) { + currTextStyle.underlined = true; + } + } else if (listStyle != null && TEXT_NS.equals(namespaceURI)) { + if ("list-level-style-bullet".equals(localName)) { + listStyle.ordered = false; + } else if ("list-level-style-number".equals(localName)) { + listStyle.ordered = true; + } + } + + textNodeStack.set(nodeDepth++, isTextNode(namespaceURI, localName)); + // filter *all* content of some tags + assert completelyFiltered >= 0; + + if (needsCompleteFiltering(namespaceURI, localName)) { + completelyFiltered++; + } + // call next handler if no filtering + if (completelyFiltered == 0) { + // special handling of text:h, that are directly passed + // to incoming handler + if (TEXT_NS.equals(namespaceURI) && "h".equals(localName)) { + final String el = headingStack.push(getXHTMLHeaderTagName(attrs)); + handler.startElement(XHTMLContentHandler.XHTML, el, el, EMPTY_ATTRIBUTES); + } else if (TEXT_NS.equals(namespaceURI) && "list".equals(localName)) { + startList(attrs.getValue(TEXT_NS, "style-name")); + } else if (TEXT_NS.equals(namespaceURI) && "span".equals(localName)) { + startSpan(attrs.getValue(TEXT_NS, "style-name")); + } else if (TEXT_NS.equals(namespaceURI) && "p".equals(localName)) { + startParagraph(attrs.getValue(TEXT_NS, "style-name")); + } else if (TEXT_NS.equals(namespaceURI) && "s".equals(localName)) { + handler.characters(SPACE, 0, 1); + } else if ("annotation".equals(localName)) { + closeStyleTags(); + handler.startElement(XHTML, "span", "p", ANNOTATION_ATTRIBUTES); + } else if ("note".equals(localName)) { + closeStyleTags(); + handler.startElement(XHTML, "span", "p", NOTE_ATTRIBUTES); + } else if ("notes".equals(localName)) { + closeStyleTags(); + handler.startElement(XHTML, "span", "p", NOTES_ATTRIBUTES); + } else { + super.startElement(namespaceURI, localName, qName, attrs); + } + } + } + + @Override + public void endElement(String namespaceURI, String localName, String qName) + throws SAXException { + if (BINARY_DATA.equals(localName)) { + inBinaryData = false; + try { + processBinaryData(); + } catch (IOException e) { + throw new SAXException(e); + } + return; + } + if (STYLE_NS.equals(namespaceURI) && "style".equals(localName)) { + if (currTextStyle != null && currTextStyleName != null) { + textStyleMap.put(currTextStyleName, currTextStyle); + currTextStyleName = null; + currTextStyle = null; + } else if (currTextStyle != null && currParagraphStyleName != null) { + paragraphTextStyleMap.put(currParagraphStyleName, currTextStyle); + currParagraphStyleName = null; + currTextStyle = null; + } + } else if (TEXT_NS.equals(namespaceURI) && "list-style".equals(localName)) { + listStyle = null; + } + + // call next handler if no filtering + if (completelyFiltered == 0) { + // special handling of text:h, that are directly passed + // to incoming handler + if (TEXT_NS.equals(namespaceURI) && "h".equals(localName)) { + final String el = headingStack.pop(); + handler.endElement(namespaceURI, el, el); + } else if (TEXT_NS.equals(namespaceURI) && "list".equals(localName)) { + endList(); + } else if (TEXT_NS.equals(namespaceURI) && "span".equals(localName)) { + currTextStyle = null; + hasWrittenStartStyleTags = false; + } else if (TEXT_NS.equals(namespaceURI) && "p".equals(localName)) { + endParagraph(); + } else if ("annotation".equals(localName) || "note".equals(localName) || + "notes".equals(localName)) { + closeStyleTags(); + handler.endElement(namespaceURI, localName, localName); + } else { + super.endElement(namespaceURI, localName, qName); + } + + // special handling of tabulators + if (TEXT_NS.equals(namespaceURI) && + ("tab-stop".equals(localName) || "tab".equals(localName))) { + this.characters(TAB, 0, TAB.length); + } + } + + // revert filter for *all* content of some tags + if (needsCompleteFiltering(namespaceURI, localName)) { + completelyFiltered--; + } + assert completelyFiltered >= 0; + + // reduce current node depth + nodeDepth--; + assert nodeDepth >= 0; + } + + private void processBinaryData() throws IOException, SAXException { + + //TODO: figure out whether we're in an inline image or a regular + //attachment and add that info to the embedded metadata + + byte[] bytes = Base64.decodeBase64(base64BinaryDataBuffer.toString()); + //clear state before parsing + base64BinaryDataBuffer.setLength(0); + inBinaryData = false; + + if (embeddedDocumentExtractor == null) { + embeddedDocumentExtractor = + EmbeddedDocumentUtil.getEmbeddedDocumentExtractor(parseContext); + } + Metadata embeddedMetadata = new Metadata(); + if (embeddedDocumentExtractor.shouldParseEmbedded(embeddedMetadata)) { + try (InputStream is = TikaInputStream.get(bytes)) { + embeddedDocumentExtractor.parseEmbedded(is, handler, embeddedMetadata, false); + } + } + } + + @Override + public void startPrefixMapping(String prefix, String uri) { + // remove prefix mappings as they should not occur in XHTML + } + + @Override + public void endPrefixMapping(String prefix) { + // remove prefix mappings as they should not occur in XHTML + } + + private interface Style { + } + + private static class TextStyle implements Style { + public boolean italic; + public boolean bold; + public boolean underlined; + + @Override + public String toString() { + return "TextStyle{" + "italic=" + italic + ", bold=" + bold + ", underlined=" + + underlined + '}'; + } + } + + private static class ListStyle implements Style { + public boolean ordered; + + public String getTag() { + return ordered ? "ol" : "ul"; + } + } + + +} diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java index 066f3e95..e99053d9 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java @@ -16,591 +16,47 @@ */ package org.apache.tika.parser.odf; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collections; +import java.util.Set; + import org.apache.commons.io.input.CloseShieldInputStream; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; import org.apache.tika.parser.ParseContext; -import org.apache.tika.sax.ElementMappingContentHandler; -import org.apache.tika.sax.ElementMappingContentHandler.TargetElement; import org.apache.tika.sax.OfflineContentHandler; import org.apache.tika.sax.XHTMLContentHandler; import org.apache.tika.utils.XMLReaderUtils; -import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.AttributesImpl; -import org.xml.sax.helpers.DefaultHandler; - -import javax.xml.namespace.QName; -import java.io.IOException; -import java.io.InputStream; -import java.util.BitSet; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.Stack; - -import static org.apache.tika.sax.XHTMLContentHandler.XHTML; /** * Parser for ODF content.xml files. */ public class OpenDocumentContentParser extends AbstractParser { - private interface Style { - } - - private static class TextStyle implements Style { - public boolean italic; - public boolean bold; - public boolean underlined; - - @Override - public String toString() { - return "TextStyle{" + - "italic=" + italic + - ", bold=" + bold + - ", underlined=" + underlined + - '}'; - } - } - - private static class ListStyle implements Style { - public boolean ordered; - - public String getTag() { - return ordered ? "ol" : "ul"; - } - } - - private static final class OpenDocumentElementMappingContentHandler extends - ElementMappingContentHandler { - private static final char[] SPACE = new char[]{ ' '}; - private static final String CLASS = "class"; - private static final Attributes ANNOTATION_ATTRIBUTES = buildAttributes(CLASS, "annotation"); - private static final Attributes NOTE_ATTRIBUTES = buildAttributes(CLASS, "note"); - private static final Attributes NOTES_ATTRIBUTES = buildAttributes(CLASS, "notes"); - - private static Attributes buildAttributes(String key, String value) { - AttributesImpl attrs = new AttributesImpl(); - attrs.addAttribute("", key, key, "CDATA", value); - return attrs; - } - - private final ContentHandler handler; - private final BitSet textNodeStack = new BitSet(); - private int nodeDepth = 0; - private int completelyFiltered = 0; - private Stack headingStack = new Stack(); - private Map paragraphTextStyleMap = new HashMap(); - private Map textStyleMap = new HashMap(); - private Map listStyleMap = new HashMap(); - private String currParagraphStyleName; //paragraph style name - private TextStyle currTextStyle; //this is the text style for particular spans/paragraphs - private String currTextStyleName; - - private Stack listStyleStack = new Stack(); - private ListStyle listStyle; - - // True if we are currently in the named style: - private boolean curUnderlined; - private boolean curBold; - private boolean curItalic; - - //have we written the start style tags - //yet for the current text style - boolean hasWrittenStartStyleTags = false; - - private int pDepth = 0; //

    can appear inside comments and other things that are already inside

    - //we need to track our pDepth and only output

    if we're at the main level - - - private OpenDocumentElementMappingContentHandler(ContentHandler handler, - Map mappings) { - super(handler, mappings); - this.handler = handler; - } - - @Override - public void characters(char[] ch, int start, int length) - throws SAXException { - // only forward content of tags from text:-namespace - if (completelyFiltered == 0 && nodeDepth > 0 - && textNodeStack.get(nodeDepth - 1)) { - if (!hasWrittenStartStyleTags) { - updateStyleTags(); - hasWrittenStartStyleTags = true; - } - super.characters(ch, start, length); - } - } - - // helper for checking tags which need complete filtering - // (with sub-tags) - private boolean needsCompleteFiltering( - String namespaceURI, String localName) { - if (TEXT_NS.equals(namespaceURI)) { - return localName.endsWith("-template") - || localName.endsWith("-style"); - } - return TABLE_NS.equals(namespaceURI) && "covered-table-cell".equals(localName); - } - - // map the heading level to HTML tags - private String getXHTMLHeaderTagName(Attributes atts) { - String depthStr = atts.getValue(TEXT_NS, "outline-level"); - if (depthStr == null) { - return "h1"; - } - - int depth = Integer.parseInt(depthStr); - if (depth >= 6) { - return "h6"; - } else if (depth <= 1) { - return "h1"; - } else { - return "h" + depth; - } - } - - /** - * Check if a node is a text node - */ - private boolean isTextNode(String namespaceURI, String localName) { - if (TEXT_NS.equals(namespaceURI) && !localName.equals("page-number") && !localName.equals("page-count")) { - return true; - } - if (SVG_NS.equals(namespaceURI)) { - return "title".equals(localName) || - "desc".equals(localName); - } - return false; - } - - private void startList(String name) throws SAXException { - String elementName = "ul"; - if (name != null) { - ListStyle style = listStyleMap.get(name); - elementName = style != null ? style.getTag() : "ul"; - listStyleStack.push(style); - } - handler.startElement(XHTML, elementName, elementName, EMPTY_ATTRIBUTES); - } - - private void endList() throws SAXException { - String elementName = "ul"; - if (!listStyleStack.isEmpty()) { - ListStyle style = listStyleStack.pop(); - elementName = style != null ? style.getTag() : "ul"; - } - handler.endElement(XHTML, elementName, elementName); - } - - private void startSpan(String name) throws SAXException { - if (name == null) { - return; - } - currTextStyle = textStyleMap.get(name); - hasWrittenStartStyleTags = false; - } - - private void startParagraph(String styleName) throws SAXException { - if (pDepth == 0) { - handler.startElement(XHTML, "p", "p", EMPTY_ATTRIBUTES); - if (styleName != null) { - currTextStyle = paragraphTextStyleMap.get(styleName); - } - hasWrittenStartStyleTags = false; - } else { - handler.characters(SPACE, 0, SPACE.length); - } - pDepth++; - } - - private void endParagraph() throws SAXException { - closeStyleTags(); - if (pDepth == 1) { - handler.endElement(XHTML, "p", "p"); - } else { - handler.characters(SPACE, 0, SPACE.length); - } - pDepth--; - - } - - private void updateStyleTags() throws SAXException { - - if (currTextStyle == null) { - closeStyleTags(); - return; - } - if (currTextStyle.bold != curBold) { - // Enforce nesting -- must close s and i tags - if (curUnderlined) { - handler.endElement(XHTML, "u", "u"); - curUnderlined = false; - } - if (curItalic) { - handler.endElement(XHTML, "i", "i"); - curItalic = false; - } - if (currTextStyle.bold) { - handler.startElement(XHTML, "b", "b", EMPTY_ATTRIBUTES); - } else { - handler.endElement(XHTML, "b", "b"); - } - curBold = currTextStyle.bold; - } - - if (currTextStyle.italic != curItalic) { - // Enforce nesting -- must close s tag - if (curUnderlined) { - handler.endElement(XHTML, "u", "u"); - curUnderlined = false; - } - if (currTextStyle.italic) { - handler.startElement(XHTML, "i", "i", EMPTY_ATTRIBUTES); - } else { - handler.endElement(XHTML, "i", "i"); - } - curItalic = currTextStyle.italic; - } - - if (currTextStyle.underlined != curUnderlined) { - if (currTextStyle.underlined) { - handler.startElement(XHTML, "u", "u", EMPTY_ATTRIBUTES); - } else { - handler.endElement(XHTML, "u", "u"); - } - curUnderlined = currTextStyle.underlined; - } - } - - private void endSpan() throws SAXException { - updateStyleTags(); - } - - private void closeStyleTags() throws SAXException { - // Close any still open style tags - if (curUnderlined) { - handler.endElement(XHTML,"u", "u"); - curUnderlined = false; - } - if (curItalic) { - handler.endElement(XHTML,"i", "i"); - curItalic = false; - } - if (curBold) { - handler.endElement(XHTML,"b", "b"); - curBold = false; - } - currTextStyle = null; - hasWrittenStartStyleTags = false; - } - - @Override - public void startElement( - String namespaceURI, String localName, String qName, - Attributes attrs) throws SAXException { - // keep track of current node type. If it is a text node, - // a bit at the current depth its set in textNodeStack. - // characters() checks the top bit to determine, if the - // actual node is a text node to print out nodeDepth contains - // the depth of the current node and also marks top of stack. - assert nodeDepth >= 0; - - // Set styles - if (STYLE_NS.equals(namespaceURI) && "style".equals(localName)) { - String family = attrs.getValue(STYLE_NS, "family"); - if ("text".equals(family)) { - currTextStyle = new TextStyle(); - currTextStyleName = attrs.getValue(STYLE_NS, "name"); - } else if ("paragraph".equals(family)) { - currTextStyle = new TextStyle(); - currParagraphStyleName = attrs.getValue(STYLE_NS, "name"); - } - } else if (TEXT_NS.equals(namespaceURI) && "list-style".equals(localName)) { - listStyle = new ListStyle(); - String name = attrs.getValue(STYLE_NS, "name"); - listStyleMap.put(name, listStyle); - } else if (currTextStyle != null && STYLE_NS.equals(namespaceURI) - && "text-properties".equals(localName)) { - String fontStyle = attrs.getValue(FORMATTING_OBJECTS_NS, "font-style"); - if ("italic".equals(fontStyle) || "oblique".equals(fontStyle)) { - currTextStyle.italic = true; - } - String fontWeight = attrs.getValue(FORMATTING_OBJECTS_NS, "font-weight"); - if ("bold".equals(fontWeight) || "bolder".equals(fontWeight) - || (fontWeight != null && Character.isDigit(fontWeight.charAt(0)) - && Integer.valueOf(fontWeight) > 500)) { - currTextStyle.bold = true; - } - String underlineStyle = attrs.getValue(STYLE_NS, "text-underline-style"); - if (underlineStyle != null && !underlineStyle.equals("none")) { - currTextStyle.underlined = true; - } - } else if (listStyle != null && TEXT_NS.equals(namespaceURI)) { - if ("list-level-style-bullet".equals(localName)) { - listStyle.ordered = false; - } else if ("list-level-style-number".equals(localName)) { - listStyle.ordered = true; - } - } - - textNodeStack.set(nodeDepth++, - isTextNode(namespaceURI, localName)); - // filter *all* content of some tags - assert completelyFiltered >= 0; - - if (needsCompleteFiltering(namespaceURI, localName)) { - completelyFiltered++; - } - // call next handler if no filtering - if (completelyFiltered == 0) { - // special handling of text:h, that are directly passed - // to incoming handler - if (TEXT_NS.equals(namespaceURI) && "h".equals(localName)) { - final String el = headingStack.push(getXHTMLHeaderTagName(attrs)); - handler.startElement(XHTMLContentHandler.XHTML, el, el, EMPTY_ATTRIBUTES); - } else if (TEXT_NS.equals(namespaceURI) && "list".equals(localName)) { - startList(attrs.getValue(TEXT_NS, "style-name")); - } else if (TEXT_NS.equals(namespaceURI) && "span".equals(localName)) { - startSpan(attrs.getValue(TEXT_NS, "style-name")); - } else if (TEXT_NS.equals(namespaceURI) && "p".equals(localName)) { - startParagraph(attrs.getValue(TEXT_NS, "style-name")); - } else if (TEXT_NS.equals(namespaceURI) && "s".equals(localName)) { - handler.characters(SPACE, 0, 1); - } else if ("annotation".equals(localName)) { - closeStyleTags(); - handler.startElement(XHTML, "span", "p", ANNOTATION_ATTRIBUTES); - } else if ("note".equals(localName)) { - closeStyleTags(); - handler.startElement(XHTML, "span", "p", NOTE_ATTRIBUTES); - } else if ("notes".equals(localName)) { - closeStyleTags(); - handler.startElement(XHTML, "span", "p", NOTES_ATTRIBUTES); - } else { - super.startElement(namespaceURI, localName, qName, attrs); - } - } - } - - @Override - public void endElement( - String namespaceURI, String localName, String qName) - throws SAXException { - if (STYLE_NS.equals(namespaceURI) && "style".equals(localName)) { - if (currTextStyle != null && currTextStyleName != null) { - textStyleMap.put(currTextStyleName, currTextStyle); - currTextStyleName = null; - currTextStyle = null; - } else if (currTextStyle != null && currParagraphStyleName != null) { - paragraphTextStyleMap.put(currParagraphStyleName, currTextStyle); - currParagraphStyleName = null; - currTextStyle = null; - } - } else if (TEXT_NS.equals(namespaceURI) && "list-style".equals(localName)) { - listStyle = null; - } - - // call next handler if no filtering - if (completelyFiltered == 0) { - // special handling of text:h, that are directly passed - // to incoming handler - if (TEXT_NS.equals(namespaceURI) && "h".equals(localName)) { - final String el = headingStack.pop(); - handler.endElement(XHTMLContentHandler.XHTML, el, el); - } else if (TEXT_NS.equals(namespaceURI) && "list".equals(localName)) { - endList(); - } else if (TEXT_NS.equals(namespaceURI) && "span".equals(localName)) { - currTextStyle = null; - hasWrittenStartStyleTags = false; - } else if (TEXT_NS.equals(namespaceURI) && "p".equals(localName)) { - endParagraph(); - } else if ("annotation".equals(localName) || "note".equals(localName) || - "notes".equals(localName)) { - closeStyleTags(); - handler.endElement("", localName, localName); - } else { - super.endElement(namespaceURI, localName, qName); - } - - // special handling of tabulators - if (TEXT_NS.equals(namespaceURI) - && ("tab-stop".equals(localName) - || "tab".equals(localName))) { - this.characters(TAB, 0, TAB.length); - } - } - - // revert filter for *all* content of some tags - if (needsCompleteFiltering(namespaceURI, localName)) { - completelyFiltered--; - } - assert completelyFiltered >= 0; - - // reduce current node depth - nodeDepth--; - assert nodeDepth >= 0; - } - - @Override - public void startPrefixMapping(String prefix, String uri) { - // remove prefix mappings as they should not occur in XHTML - } - - @Override - public void endPrefixMapping(String prefix) { - // remove prefix mappings as they should not occur in XHTML - } - } - - public static final String TEXT_NS = - "urn:oasis:names:tc:opendocument:xmlns:text:1.0"; - - public static final String TABLE_NS = - "urn:oasis:names:tc:opendocument:xmlns:table:1.0"; - - public static final String STYLE_NS = - "urn:oasis:names:tc:opendocument:xmlns:style:1.0"; - - public static final String FORMATTING_OBJECTS_NS = - "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"; - - public static final String OFFICE_NS = - "urn:oasis:names:tc:opendocument:xmlns:office:1.0"; - - public static final String SVG_NS = - "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"; - - public static final String PRESENTATION_NS = - "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"; - - public static final String DRAW_NS = - "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"; - - public static final String XLINK_NS = "http://www.w3.org/1999/xlink"; - - protected static final char[] TAB = new char[]{'\t'}; - - private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl(); - - /** - * Mappings between ODF tag names and XHTML tag names - * (including attributes). All other tag names/attributes are ignored - * and left out from event stream. - */ - private static final HashMap MAPPINGS = - new HashMap(); - - static { - // general mappings of text:-tags - MAPPINGS.put( - new QName(TEXT_NS, "p"), - new TargetElement(XHTML, "p")); - // text:h-tags are mapped specifically in startElement/endElement - MAPPINGS.put( - new QName(TEXT_NS, "line-break"), - new TargetElement(XHTML, "br")); - MAPPINGS.put( - new QName(TEXT_NS, "list-item"), - new TargetElement(XHTML, "li")); - MAPPINGS.put( - new QName(TEXT_NS, "note"), - new TargetElement(XHTML, "span")); - MAPPINGS.put( - new QName(OFFICE_NS, "annotation"), - new TargetElement(XHTML, "span")); - MAPPINGS.put( - new QName(PRESENTATION_NS, "notes"), - new TargetElement(XHTML, "span")); - MAPPINGS.put( - new QName(DRAW_NS, "object"), - new TargetElement(XHTML, "object")); - MAPPINGS.put( - new QName(DRAW_NS, "text-box"), - new TargetElement(XHTML, "div")); - MAPPINGS.put( - new QName(SVG_NS, "title"), - new TargetElement(XHTML, "span")); - MAPPINGS.put( - new QName(SVG_NS, "desc"), - new TargetElement(XHTML, "span")); - MAPPINGS.put( - new QName(TEXT_NS, "span"), - new TargetElement(XHTML, "span")); - - final HashMap aAttsMapping = - new HashMap(); - aAttsMapping.put( - new QName(XLINK_NS, "href"), - new QName("href")); - aAttsMapping.put( - new QName(XLINK_NS, "title"), - new QName("title")); - MAPPINGS.put( - new QName(TEXT_NS, "a"), - new TargetElement(XHTML, "a", aAttsMapping)); - - // create HTML tables from table:-tags - MAPPINGS.put( - new QName(TABLE_NS, "table"), - new TargetElement(XHTML, "table")); - // repeating of rows is ignored; for columns, see below! - MAPPINGS.put( - new QName(TABLE_NS, "table-row"), - new TargetElement(XHTML, "tr")); - // special mapping for rowspan/colspan attributes - final HashMap tableCellAttsMapping = - new HashMap(); - tableCellAttsMapping.put( - new QName(TABLE_NS, "number-columns-spanned"), - new QName("colspan")); - tableCellAttsMapping.put( - new QName(TABLE_NS, "number-rows-spanned"), - new QName("rowspan")); - /* TODO: The following is not correct, the cell should be repeated not spanned! - * Code generates a HTML cell, spanning all repeated columns, to make the cell look correct. - * Problems may occur when both spanning and repeating is given, which is not allowed by spec. - * Cell spanning instead of repeating is not a problem, because OpenOffice uses it - * only for empty cells. - */ - tableCellAttsMapping.put( - new QName(TABLE_NS, "number-columns-repeated"), - new QName("colspan")); - MAPPINGS.put( - new QName(TABLE_NS, "table-cell"), - new TargetElement(XHTML, "td", tableCellAttsMapping)); - } public Set getSupportedTypes(ParseContext context) { return Collections.emptySet(); // not a top-level parser } - public void parse( - InputStream stream, ContentHandler handler, - Metadata metadata, ParseContext context) - throws IOException, SAXException, TikaException { - parseInternal(stream, - new XHTMLContentHandler(handler, metadata), - metadata, context); + public void parse(InputStream stream, ContentHandler handler, Metadata metadata, + ParseContext context) throws IOException, SAXException, TikaException { + parseInternal(stream, new XHTMLContentHandler(handler, metadata), metadata, context); } - void parseInternal( - InputStream stream, final ContentHandler handler, - Metadata metadata, ParseContext context) - throws IOException, SAXException, TikaException { + void parseInternal(InputStream stream, final ContentHandler handler, Metadata metadata, + ParseContext context) throws IOException, SAXException, TikaException { - DefaultHandler dh = new OpenDocumentElementMappingContentHandler(handler, MAPPINGS); + DefaultHandler dh = new OpenDocumentBodyHandler(handler, context); - XMLReaderUtils.parseSAX( - new CloseShieldInputStream(stream), - new OfflineContentHandler( - new NSNormalizerContentHandler(dh)), - context); + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), + new OfflineContentHandler(new NSNormalizerContentHandler(dh)), context); } } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java new file mode 100644 index 00000000..3214e96f --- /dev/null +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMacroHandler.java @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.parser.odf; + +import java.io.IOException; + +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; + +import org.apache.tika.parser.ParseContext; +import org.apache.tika.utils.XMLReaderUtils; + + +class OpenDocumentMacroHandler extends FlatOpenDocumentMacroHandler { + + OpenDocumentMacroHandler(ContentHandler contentHandler, ParseContext parseContext) { + super(contentHandler, parseContext); + } + + @Override + public void startElement(String namespaceURI, String localName, String qName, Attributes attrs) + throws SAXException { + //in the compressed odf, there should only be one element in this file. + if (MODULE.equalsIgnoreCase(localName)) { + inMacro = true; + macroName = XMLReaderUtils.getAttrValue(NAME, attrs); + } + } + + + @Override + public void endElement(String namespaceURI, String localName, String qName) + throws SAXException { + if (MODULE.equals(localName)) { + try { + handleMacro(); + } catch (IOException e) { + throw new SAXException(e); + } finally { + //this shouldn't be necessary in the compressed odf files + resetMacroState(); + } + } + } +} diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentManifestHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentManifestHandler.java new file mode 100644 index 00000000..47f49e57 --- /dev/null +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentManifestHandler.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.parser.odf; + +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; + +import org.apache.tika.exception.EncryptedDocumentException; +import org.apache.tika.sax.ContentHandlerDecorator; + +/** + * For now, this only looks for any encryption-data elements. + * If found this will throw an EncryptedDocumentException wrapped + * in a SAXException. + * + * If desired, we can add to this to actually extract information + * necessary for decryption. Please open an issue or pull + * request for this added functionality. + * + */ +class OpenDocumentManifestHandler extends ContentHandlerDecorator { + + @Override + public void startElement( + String namespaceURI, String localName, String qName, + Attributes attrs) throws SAXException { + if (localName.equals("encryption-data")) { + throw new SAXException(new EncryptedDocumentException()); + } + } +} diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java index 11922d7d..d717d13d 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentMetaParser.java @@ -16,12 +16,21 @@ */ package org.apache.tika.parser.odf; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; + import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.DublinCore; -import org.apache.tika.metadata.MSOffice; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Office; import org.apache.tika.metadata.OfficeOpenXMLCore; +import org.apache.tika.metadata.OfficeOpenXMLExtended; import org.apache.tika.metadata.PagedText; import org.apache.tika.metadata.Property; import org.apache.tika.metadata.TikaCoreProperties; @@ -36,11 +45,6 @@ import org.apache.tika.sax.xpath.CompositeMatcher; import org.apache.tika.sax.xpath.Matcher; import org.apache.tika.sax.xpath.MatchingContentHandler; import org.apache.tika.sax.xpath.XPathParser; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; - -import java.io.IOException; -import java.io.InputStream; /** * Parser for OpenDocument meta.xml files. @@ -54,68 +58,54 @@ public class OpenDocumentMetaParser extends XMLParser { private static final String META_NS = "urn:oasis:names:tc:opendocument:xmlns:meta:1.0"; private static final XPathParser META_XPATH = new XPathParser("meta", META_NS); - /** - * @see OfficeOpenXMLCore#SUBJECT - * @deprecated use OfficeOpenXMLCore#SUBJECT - */ - @Deprecated - private static final Property TRANSITION_INITIAL_CREATOR_TO_INITIAL_AUTHOR = - Property.composite(Office.INITIAL_AUTHOR, - new Property[]{Property.externalText("initial-creator")}); - - private static ContentHandler getDublinCoreHandler( - Metadata metadata, Property property, String element) { - return new ElementMetadataHandler( - DublinCore.NAMESPACE_URI_DC, element, - metadata, property); + private static ContentHandler getDublinCoreHandler(Metadata metadata, Property property, + String element) { + return new ElementMetadataHandler(DublinCore.NAMESPACE_URI_DC, element, metadata, property); } - private static ContentHandler getMeta( - ContentHandler ch, Metadata md, Property property, String element) { - Matcher matcher = new CompositeMatcher( - META_XPATH.parse("//meta:" + element), - META_XPATH.parse("//meta:" + element + "//text()")); + private static ContentHandler getMeta(ContentHandler ch, Metadata md, Property property, + String element) { + Matcher matcher = new CompositeMatcher(META_XPATH.parse("//meta:" + element), + META_XPATH.parse("//meta:" + element + "//text()")); ContentHandler branch = - new MatchingContentHandler(new MetadataHandler(md, property), matcher); + new MatchingContentHandler(new MetadataHandler(md, property), matcher); return new TeeContentHandler(ch, branch); } - private static ContentHandler getUserDefined( - ContentHandler ch, Metadata md) { - Matcher matcher = new CompositeMatcher( - META_XPATH.parse("//meta:user-defined/@meta:name"), - META_XPATH.parse("//meta:user-defined//text()")); - // eg Text1 becomes custom:Info1=Text1 + private static ContentHandler getUserDefined(ContentHandler ch, Metadata md) { + Matcher matcher = new CompositeMatcher(META_XPATH.parse("//meta:user-defined/@meta:name"), + META_XPATH.parse("//meta:user-defined//text()")); + // eg Text1 becomes + // custom:Info1=Text1 ContentHandler branch = new MatchingContentHandler( - new AttributeDependantMetadataHandler(md, "meta:name", Metadata.USER_DEFINED_METADATA_NAME_PREFIX), - matcher); + new AttributeDependantMetadataHandler(md, "meta:name", + Office.USER_DEFINED_METADATA_NAME_PREFIX), matcher); return new TeeContentHandler(ch, branch); } @Deprecated - private static ContentHandler getStatistic( - ContentHandler ch, Metadata md, String name, String attribute) { - Matcher matcher = - META_XPATH.parse("//meta:document-statistic/@meta:" + attribute); + private static ContentHandler getStatistic(ContentHandler ch, Metadata md, String name, + String attribute) { + Matcher matcher = META_XPATH.parse("//meta:document-statistic/@meta:" + attribute); ContentHandler branch = new MatchingContentHandler( - new AttributeMetadataHandler(META_NS, attribute, md, name), matcher); + new AttributeMetadataHandler(META_NS, attribute, md, name), matcher); return new TeeContentHandler(ch, branch); } - private static ContentHandler getStatistic( - ContentHandler ch, Metadata md, Property property, String attribute) { - Matcher matcher = - META_XPATH.parse("//meta:document-statistic/@meta:" + attribute); + private static ContentHandler getStatistic(ContentHandler ch, Metadata md, Property property, + String attribute) { + Matcher matcher = META_XPATH.parse("//meta:document-statistic/@meta:" + attribute); ContentHandler branch = new MatchingContentHandler( - new AttributeMetadataHandler(META_NS, attribute, md, property), matcher); + new AttributeMetadataHandler(META_NS, attribute, md, property), matcher); return new TeeContentHandler(ch, branch); } - protected ContentHandler getContentHandler(ContentHandler ch, Metadata md, ParseContext context) { + static ContentHandler getContentHandler(Metadata md, ParseContext context, + ContentHandler... handlers) { // We can no longer extend DcXMLParser due to the handling of dc:subject and dc:date - // Process the Dublin Core Attributes - ch = new TeeContentHandler(super.getContentHandler(ch, md, context), - getDublinCoreHandler(md, TikaCoreProperties.TITLE, "title"), + // Process the Dublin Core Attributes + ContentHandler ch = + new TeeContentHandler(getDublinCoreHandler(md, TikaCoreProperties.TITLE, "title"), getDublinCoreHandler(md, TikaCoreProperties.CREATOR, "creator"), getDublinCoreHandler(md, TikaCoreProperties.DESCRIPTION, "description"), getDublinCoreHandler(md, TikaCoreProperties.PUBLISHER, "publisher"), @@ -129,19 +119,20 @@ public class OpenDocumentMetaParser extends XMLParser { // Process the OO Meta Attributes ch = getMeta(ch, md, TikaCoreProperties.CREATED, "creation-date"); // ODF uses dc:date for modified - ch = new TeeContentHandler(ch, new ElementMetadataHandler( - DublinCore.NAMESPACE_URI_DC, "date", - md, TikaCoreProperties.MODIFIED)); + ch = new TeeContentHandler(ch, + new ElementMetadataHandler(DublinCore.NAMESPACE_URI_DC, "date", md, + TikaCoreProperties.MODIFIED)); // ODF uses dc:subject for description - ch = new TeeContentHandler(ch, new ElementMetadataHandler( - DublinCore.NAMESPACE_URI_DC, "subject", - md, TikaCoreProperties.TRANSITION_SUBJECT_TO_OO_SUBJECT)); - ch = getMeta(ch, md, TikaCoreProperties.TRANSITION_KEYWORDS_TO_DC_SUBJECT, "keyword"); + ch = new TeeContentHandler(ch, + new ElementMetadataHandler(DublinCore.NAMESPACE_URI_DC, "subject", md, + OfficeOpenXMLCore.SUBJECT)); - ch = getMeta(ch, md, Property.externalText(MSOffice.EDIT_TIME), "editing-duration"); + ch = getMeta(ch, md, Office.KEYWORDS, "keyword"); + + ch = getMeta(ch, md, OfficeOpenXMLExtended.TOTAL_TIME, "editing-duration"); ch = getMeta(ch, md, Property.externalText("editing-cycles"), "editing-cycles"); - ch = getMeta(ch, md, TRANSITION_INITIAL_CREATOR_TO_INITIAL_AUTHOR, "initial-creator"); + ch = getMeta(ch, md, TikaCoreProperties.CREATOR, "initial-creator"); ch = getMeta(ch, md, Property.externalText("generator"), "generator"); // Process the user defined Meta Attributes @@ -157,43 +148,48 @@ public class OpenDocumentMetaParser extends XMLParser { ch = getStatistic(ch, md, Office.WORD_COUNT, "word-count"); ch = getStatistic(ch, md, Office.CHARACTER_COUNT, "character-count"); - // Legacy, Tika-1.0 style attributes - // TODO Remove these in Tika 2.0 - ch = getStatistic(ch, md, MSOffice.OBJECT_COUNT, "object-count"); - ch = getStatistic(ch, md, MSOffice.IMAGE_COUNT, "image-count"); - ch = getStatistic(ch, md, MSOffice.PAGE_COUNT, "page-count"); - ch = getStatistic(ch, md, MSOffice.TABLE_COUNT, "table-count"); - ch = getStatistic(ch, md, MSOffice.PARAGRAPH_COUNT, "paragraph-count"); - ch = getStatistic(ch, md, MSOffice.WORD_COUNT, "word-count"); - ch = getStatistic(ch, md, MSOffice.CHARACTER_COUNT, "character-count"); - - // Legacy Statistics Attributes, replaced with real keys above - // TODO Remove these shortly, eg after Tika 1.1 (TIKA-770) - ch = getStatistic(ch, md, "nbPage", "page-count"); - ch = getStatistic(ch, md, "nbPara", "paragraph-count"); - ch = getStatistic(ch, md, "nbWord", "word-count"); - ch = getStatistic(ch, md, "nbCharacter", "character-count"); - ch = getStatistic(ch, md, "nbTab", "table-count"); - ch = getStatistic(ch, md, "nbObject", "object-count"); - ch = getStatistic(ch, md, "nbImg", "image-count"); - + if (handlers != null && handlers.length > 0) { + ContentHandler[] newHandlers = new ContentHandler[handlers.length + 1]; + newHandlers[0] = ch; + System.arraycopy(handlers, 0, newHandlers, 1, handlers.length); + ch = new TeeContentHandler(newHandlers); + } // Normalise the rest ch = new NSNormalizerContentHandler(ch); return ch; } + protected ContentHandler getContentHandler(ContentHandler ch, Metadata md, + ParseContext context) { + return getContentHandler(md, context, super.getContentHandler(ch, md, context)); + } + @Override - public void parse( - InputStream stream, ContentHandler handler, - Metadata metadata, ParseContext context) - throws IOException, SAXException, TikaException { + public void parse(InputStream stream, ContentHandler handler, Metadata metadata, + ParseContext context) throws IOException, SAXException, TikaException { super.parse(stream, handler, metadata, context); // Copy subject to description for OO2 String odfSubject = metadata.get(OfficeOpenXMLCore.SUBJECT); if (odfSubject != null && !odfSubject.equals("") && - (metadata.get(TikaCoreProperties.DESCRIPTION) == null || metadata.get(TikaCoreProperties.DESCRIPTION).equals(""))) { + (metadata.get(TikaCoreProperties.DESCRIPTION) == null || + metadata.get(TikaCoreProperties.DESCRIPTION).equals(""))) { metadata.set(TikaCoreProperties.DESCRIPTION, odfSubject); } + //reset the dc:subject to include both keywords and subject + //We can't relying on composite keys in the MatchingContentHandlers + //because those are "setting" not "adding" to the Metadata object + List subjects = new ArrayList<>(); + if (metadata.getValues(Office.KEYWORDS) != null) { + subjects.addAll(Arrays.asList(metadata.getValues(Office.KEYWORDS))); + } + + if (metadata.getValues(OfficeOpenXMLCore.SUBJECT) != null) { + subjects.addAll(Arrays.asList(metadata.getValues(OfficeOpenXMLCore.SUBJECT))); + } + + if (subjects.size() > 0) { + metadata.set(TikaCoreProperties.SUBJECT, subjects.toArray(new String[0])); + } } } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java index 6ba5281f..3d6b467d 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/odf/OpenDocumentParser.java @@ -16,37 +16,44 @@ */ package org.apache.tika.parser.odf; +import static java.nio.charset.StandardCharsets.UTF_8; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipInputStream; + import org.apache.commons.io.IOUtils; +import org.apache.commons.io.input.CloseShieldInputStream; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import org.apache.tika.config.Field; +import org.apache.tika.exception.EncryptedDocumentException; import org.apache.tika.exception.TikaException; -import org.apache.tika.extractor.EmbeddedDocumentExtractor; +import org.apache.tika.exception.WriteLimitReachedException; import org.apache.tika.extractor.EmbeddedDocumentUtil; import org.apache.tika.io.TikaInputStream; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TikaCoreProperties; -import org.apache.tika.metadata.TikaMetadataKeys; import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; import org.apache.tika.sax.EmbeddedContentHandler; import org.apache.tika.sax.EndDocumentShieldingContentHandler; +import org.apache.tika.sax.OfflineContentHandler; import org.apache.tika.sax.XHTMLContentHandler; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Set; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; -import java.util.zip.ZipInputStream; - -import static java.nio.charset.StandardCharsets.UTF_8; +import org.apache.tika.utils.XMLReaderUtils; /** * OpenOffice parser @@ -58,47 +65,48 @@ public class OpenDocumentParser extends AbstractParser { */ private static final long serialVersionUID = -6410276875438618287L; - private static final Set SUPPORTED_TYPES = - Collections.unmodifiableSet(new HashSet(Arrays.asList( - MediaType.application("vnd.sun.xml.writer"), - MediaType.application("vnd.oasis.opendocument.text"), - MediaType.application("vnd.oasis.opendocument.graphics"), - MediaType.application("vnd.oasis.opendocument.presentation"), - MediaType.application("vnd.oasis.opendocument.spreadsheet"), - MediaType.application("vnd.oasis.opendocument.chart"), - MediaType.application("vnd.oasis.opendocument.image"), - MediaType.application("vnd.oasis.opendocument.formula"), - MediaType.application("vnd.oasis.opendocument.text-master"), - MediaType.application("vnd.oasis.opendocument.text-web"), - MediaType.application("vnd.oasis.opendocument.text-template"), - MediaType.application("vnd.oasis.opendocument.graphics-template"), - MediaType.application("vnd.oasis.opendocument.presentation-template"), - MediaType.application("vnd.oasis.opendocument.spreadsheet-template"), - MediaType.application("vnd.oasis.opendocument.chart-template"), - MediaType.application("vnd.oasis.opendocument.image-template"), - MediaType.application("vnd.oasis.opendocument.formula-template"), - MediaType.application("x-vnd.oasis.opendocument.text"), - MediaType.application("x-vnd.oasis.opendocument.graphics"), - MediaType.application("x-vnd.oasis.opendocument.presentation"), - MediaType.application("x-vnd.oasis.opendocument.spreadsheet"), - MediaType.application("x-vnd.oasis.opendocument.chart"), - MediaType.application("x-vnd.oasis.opendocument.image"), - MediaType.application("x-vnd.oasis.opendocument.formula"), - MediaType.application("x-vnd.oasis.opendocument.text-master"), - MediaType.application("x-vnd.oasis.opendocument.text-web"), - MediaType.application("x-vnd.oasis.opendocument.text-template"), - MediaType.application("x-vnd.oasis.opendocument.graphics-template"), - MediaType.application("x-vnd.oasis.opendocument.presentation-template"), - MediaType.application("x-vnd.oasis.opendocument.spreadsheet-template"), - MediaType.application("x-vnd.oasis.opendocument.chart-template"), - MediaType.application("x-vnd.oasis.opendocument.image-template"), - MediaType.application("x-vnd.oasis.opendocument.formula-template")))); + private static final Set SUPPORTED_TYPES = Collections.unmodifiableSet( + new HashSet<>(Arrays.asList(MediaType.application("vnd.sun.xml.writer"), + MediaType.application("vnd.oasis.opendocument.text"), + MediaType.application("vnd.oasis.opendocument.graphics"), + MediaType.application("vnd.oasis.opendocument.presentation"), + MediaType.application("vnd.oasis.opendocument.spreadsheet"), + MediaType.application("vnd.oasis.opendocument.chart"), + MediaType.application("vnd.oasis.opendocument.image"), + MediaType.application("vnd.oasis.opendocument.formula"), + MediaType.application("vnd.oasis.opendocument.text-master"), + MediaType.application("vnd.oasis.opendocument.text-web"), + MediaType.application("vnd.oasis.opendocument.text-template"), + MediaType.application("vnd.oasis.opendocument.graphics-template"), + MediaType.application("vnd.oasis.opendocument.presentation-template"), + MediaType.application("vnd.oasis.opendocument.spreadsheet-template"), + MediaType.application("vnd.oasis.opendocument.chart-template"), + MediaType.application("vnd.oasis.opendocument.image-template"), + MediaType.application("vnd.oasis.opendocument.formula-template"), + MediaType.application("x-vnd.oasis.opendocument.text"), + MediaType.application("x-vnd.oasis.opendocument.graphics"), + MediaType.application("x-vnd.oasis.opendocument.presentation"), + MediaType.application("x-vnd.oasis.opendocument.spreadsheet"), + MediaType.application("x-vnd.oasis.opendocument.chart"), + MediaType.application("x-vnd.oasis.opendocument.image"), + MediaType.application("x-vnd.oasis.opendocument.formula"), + MediaType.application("x-vnd.oasis.opendocument.text-master"), + MediaType.application("x-vnd.oasis.opendocument.text-web"), + MediaType.application("x-vnd.oasis.opendocument.text-template"), + MediaType.application("x-vnd.oasis.opendocument.graphics-template"), + MediaType.application("x-vnd.oasis.opendocument.presentation-template"), + MediaType.application("x-vnd.oasis.opendocument.spreadsheet-template"), + MediaType.application("x-vnd.oasis.opendocument.chart-template"), + MediaType.application("x-vnd.oasis.opendocument.image-template"), + MediaType.application("x-vnd.oasis.opendocument.formula-template")))); private static final String META_NAME = "meta.xml"; + private static final String MANIFEST_NAME = "META-INF/manifest.xml"; private Parser meta = new OpenDocumentMetaParser(); private Parser content = new OpenDocumentContentParser(); + private boolean extractMacros = false; public Parser getMetaParser() { return meta; @@ -120,10 +128,10 @@ public class OpenDocumentParser extends AbstractParser { return SUPPORTED_TYPES; } - public void parse( - InputStream stream, ContentHandler baseHandler, - Metadata metadata, ParseContext context) - throws IOException, SAXException, TikaException { + public void parse(InputStream stream, ContentHandler baseHandler, Metadata metadata, + ParseContext context) throws IOException, SAXException, TikaException { + + EmbeddedDocumentUtil embeddedDocumentUtil = new EmbeddedDocumentUtil(context); // Open the Zip stream // Use a File if we can, and an already open zip is even better @@ -145,85 +153,129 @@ public class OpenDocumentParser extends AbstractParser { // Prepare to handle the content XHTMLContentHandler xhtml = new XHTMLContentHandler(baseHandler, metadata); - + xhtml.startDocument(); // As we don't know which of the metadata or the content // we'll hit first, catch the endDocument call initially - EndDocumentShieldingContentHandler handler = - new EndDocumentShieldingContentHandler(xhtml); + EndDocumentShieldingContentHandler handler = new EndDocumentShieldingContentHandler(xhtml); - if (zipFile != null) { - try { - handleZipFile(zipFile, metadata, context, handler); - } finally { - //Do we want to close silently == catch an exception here? - zipFile.close(); + try { + if (zipFile != null) { + try { + handleZipFile(zipFile, metadata, context, handler, embeddedDocumentUtil); + } finally { + //Do we want to close silently == catch an exception here? + zipFile.close(); + } + } else { + try { + handleZipStream(zipStream, metadata, context, handler, embeddedDocumentUtil); + } finally { + //Do we want to close silently == catch an exception here? + zipStream.close(); + } } - } else { - try { - handleZipStream(zipStream, metadata, context, handler); - } finally { - //Do we want to close silently == catch an exception here? - zipStream.close(); + } catch (SAXException e) { + if (e.getCause() instanceof EncryptedDocumentException) { + throw (EncryptedDocumentException)e.getCause(); } + throw e; } // Only now call the end document - if (handler.getEndDocumentWasCalled()) { + if (handler.isEndDocumentWasCalled()) { handler.reallyEndDocument(); } } - private void handleZipStream(ZipInputStream zipStream, Metadata metadata, ParseContext context, EndDocumentShieldingContentHandler handler) throws IOException, TikaException, SAXException { - ZipEntry entry = zipStream.getNextEntry(); - if (entry == null) { - throw new IOException("No entries found in ZipInputStream"); - } - do { - handleZipEntry(entry, zipStream, metadata, context, handler); - entry = zipStream.getNextEntry(); - } while (entry != null); + @Field + public void setExtractMacros(boolean extractMacros) { + this.extractMacros = extractMacros; } - private void handleZipFile(ZipFile zipFile, Metadata metadata, - ParseContext context, EndDocumentShieldingContentHandler handler) - throws IOException, TikaException, SAXException { + private void handleZipStream(ZipInputStream zipStream, Metadata metadata, ParseContext context, + EndDocumentShieldingContentHandler handler, + EmbeddedDocumentUtil embeddedDocumentUtil) + throws IOException, TikaException, SAXException { + ZipEntry entry = zipStream.getNextEntry(); + if (entry == null) { + throw new IOException("No entries found in ZipInputStream"); + } + List exceptions = new ArrayList<>(); + do { + try { + handleZipEntry(entry, zipStream, metadata, context, handler, + embeddedDocumentUtil); + } catch (SAXException e) { + WriteLimitReachedException.throwIfWriteLimitReached(e); + if (e.getCause() instanceof EncryptedDocumentException) { + throw (EncryptedDocumentException)e.getCause(); + } else { + exceptions.add(e); + } + } + entry = zipStream.getNextEntry(); + } while (entry != null); + + if (exceptions.size() > 0) { + throw exceptions.get(0); + } + } + + private void handleZipFile(ZipFile zipFile, Metadata metadata, ParseContext context, + EndDocumentShieldingContentHandler handler, + EmbeddedDocumentUtil embeddedDocumentUtil) + throws IOException, TikaException, SAXException { // If we can, process the metadata first, then the // rest of the file afterwards (TIKA-1353) // Only possible to guarantee that when opened from a file not a stream - ZipEntry entry = zipFile.getEntry(META_NAME); + ZipEntry entry = zipFile.getEntry(MANIFEST_NAME); if (entry != null) { - handleZipEntry(entry, zipFile.getInputStream(entry), metadata, context, handler); + handleZipEntry(entry, zipFile.getInputStream(entry), metadata, context, + handler, embeddedDocumentUtil); + } + + entry = zipFile.getEntry(META_NAME); + if (entry != null) { + handleZipEntry(entry, zipFile.getInputStream(entry), metadata, context, + handler, embeddedDocumentUtil); } Enumeration entries = zipFile.entries(); while (entries.hasMoreElements()) { entry = entries.nextElement(); if (!META_NAME.equals(entry.getName())) { - handleZipEntry(entry, zipFile.getInputStream(entry), metadata, context, handler); + handleZipEntry(entry, zipFile.getInputStream(entry), metadata, + context, handler, embeddedDocumentUtil); } } } - private void handleZipEntry(ZipEntry entry, InputStream zip, Metadata metadata, - ParseContext context, EndDocumentShieldingContentHandler handler) - throws IOException, SAXException, TikaException { - if (entry == null) return; - if (entry.getName().equals("mimetype")) { + private void handleZipEntry(ZipEntry entry, InputStream zip, Metadata metadata, + ParseContext context, ContentHandler handler, + EmbeddedDocumentUtil embeddedDocumentUtil) + throws IOException, SAXException, TikaException { + + + if (entry.getName().contains("manifest.xml")) { + checkForEncryption(zip, context); + } else if (entry.getName().equals("mimetype")) { String type = IOUtils.toString(zip, UTF_8); metadata.set(Metadata.CONTENT_TYPE, type); } else if (entry.getName().equals(META_NAME)) { meta.parse(zip, new DefaultHandler(), metadata, context); } else if (entry.getName().endsWith("content.xml")) { if (content instanceof OpenDocumentContentParser) { - ((OpenDocumentContentParser) content).parseInternal(zip, handler, metadata, context); + ((OpenDocumentContentParser) content) + .parseInternal(zip, handler, metadata, context); } else { // Foreign content parser was set: content.parse(zip, handler, metadata, context); } } else if (entry.getName().endsWith("styles.xml")) { if (content instanceof OpenDocumentContentParser) { - ((OpenDocumentContentParser) content).parseInternal(zip, handler, metadata, context); + ((OpenDocumentContentParser) content) + .parseInternal(zip, handler, metadata, context); } else { // Foreign content parser was set: content.parse(zip, handler, metadata, context); @@ -231,26 +283,87 @@ public class OpenDocumentParser extends AbstractParser { } else { String embeddedName = entry.getName(); //scrape everything under Thumbnails/ and Pictures/ - if (embeddedName.contains("Thumbnails/") || - embeddedName.contains("Pictures/")) { - EmbeddedDocumentExtractor embeddedDocumentExtractor = - EmbeddedDocumentUtil.getEmbeddedDocumentExtractor(context); + if (embeddedName.contains("Thumbnails/") || embeddedName.contains("Pictures/")) { + Metadata embeddedMetadata = new Metadata(); - embeddedMetadata.set(TikaCoreProperties.ORIGINAL_RESOURCE_NAME, entry.getName()); - /* if (embeddedName.startsWith("Thumbnails/")) { + TikaInputStream stream = TikaInputStream.get(zip); + + embeddedMetadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, entry.getName()); + if (embeddedName.startsWith("Thumbnails/")) { embeddedMetadata.set(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE, - TikaCoreProperties.EmbeddedResourceType.THUMBNAIL); - }*/ + TikaCoreProperties.EmbeddedResourceType.THUMBNAIL.toString()); + } + if (embeddedName.contains("Pictures/")) { - embeddedMetadata.set(TikaMetadataKeys.EMBEDDED_RESOURCE_TYPE, - TikaCoreProperties.EmbeddedResourceType.INLINE.toString()); + embeddedMetadata.set(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE, + TikaCoreProperties.EmbeddedResourceType.INLINE.toString()); + + MediaType embeddedMimeType = + embeddedDocumentUtil.getDetector().detect(stream, embeddedMetadata); + if (embeddedMimeType != null) { + embeddedMetadata.set(Metadata.CONTENT_TYPE, embeddedMimeType.toString()); + } + stream.reset(); } - if (embeddedDocumentExtractor.shouldParseEmbedded(embeddedMetadata)) { - embeddedDocumentExtractor.parseEmbedded(zip, - new EmbeddedContentHandler(handler), embeddedMetadata, false); + + if (embeddedDocumentUtil.shouldParseEmbedded(embeddedMetadata)) { + embeddedDocumentUtil.parseEmbedded(stream, new EmbeddedContentHandler(handler), + embeddedMetadata, false); } + } else if (extractMacros && embeddedName.contains("Basic/")) { + //process all files under Basic/; let maybeHandleMacro figure + //out if it is a macro or not + maybeHandleMacro(zip, embeddedName, handler, context); } } } + + private void maybeHandleMacro(InputStream is, String embeddedName, ContentHandler handler, + ParseContext context) + throws TikaException, IOException, SAXException { + //should probably run XMLRootExtractor on the inputstream + //or read the macro manifest for the names of the macros + //rather than relying on the script file name + if (ignoreScriptFile(embeddedName)) { + return; + } + Metadata embeddedMetadata = new Metadata(); + embeddedMetadata.set(TikaCoreProperties.EMBEDDED_RESOURCE_TYPE, + TikaCoreProperties.EmbeddedResourceType.MACRO.toString()); + handler = new OpenDocumentMacroHandler(handler, context); + XMLReaderUtils.parseSAX(new CloseShieldInputStream(is), + new OfflineContentHandler(new EmbeddedContentHandler(handler)), context); + } + + private void checkForEncryption(InputStream stream, ParseContext context) + throws SAXException, TikaException, IOException { + try { + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), + new OfflineContentHandler(new EmbeddedContentHandler( + new OpenDocumentManifestHandler())), context); + } catch (SAXException e) { + if (e.getCause() != null + && e.getCause() instanceof EncryptedDocumentException) { + throw (EncryptedDocumentException)e.getCause(); + } + //otherwise...swallow + } + } + + private boolean ignoreScriptFile(String embeddedName) { + if (embeddedName.contains("Basic/")) { + if (embeddedName.contains("script-lb.xml")) { + return true; + } else if (embeddedName.contains("script-lc.xml")) { + return true; + } + } else { + //shouldn't ever get here, but if it isn't under Basic/, ignore it + return true; + } + return false; + } + + } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java index cbff35e7..8051bffb 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/AbstractMetadataHandler.java @@ -16,13 +16,14 @@ */ package org.apache.tika.parser.xml; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.Property; -import org.xml.sax.helpers.DefaultHandler; - import java.util.Arrays; import java.util.List; +import org.xml.sax.helpers.DefaultHandler; + +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.Property; + /** * Base class for SAX handlers that map SAX events into document metadata. * @@ -39,11 +40,12 @@ class AbstractMetadataHandler extends DefaultHandler { this.property = null; this.name = name; } + protected AbstractMetadataHandler(Metadata metadata, Property property) { - this.metadata = metadata; - this.property = property; - this.name = property.getName(); - } + this.metadata = metadata; + this.property = property; + this.name = property.getName(); + } /** * Adds the given metadata value. The value is ignored if it is @@ -59,9 +61,9 @@ class AbstractMetadataHandler extends DefaultHandler { List previous = Arrays.asList(metadata.getValues(name)); if (!previous.contains(value)) { if (property != null) { - metadata.add(property, value); + metadata.add(property, value); } else { - metadata.add(name, value); + metadata.add(name, value); } } } else { @@ -69,23 +71,23 @@ class AbstractMetadataHandler extends DefaultHandler { String previous = metadata.get(name); if (previous != null && previous.length() > 0) { if (!previous.equals(value)) { - if (property != null) { - if (property.isMultiValuePermitted()) { - metadata.add(property, value); - } else { - // Replace the existing value if isMultiValuePermitted is false - metadata.set(property, value); - } - } else { - metadata.add(name, value); - } + if (property != null) { + if (property.isMultiValuePermitted()) { + metadata.add(property, value); + } else { + // Replace the existing value if isMultiValuePermitted is false + metadata.set(property, value); + } + } else { + metadata.add(name, value); + } } } else { - if (property != null) { - metadata.set(property, value); - } else { - metadata.set(name, value); - } + if (property != null) { + metadata.set(property, value); + } else { + metadata.set(name, value); + } } } } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java index c1795fad..1f6e1d70 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeDependantMetadataHandler.java @@ -16,15 +16,16 @@ */ package org.apache.tika.parser.xml; -import org.apache.tika.metadata.Metadata; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; +import org.apache.tika.metadata.Metadata; + /** * This adds a Metadata entry for a given node. * The textual content of the node is used as the - * value, and the Metadata name is taken from - * an attribute, with a prefix if required. + * value, and the Metadata name is taken from + * an attribute, with a prefix if required. */ public class AttributeDependantMetadataHandler extends DefaultHandler { @@ -32,20 +33,20 @@ public class AttributeDependantMetadataHandler extends DefaultHandler { private final String nameHoldingAttribute; private final String namePrefix; + private final StringBuilder buffer = new StringBuilder(); private String name; - private final StringBuilder buffer = new StringBuilder(); - - public AttributeDependantMetadataHandler(Metadata metadata, String nameHoldingAttribute, String namePrefix) { + public AttributeDependantMetadataHandler(Metadata metadata, String nameHoldingAttribute, + String namePrefix) { this.metadata = metadata; this.nameHoldingAttribute = nameHoldingAttribute; this.namePrefix = namePrefix; } public void addMetadata(String value) { - if(name == null || name.length() == 0) { - // We didn't find the attribute which holds the name - return; + if (name == null || name.length() == 0) { + // We didn't find the attribute which holds the name + return; } if (value.length() > 0) { String previous = metadata.get(name); @@ -61,20 +62,19 @@ public class AttributeDependantMetadataHandler extends DefaultHandler { buffer.setLength(0); } - public void startElement( - String uri, String localName, String name, Attributes attributes) { + public void startElement(String uri, String localName, String name, Attributes attributes) { String rawName = attributes.getValue(nameHoldingAttribute); if (rawName != null) { - if (namePrefix == null) { - this.name = rawName; - } else { - this.name = namePrefix + rawName; - } + if (namePrefix == null) { + this.name = rawName; + } else { + this.name = namePrefix + rawName; + } } // All other attributes are ignored } - + public void characters(char[] ch, int start, int length) { buffer.append(ch, start, length); } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java index dba5e4cb..cd5d4f3f 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/AttributeMetadataHandler.java @@ -16,11 +16,12 @@ */ package org.apache.tika.parser.xml; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.Property; import org.xml.sax.Attributes; import org.xml.sax.SAXException; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.Property; + /** * SAX event handler that maps the contents of an XML attribute into * a metadata field. @@ -33,26 +34,25 @@ public class AttributeMetadataHandler extends AbstractMetadataHandler { private final String localName; - public AttributeMetadataHandler( - String uri, String localName, Metadata metadata, String name) { + public AttributeMetadataHandler(String uri, String localName, Metadata metadata, String name) { super(metadata, name); this.uri = uri; this.localName = localName; } - public AttributeMetadataHandler( - String uri, String localName, Metadata metadata, Property property) { - super(metadata, property); - this.uri = uri; - this.localName = localName; - } + + public AttributeMetadataHandler(String uri, String localName, Metadata metadata, + Property property) { + super(metadata, property); + this.uri = uri; + this.localName = localName; + } @Override - public void startElement( - String uri, String localName, String qName, Attributes attributes) - throws SAXException { + public void startElement(String uri, String localName, String qName, Attributes attributes) + throws SAXException { for (int i = 0; i < attributes.getLength(); i++) { - if (attributes.getURI(i).equals(this.uri) - && attributes.getLocalName(i).equals(this.localName)) { + if (attributes.getURI(i).equals(this.uri) && + attributes.getLocalName(i).equals(this.localName)) { addMetadata(attributes.getValue(i).trim()); } } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java index 5999773e..0a847a23 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/DcXMLParser.java @@ -16,45 +16,45 @@ */ package org.apache.tika.parser.xml; +import org.xml.sax.ContentHandler; + import org.apache.tika.metadata.DublinCore; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.Property; import org.apache.tika.metadata.TikaCoreProperties; import org.apache.tika.parser.ParseContext; import org.apache.tika.sax.TeeContentHandler; -import org.xml.sax.ContentHandler; /** * Dublin Core metadata parser */ public class DcXMLParser extends XMLParser { - /** Serial version UID */ + /** + * Serial version UID + */ private static final long serialVersionUID = 4905318835463880819L; - private static ContentHandler getDublinCoreHandler( - Metadata metadata, Property property, String element) { - return new ElementMetadataHandler( - DublinCore.NAMESPACE_URI_DC, element, - metadata, property); + private static ContentHandler getDublinCoreHandler(Metadata metadata, Property property, + String element) { + return new ElementMetadataHandler(DublinCore.NAMESPACE_URI_DC, element, metadata, property); } - protected ContentHandler getContentHandler( - ContentHandler handler, Metadata metadata, ParseContext context) { - return new TeeContentHandler( - super.getContentHandler(handler, metadata, context), - getDublinCoreHandler(metadata, TikaCoreProperties.TITLE, "title"), - getDublinCoreHandler(metadata, TikaCoreProperties.KEYWORDS, "subject"), - getDublinCoreHandler(metadata, TikaCoreProperties.CREATOR, "creator"), - getDublinCoreHandler(metadata, TikaCoreProperties.DESCRIPTION, "description"), - getDublinCoreHandler(metadata, TikaCoreProperties.PUBLISHER, "publisher"), - getDublinCoreHandler(metadata, TikaCoreProperties.CONTRIBUTOR, "contributor"), - getDublinCoreHandler(metadata, TikaCoreProperties.CREATED, "date"), - getDublinCoreHandler(metadata, TikaCoreProperties.TYPE, "type"), - getDublinCoreHandler(metadata, TikaCoreProperties.FORMAT, "format"), - getDublinCoreHandler(metadata, TikaCoreProperties.IDENTIFIER, "identifier"), - getDublinCoreHandler(metadata, TikaCoreProperties.LANGUAGE, "language"), - getDublinCoreHandler(metadata, TikaCoreProperties.RIGHTS, "rights")); + protected ContentHandler getContentHandler(ContentHandler handler, Metadata metadata, + ParseContext context) { + return new TeeContentHandler(super.getContentHandler(handler, metadata, context), + getDublinCoreHandler(metadata, TikaCoreProperties.TITLE, "title"), + getDublinCoreHandler(metadata, TikaCoreProperties.SUBJECT, "subject"), + getDublinCoreHandler(metadata, TikaCoreProperties.CREATOR, "creator"), + getDublinCoreHandler(metadata, TikaCoreProperties.DESCRIPTION, "description"), + getDublinCoreHandler(metadata, TikaCoreProperties.PUBLISHER, "publisher"), + getDublinCoreHandler(metadata, TikaCoreProperties.CONTRIBUTOR, "contributor"), + getDublinCoreHandler(metadata, TikaCoreProperties.CREATED, "date"), + getDublinCoreHandler(metadata, TikaCoreProperties.TYPE, "type"), + getDublinCoreHandler(metadata, TikaCoreProperties.FORMAT, "format"), + getDublinCoreHandler(metadata, TikaCoreProperties.IDENTIFIER, "identifier"), + getDublinCoreHandler(metadata, TikaCoreProperties.LANGUAGE, "language"), + getDublinCoreHandler(metadata, TikaCoreProperties.RIGHTS, "rights")); } } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java index d7a81dc4..6a43315a 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/ElementMetadataHandler.java @@ -16,13 +16,14 @@ */ package org.apache.tika.parser.xml; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.Property; +import java.util.Arrays; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; -import java.util.Arrays; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.Property; /** * SAX event handler that maps the contents of an XML element into @@ -44,21 +45,17 @@ public class ElementMetadataHandler extends AbstractMetadataHandler { private final Metadata metadata; private final String name; - private Property targetProperty; - private final boolean allowDuplicateValues; private final boolean allowEmptyValues; - /** * The buffer used to capture characters when inside a bag li element. */ private final StringBuilder bufferBagged = new StringBuilder(); - /** * The buffer used to capture characters inside standard elements. */ private final StringBuilder bufferBagless = new StringBuilder(); - + private Property targetProperty; /** * Whether or not the value was found in a standard element structure or inside a bag. */ @@ -70,13 +67,12 @@ public class ElementMetadataHandler extends AbstractMetadataHandler { /** * Constructor for string metadata keys. * - * @param uri the uri of the namespace of the element + * @param uri the uri of the namespace of the element * @param localName the local name of the element - * @param metadata the Tika metadata object to populate - * @param name the Tika metadata field key + * @param metadata the Tika metadata object to populate + * @param name the Tika metadata field key */ - public ElementMetadataHandler( - String uri, String localName, Metadata metadata, String name) { + public ElementMetadataHandler(String uri, String localName, Metadata metadata, String name) { super(metadata, name); this.uri = uri; this.localName = localName; @@ -91,15 +87,15 @@ public class ElementMetadataHandler extends AbstractMetadataHandler { * Constructor for string metadata keys which allows change of behavior * for duplicate and empty entry values. * - * @param uri the uri of the namespace of the element - * @param localName the local name of the element - * @param metadata the Tika metadata object to populate - * @param name the Tika metadata field key + * @param uri the uri of the namespace of the element + * @param localName the local name of the element + * @param metadata the Tika metadata object to populate + * @param name the Tika metadata field key * @param allowDuplicateValues add duplicate values to the Tika metadata - * @param allowEmptyValues add empty values to the Tika metadata + * @param allowEmptyValues add empty values to the Tika metadata */ - public ElementMetadataHandler( - String uri, String localName, Metadata metadata, String name, boolean allowDuplicateValues, boolean allowEmptyValues) { + public ElementMetadataHandler(String uri, String localName, Metadata metadata, String name, + boolean allowDuplicateValues, boolean allowEmptyValues) { super(metadata, name); this.uri = uri; this.localName = localName; @@ -113,13 +109,13 @@ public class ElementMetadataHandler extends AbstractMetadataHandler { /** * Constructor for Property metadata keys. * - * @param uri the uri of the namespace of the element - * @param localName the local name of the element - * @param metadata the Tika metadata object to populate + * @param uri the uri of the namespace of the element + * @param localName the local name of the element + * @param metadata the Tika metadata object to populate * @param targetProperty the Tika metadata Property key */ - public ElementMetadataHandler( - String uri, String localName, Metadata metadata, Property targetProperty) { + public ElementMetadataHandler(String uri, String localName, Metadata metadata, + Property targetProperty) { super(metadata, targetProperty); this.uri = uri; this.localName = localName; @@ -135,15 +131,16 @@ public class ElementMetadataHandler extends AbstractMetadataHandler { * Constructor for Property metadata keys which allows change of behavior * for duplicate and empty entry values. * - * @param uri the uri of the namespace of the element - * @param localName the local name of the element - * @param metadata the Tika metadata object to populate - * @param targetProperty the Tika metadata Property key + * @param uri the uri of the namespace of the element + * @param localName the local name of the element + * @param metadata the Tika metadata object to populate + * @param targetProperty the Tika metadata Property key * @param allowDuplicateValues add duplicate values to the Tika metadata - * @param allowEmptyValues add empty values to the Tika metadata + * @param allowEmptyValues add empty values to the Tika metadata */ - public ElementMetadataHandler( - String uri, String localName, Metadata metadata, Property targetProperty, boolean allowDuplicateValues, boolean allowEmptyValues) { + public ElementMetadataHandler(String uri, String localName, Metadata metadata, + Property targetProperty, boolean allowDuplicateValues, + boolean allowEmptyValues) { super(metadata, targetProperty); this.uri = uri; this.localName = localName; @@ -162,16 +159,13 @@ public class ElementMetadataHandler extends AbstractMetadataHandler { protected boolean isMatchingElement(String uri, String localName) { // match if we're inside the parent element or within some bag element return (uri.equals(this.uri) && localName.equals(this.localName)) || - (parentMatchLevel > 0 && - ((uri.equals(URI_RDF) && localName.equals(LOCAL_NAME_RDF_BAG)) || - (uri.equals(URI_RDF) && localName.equals(LOCAL_NAME_RDF_LI)) - ) - ); + (parentMatchLevel > 0 && + ((uri.equals(URI_RDF) && localName.equals(LOCAL_NAME_RDF_BAG)) || + (uri.equals(URI_RDF) && localName.equals(LOCAL_NAME_RDF_LI)))); } @Override - public void startElement( - String uri, String localName, String name, Attributes attributes) { + public void startElement(String uri, String localName, String name, Attributes attributes) { if (isMatchingElement(uri, localName)) { matchLevel++; } @@ -230,7 +224,8 @@ public class ElementMetadataHandler extends AbstractMetadataHandler { value = ""; } String[] previous = metadata.getValues(name); - if (previous == null || !Arrays.asList(previous).contains(value) || allowDuplicateValues) { + if (previous == null || !Arrays.asList(previous).contains(value) || + allowDuplicateValues) { metadata.add(targetProperty, value); } } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java index 1f396901..47699b4c 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/FictionBookParser.java @@ -16,64 +16,68 @@ */ package org.apache.tika.parser.xml; -import org.apache.commons.codec.binary.Base64; -import org.apache.tika.extractor.EmbeddedDocumentExtractor; -import org.apache.tika.extractor.EmbeddedDocumentUtil; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.TikaMetadataKeys; -import org.apache.tika.mime.MediaType; -import org.apache.tika.parser.ParseContext; -import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Collections; import java.util.Set; +import org.apache.commons.codec.binary.Base64; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import org.apache.tika.extractor.EmbeddedDocumentExtractor; +import org.apache.tika.extractor.EmbeddedDocumentUtil; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.TikaCoreProperties; +import org.apache.tika.mime.MediaType; +import org.apache.tika.parser.ParseContext; + public class FictionBookParser extends XMLParser { private static final long serialVersionUID = 4195954546491524374L; private static final Set SUPPORTED_TYPES = - Collections.singleton(MediaType.application("x-fictionbook+xml")); + Collections.singleton(MediaType.application("x-fictionbook+xml")); + @Override public Set getSupportedTypes(ParseContext context) { return SUPPORTED_TYPES; } @Override - protected ContentHandler getContentHandler(ContentHandler handler, Metadata metadata, ParseContext context) { + protected ContentHandler getContentHandler(ContentHandler handler, Metadata metadata, + ParseContext context) { return new BinaryElementsDataHandler( - EmbeddedDocumentUtil.getEmbeddedDocumentExtractor(context), handler); + EmbeddedDocumentUtil.getEmbeddedDocumentExtractor(context), handler); } private static class BinaryElementsDataHandler extends DefaultHandler { private static final String ELEMENT_BINARY = "binary"; - - private boolean binaryMode = false; private static final String ATTRIBUTE_ID = "id"; - + private static final String ATTRIBUTE_CONTENT_TYPE = "content-type"; private final EmbeddedDocumentExtractor partExtractor; private final ContentHandler handler; private final StringBuilder binaryData = new StringBuilder(); + private boolean binaryMode = false; private Metadata metadata; - private static final String ATTRIBUTE_CONTENT_TYPE = "content-type"; - private BinaryElementsDataHandler(EmbeddedDocumentExtractor partExtractor, ContentHandler handler) { + private BinaryElementsDataHandler(EmbeddedDocumentExtractor partExtractor, + ContentHandler handler) { this.partExtractor = partExtractor; this.handler = handler; } @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + public void startElement(String uri, String localName, String qName, Attributes attributes) + throws SAXException { binaryMode = ELEMENT_BINARY.equals(localName); if (binaryMode) { binaryData.setLength(0); metadata = new Metadata(); - metadata.set(TikaMetadataKeys.RESOURCE_NAME_KEY, attributes.getValue(ATTRIBUTE_ID)); + metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, + attributes.getValue(ATTRIBUTE_ID)); metadata.set(Metadata.CONTENT_TYPE, attributes.getValue(ATTRIBUTE_CONTENT_TYPE)); } } @@ -83,11 +87,8 @@ public class FictionBookParser extends XMLParser { if (binaryMode) { try { partExtractor.parseEmbedded( - new ByteArrayInputStream(Base64.decodeBase64(binaryData.toString())), - handler, - metadata, - true - ); + new ByteArrayInputStream(Base64.decodeBase64(binaryData.toString())), + handler, metadata, true); } catch (IOException e) { throw new SAXException("IOException in parseEmbedded", e); } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java index 3fee00a3..e21aebe2 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/MetadataHandler.java @@ -16,19 +16,20 @@ */ package org.apache.tika.parser.xml; -import org.apache.tika.metadata.Metadata; -import org.apache.tika.metadata.Property; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; +import org.apache.tika.metadata.Metadata; +import org.apache.tika.metadata.Property; + /** * This adds Metadata entries with a specified name for - * the textual content of a node (if present), and - * all attribute values passed through the matcher - * (but not their names). + * the textual content of a node (if present), and + * all attribute values passed through the matcher + * (but not their names). * * @deprecated Use the {@link AttributeMetadataHandler} and - * {@link ElementMetadataHandler} classes instead + * {@link ElementMetadataHandler} classes instead */ public class MetadataHandler extends DefaultHandler { @@ -44,11 +45,12 @@ public class MetadataHandler extends DefaultHandler { this.property = null; this.name = name; } + public MetadataHandler(Metadata metadata, Property property) { - this.metadata = metadata; - this.property = property; - this.name = property.getName(); - } + this.metadata = metadata; + this.property = property; + this.name = property.getName(); + } public void addMetadata(String value) { if (value.length() > 0) { @@ -56,11 +58,11 @@ public class MetadataHandler extends DefaultHandler { if (previous != null && previous.length() > 0) { value = previous + ", " + value; } - + if (this.property != null) { - metadata.set(property, value); + metadata.set(property, value); } else { - metadata.set(name, value); + metadata.set(name, value); } } } @@ -70,14 +72,13 @@ public class MetadataHandler extends DefaultHandler { buffer.setLength(0); } - public void startElement( - String uri, String localName, String name, Attributes attributes) { + public void startElement(String uri, String localName, String name, Attributes attributes) { for (int i = 0; i < attributes.getLength(); i++) { addMetadata(attributes.getValue(i)); } } - + public void characters(char[] ch, int start, int length) { buffer.append(ch, start, length); } diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/TextAndAttributeXMLParser.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/TextAndAttributeXMLParser.java new file mode 100644 index 00000000..9d4b34cc --- /dev/null +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/TextAndAttributeXMLParser.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.parser.xml; + +import org.xml.sax.ContentHandler; + +import org.apache.tika.metadata.Metadata; +import org.apache.tika.parser.ParseContext; +import org.apache.tika.sax.TextAndAttributeContentHandler; + +public class TextAndAttributeXMLParser extends XMLParser { + + private static final long serialVersionUID = 7796914007312429473L; + + @Override + protected ContentHandler getContentHandler(ContentHandler handler, Metadata metadata, + ParseContext context) { + return new TextAndAttributeContentHandler(handler, true); + } +} diff --git a/modules/extract/src/main/java/org/apache/tika/parser/xml/XMLParser.java b/modules/extract/src/main/java/org/apache/tika/parser/xml/XMLParser.java index e247a6c4..34d782cd 100644 --- a/modules/extract/src/main/java/org/apache/tika/parser/xml/XMLParser.java +++ b/modules/extract/src/main/java/org/apache/tika/parser/xml/XMLParser.java @@ -16,7 +16,17 @@ */ package org.apache.tika.parser.xml; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + import org.apache.commons.io.input.CloseShieldInputStream; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXException; + import org.apache.tika.exception.TikaException; import org.apache.tika.metadata.Metadata; import org.apache.tika.mime.MediaType; @@ -28,52 +38,41 @@ import org.apache.tika.sax.TaggedContentHandler; import org.apache.tika.sax.TextContentHandler; import org.apache.tika.sax.XHTMLContentHandler; import org.apache.tika.utils.XMLReaderUtils; -import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; /** * XML parser. */ public class XMLParser extends AbstractParser { - /** Serial version UID */ + /** + * Serial version UID + */ private static final long serialVersionUID = -6028836725280212837L; - private static final Set SUPPORTED_TYPES = - Collections.unmodifiableSet(new HashSet(Arrays.asList( - MediaType.application("xml"), - MediaType.image("svg+xml")))); + private static final Set SUPPORTED_TYPES = Collections.unmodifiableSet( + new HashSet<>( + Arrays.asList(MediaType.application("xml"), MediaType.image("svg+xml")))); public Set getSupportedTypes(ParseContext context) { return SUPPORTED_TYPES; } - public void parse( - InputStream stream, ContentHandler handler, - Metadata metadata, ParseContext context) - throws IOException, SAXException, TikaException { + public void parse(InputStream stream, ContentHandler handler, Metadata metadata, + ParseContext context) throws IOException, SAXException, TikaException { if (metadata.get(Metadata.CONTENT_TYPE) == null) { metadata.set(Metadata.CONTENT_TYPE, "application/xml"); } - final XHTMLContentHandler xhtml = - new XHTMLContentHandler(handler, metadata); + final XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata); xhtml.startDocument(); xhtml.startElement("p"); TaggedContentHandler tagged = new TaggedContentHandler(handler); try { - XMLReaderUtils.parseSAX( - new CloseShieldInputStream(stream), - new OfflineContentHandler(new EmbeddedContentHandler( - getContentHandler(tagged, metadata, context))), context); + XMLReaderUtils.parseSAX(new CloseShieldInputStream(stream), new OfflineContentHandler( + new EmbeddedContentHandler( + getContentHandler(tagged, metadata, context))), + context); } catch (SAXException e) { tagged.throwIfCauseOf(e); throw new TikaException("XML parse error", e); @@ -83,8 +82,8 @@ public class XMLParser extends AbstractParser { } } - protected ContentHandler getContentHandler( - ContentHandler handler, Metadata metadata, ParseContext context) { + protected ContentHandler getContentHandler(ContentHandler handler, Metadata metadata, + ParseContext context) { return new TextContentHandler(handler, true); } } diff --git a/modules/extract/src/main/java/org/apache/tika/utils/StringUtils.java b/modules/extract/src/main/java/org/apache/tika/utils/StringUtils.java new file mode 100644 index 00000000..53fd47ce --- /dev/null +++ b/modules/extract/src/main/java/org/apache/tika/utils/StringUtils.java @@ -0,0 +1,206 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.tika.utils; + +public class StringUtils { + + /** + * The empty String {@code ""}. + * + * @since 2.0 + */ + public static final String EMPTY = ""; + + /** + * A String for a space character. + * + * @since 3.2 + */ + public static final String SPACE = " "; + + static int PAD_LIMIT = 10000; + + public static boolean isEmpty(final CharSequence cs) { + return cs == null || cs.length() == 0; + } + + public static boolean isBlank(final String s) { + return s == null || s.trim().length() == 0; + } + + /** + *

    Left pad a String with a specified String.

    + * + *

    Pad to a size of {@code size}.

    + * + * 
    +     * StringUtils.leftPad(null, *, *)      = null
+     * StringUtils.leftPad("", 3, "z")      = "zzz"
+     * StringUtils.leftPad("bat", 3, "yz")  = "bat"
+     * StringUtils.leftPad("bat", 5, "yz")  = "yzbat"
+     * StringUtils.leftPad("bat", 8, "yz")  = "yzyzybat"
+     * StringUtils.leftPad("bat", 1, "yz")  = "bat"
+     * StringUtils.leftPad("bat", -1, "yz") = "bat"
+     * StringUtils.leftPad("bat", 5, null)  = "  bat"
+     * StringUtils.leftPad("bat", 5, "")    = "  bat"
+     *
    + * + * @param str the String to pad out, may be null + * @param size the size to pad to + * @param padStr the String to pad with, null or empty treated as single space + * @return left padded String or original String if no padding is necessary, + * {@code null} if null String input + */ + public static String leftPad(final String str, final int size, String padStr) { + if (str == null) { + return null; + } + if (isEmpty(padStr)) { + padStr = SPACE; + } + final int padLen = padStr.length(); + final int strLen = str.length(); + final int pads = size - strLen; + if (pads <= 0) { + return str; // returns original String when possible + } + if (padLen == 1 && pads <= PAD_LIMIT) { + return leftPad(str, size, padStr.charAt(0)); + } + + if (pads == padLen) { + return padStr.concat(str); + } else if (pads < padLen) { + return padStr.substring(0, pads).concat(str); + } else { + final char[] padding = new char[pads]; + final char[] padChars = padStr.toCharArray(); + for (int i = 0; i < pads; i++) { + padding[i] = padChars[i % padLen]; + } + return new String(padding).concat(str); + } + } + + + public static String leftPad(final String str, final int size, final char padChar) { + if (str == null) { + return null; + } + final int pads = size - str.length(); + if (pads <= 0) { + return str; // returns original String when possible + } + if (pads > PAD_LIMIT) { + return leftPad(str, size, String.valueOf(padChar)); + } + return repeat(padChar, pads).concat(str); + } + + /** + *

    Returns padding using the specified delimiter repeated + * to a given length.

    + * + * 
    +     * StringUtils.repeat('e', 0)  = ""
+     * StringUtils.repeat('e', 3)  = "eee"
+     * StringUtils.repeat('e', -2) = ""
+     *
    + * + *

    Note: this method does not support padding with + * Unicode Supplementary Characters + * as they require a pair of {@code char}s to be represented. + * If you are needing to support full I18N of your applications + * consider using {@link #repeat(String, int)} instead. + *

    + * + * @param ch character to repeat + * @param repeat number of times to repeat char, negative treated as zero + * @return String with repeated character + * @see #repeat(String, int) + */ + public static String repeat(final char ch, final int repeat) { + if (repeat <= 0) { + return EMPTY; + } + final char[] buf = new char[repeat]; + for (int i = repeat - 1; i >= 0; i--) { + buf[i] = ch; + } + return new String(buf); + } + + // Padding + //----------------------------------------------------------------------- + + /** + *

    Repeat a String {@code repeat} times to form a + * new String.

    + * + * 
    +     * StringUtils.repeat(null, 2) = null
+     * StringUtils.repeat("", 0)   = ""
+     * StringUtils.repeat("", 2)   = ""
+     * StringUtils.repeat("a", 3)  = "aaa"
+     * StringUtils.repeat("ab", 2) = "abab"
+     * StringUtils.repeat("a", -2) = ""
+     *
    + * + * @param str the String to repeat, may be null + * @param repeat number of times to repeat str, negative treated as zero + * @return a new String consisting of the original String repeated, + * {@code null} if null String input + */ + public static String repeat(final String str, final int repeat) { + // Performance tuned for 2.0 (JDK1.4) + + if (str == null) { + return null; + } + if (repeat <= 0) { + return EMPTY; + } + final int inputLength = str.length(); + if (repeat == 1 || inputLength == 0) { + return str; + } + if (inputLength == 1 && repeat <= PAD_LIMIT) { + return repeat(str.charAt(0), repeat); + } + + final int outputLength = inputLength * repeat; + switch (inputLength) { + case 1: + return repeat(str.charAt(0), repeat); + case 2: + final char ch0 = str.charAt(0); + final char ch1 = str.charAt(1); + final char[] output2 = new char[outputLength]; + for (int i = repeat * 2 - 2; i >= 0; i--, i--) { + output2[i] = ch0; + output2[i + 1] = ch1; + } + return new String(output2); + default: + final StringBuilder buf = new StringBuilder(outputLength); + for (int i = 0; i < repeat; i++) { + buf.append(str); + } + return buf.toString(); + } + } +} diff --git a/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala b/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala index 3a260fcc..3fae1e1f 100644 --- a/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala +++ b/modules/extract/src/test/scala/docspell/extract/odf/OdfExtractTest.scala @@ -16,7 +16,7 @@ import munit._ class OdfExtractTest extends FunSuite { val files = List( - ExampleFiles.examples_sample_odt -> 6372, + ExampleFiles.examples_sample_odt -> 6367, ExampleFiles.examples_sample_ods -> 717 ) diff --git a/modules/files/src/main/scala/docspell/files/TikaMimetype.scala b/modules/files/src/main/scala/docspell/files/TikaMimetype.scala index 588d37cc..f9bd0912 100644 --- a/modules/files/src/main/scala/docspell/files/TikaMimetype.scala +++ b/modules/files/src/main/scala/docspell/files/TikaMimetype.scala @@ -20,7 +20,7 @@ import fs2.Stream import docspell.common._ import org.apache.tika.config.TikaConfig -import org.apache.tika.metadata.{HttpHeaders, Metadata, TikaMetadataKeys} +import org.apache.tika.metadata.{HttpHeaders, Metadata, TikaCoreProperties} import org.apache.tika.mime.MediaType import org.apache.tika.parser.txt.Icu4jEncodingDetector @@ -40,7 +40,7 @@ object TikaMimetype { private def makeMetadata(hint: MimeTypeHint): Metadata = { val md = new Metadata - hint.filename.foreach(md.set(TikaMetadataKeys.RESOURCE_NAME_KEY, _)) + hint.filename.foreach(md.set(TikaCoreProperties.RESOURCE_NAME_KEY, _)) hint.advertised.foreach(md.set(HttpHeaders.CONTENT_TYPE, _)) md } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 09184b7f..a7f77d0a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -38,7 +38,7 @@ object Dependencies { val ScalaJavaTimeVersion = "2.3.0" val Slf4jVersion = "1.7.31" val StanfordNlpVersion = "4.2.2" - val TikaVersion = "1.27" + val TikaVersion = "2.0.0" val YamuscaVersion = "0.8.1" val SwaggerUIVersion = "3.51.1" val TwelveMonkeysVersion = "3.7.0" From eb977ab3a7820adc0c7bffc4e2891fc6139a3038 Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 13:37:06 +0200 Subject: [PATCH 05/46] Show the number of selected files on upload page Fixes: #896 --- .../webapp/src/main/elm/Page/Upload/View2.elm | 26 +++++++++---------- project/dev-ui-build.sh | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/modules/webapp/src/main/elm/Page/Upload/View2.elm b/modules/webapp/src/main/elm/Page/Upload/View2.elm index 5d10e6c1..98f200b4 100644 --- a/modules/webapp/src/main/elm/Page/Upload/View2.elm +++ b/modules/webapp/src/main/elm/Page/Upload/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Upload.View2 exposing (viewContent, viewSidebar) import Comp.Dropzone @@ -229,19 +230,16 @@ renderUploads texts model = [ class "mt-4" , classList [ ( "hidden", List.isEmpty model.files || isSuccessAll model ) ] ] - [ div [ class "sixteen wide column" ] - [ div [ class "ui basic segment" ] - [ h2 [ class S.header2 ] - [ text texts.selectedFiles - ] - , div [ class "ui items" ] <| - if model.singleItem then - List.map (renderFileItem model (Just uploadAllTracker)) model.files - - else - List.map (renderFileItem model Nothing) model.files - ] + [ h2 [ class S.header2 ] + [ text texts.selectedFiles + , text (" (" ++ (List.length model.files |> String.fromInt) ++ ")") ] + , div [] <| + if model.singleItem then + List.map (renderFileItem model (Just uploadAllTracker)) model.files + + else + List.map (renderFileItem model Nothing) model.files ] diff --git a/project/dev-ui-build.sh b/project/dev-ui-build.sh index bb1fedb1..8e153467 100755 --- a/project/dev-ui-build.sh +++ b/project/dev-ui-build.sh @@ -23,7 +23,7 @@ compile_css() { echo "Building css …" local srcs="$wdir/modules/webapp/src/main/styles/index.css" local target="$targetbase/css/styles.css" - cd $wdir && npx postcss "$srcs" -o "$target" --env development && cd - + cd $wdir/modules/webapp && npx postcss "$srcs" -o "$target" --env development && cd - cat "$target" | gzip > "$targetbase/css/styles.css.gz" cp "$targetbase/css/styles.css" "$resourcebase/css/" cp "$targetbase/css/styles.css.gz" "$resourcebase/css/" From 912104ce49b3f5bda4aac67589f4a8929d84e987 Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 13:40:15 +0200 Subject: [PATCH 06/46] Small german corrections Fixes: #901 --- .../webapp/src/main/elm/Messages/Page/UserSettings.elm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm index f7d65f3e..0c22ac71 100644 --- a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm +++ b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.UserSettings exposing ( Texts , de @@ -94,8 +95,8 @@ de = , uiSettings = "Oberfläche" , notifications = "Benachrichtigungen" , scanMailbox = "E-Mail-Import" - , emailSettingSmtp = "E-Mail-Einstellung (SMTP)" - , emailSettingImap = "E-Mail-Einstellung (IMAP)" + , emailSettingSmtp = "E-Mail-Einstellungen (SMTP)" + , emailSettingImap = "E-Mail-Einstellungen (IMAP)" , changePassword = "Passwort ändern" , uiSettingsInfo = "Diese Einstellungen sind für die Web-Oberfläche." From a6c0af93e8bddd97d39685be31c56b69f97709f1 Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 13:42:57 +0200 Subject: [PATCH 07/46] Use more space in sidebar Reduce left and right padding --- modules/webapp/src/main/elm/Styles.elm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/webapp/src/main/elm/Styles.elm b/modules/webapp/src/main/elm/Styles.elm index 7653e04f..9fa740b6 100644 --- a/modules/webapp/src/main/elm/Styles.elm +++ b/modules/webapp/src/main/elm/Styles.elm @@ -1,15 +1,16 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Styles exposing (..) sidebar : String sidebar = - " flex flex-col flex-none md:w-80 w-full min-h-max px-4 dark:text-gray-200 shadow overflow-y-auto h-full transition-opacity transition-duration-200 scrollbar-thin scrollbar-light-sidebar dark:scrollbar-dark-sidebar" + " flex flex-col flex-none md:w-80 w-full min-h-max px-2 dark:text-gray-200 shadow overflow-y-auto h-full transition-opacity transition-duration-200 scrollbar-thin scrollbar-light-sidebar dark:scrollbar-dark-sidebar" sidebarBg : String @@ -299,7 +300,7 @@ border = header1 : String header1 = - " text-3xl mt-3 mb-5 font-semibold tracking-wide " + " text-3xl mt-3 mb-5 font-semibold tracking-wide break-all" header2 : String From 42b37df6a10325d0c6cae1e3b92fe7ab95ce505f Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 13:57:05 +0200 Subject: [PATCH 08/46] Fix header formatting --- modules/webapp/src/main/elm/Messages/Page/UserSettings.elm | 5 ++--- modules/webapp/src/main/elm/Page/Upload/View2.elm | 5 ++--- modules/webapp/src/main/elm/Styles.elm | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm index 0c22ac71..d3b2a841 100644 --- a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm +++ b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm @@ -1,10 +1,9 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} - module Messages.Page.UserSettings exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Page/Upload/View2.elm b/modules/webapp/src/main/elm/Page/Upload/View2.elm index 98f200b4..e1bcf3c3 100644 --- a/modules/webapp/src/main/elm/Page/Upload/View2.elm +++ b/modules/webapp/src/main/elm/Page/Upload/View2.elm @@ -1,10 +1,9 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} - module Page.Upload.View2 exposing (viewContent, viewSidebar) import Comp.Dropzone diff --git a/modules/webapp/src/main/elm/Styles.elm b/modules/webapp/src/main/elm/Styles.elm index 9fa740b6..3592101d 100644 --- a/modules/webapp/src/main/elm/Styles.elm +++ b/modules/webapp/src/main/elm/Styles.elm @@ -1,10 +1,9 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} - module Styles exposing (..) From 8545637a8feebe26f95e5273d6d83a257be609da Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 13:59:48 +0200 Subject: [PATCH 09/46] Adopt elm file headers to match elm-format --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 849d7a71..3eea7c5e 100644 --- a/build.sbt +++ b/build.sbt @@ -88,8 +88,8 @@ val elmSettings = Seq( Compile / unmanagedSourceDirectories += (Compile / sourceDirectory).value / "elm", headerSources / includeFilter := "*.elm", headerMappings := headerMappings.value + (HeaderFileType("elm") -> HeaderCommentStyle( - new CommentBlockCreator("{-", " ", "-}"), - HeaderPattern.commentBetween("\\{\\-", " ", "\\-\\}") + new CommentBlockCreator("{-", " ", "-}\n"), + HeaderPattern.commentBetween("\\{\\-", " ", "\\-\\}") )) ) val stylesSettings = Seq( From 21eb7dad94398a6d5dc88e6d619f2b8c85d13694 Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 14:00:11 +0200 Subject: [PATCH 10/46] Change headers of all elm files --- modules/webapp/src/main/elm/Api.elm | 5 +++-- modules/webapp/src/main/elm/App/Data.elm | 5 +++-- modules/webapp/src/main/elm/App/Update.elm | 5 +++-- modules/webapp/src/main/elm/App/View2.elm | 5 +++-- modules/webapp/src/main/elm/Comp/AddressForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/AttachmentMeta.elm | 5 +++-- modules/webapp/src/main/elm/Comp/Basic.elm | 5 +++-- modules/webapp/src/main/elm/Comp/BasicSizeField.elm | 5 +++-- modules/webapp/src/main/elm/Comp/CalEventInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ColorTagger.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ConfirmModal.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ContactField.elm | 5 +++-- modules/webapp/src/main/elm/Comp/CustomFieldForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/CustomFieldInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/CustomFieldManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/CustomFieldTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/DatePicker.elm | 5 +++-- modules/webapp/src/main/elm/Comp/DetailEdit.elm | 5 +++-- modules/webapp/src/main/elm/Comp/Dropdown.elm | 5 +++-- modules/webapp/src/main/elm/Comp/Dropzone.elm | 5 +++-- modules/webapp/src/main/elm/Comp/EmailInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/EquipmentForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/EquipmentManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/EquipmentTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ExpandCollapse.elm | 5 +++-- modules/webapp/src/main/elm/Comp/FieldListSelect.elm | 5 +++-- modules/webapp/src/main/elm/Comp/FixedDropdown.elm | 5 +++-- modules/webapp/src/main/elm/Comp/FolderDetail.elm | 5 +++-- modules/webapp/src/main/elm/Comp/FolderManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/FolderSelect.elm | 5 +++-- modules/webapp/src/main/elm/Comp/FolderTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/IntField.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemCard.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemCardList.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm | 5 +++-- .../webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm | 5 +++-- .../webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm | 5 +++-- .../webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm | 5 +++-- .../webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm | 5 +++-- .../webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ItemMail.elm | 5 +++-- modules/webapp/src/main/elm/Comp/KeyInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/LinkTarget.elm | 5 +++-- modules/webapp/src/main/elm/Comp/MarkdownInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/MenuBar.elm | 5 +++-- modules/webapp/src/main/elm/Comp/NotificationForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/NotificationList.elm | 5 +++-- modules/webapp/src/main/elm/Comp/NotificationManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/OrgForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/OrgManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/OrgTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/PasswordInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/PersonForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/PersonManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/PersonTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/PowerSearchInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/Progress.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ScanMailboxList.elm | 5 +++-- modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/SearchMenu.elm | 5 +++-- modules/webapp/src/main/elm/Comp/SearchStatsView.elm | 5 +++-- modules/webapp/src/main/elm/Comp/SentMails.elm | 5 +++-- modules/webapp/src/main/elm/Comp/SourceForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/SourceManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/SourceTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/StringListInput.elm | 5 +++-- modules/webapp/src/main/elm/Comp/Tabs.elm | 5 +++-- modules/webapp/src/main/elm/Comp/TagForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/TagManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/TagSelect.elm | 5 +++-- modules/webapp/src/main/elm/Comp/TagTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/UiSettingsForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/UiSettingsManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm | 5 +++-- modules/webapp/src/main/elm/Comp/UserForm.elm | 5 +++-- modules/webapp/src/main/elm/Comp/UserManage.elm | 5 +++-- modules/webapp/src/main/elm/Comp/UserTable.elm | 5 +++-- modules/webapp/src/main/elm/Comp/YesNoDimmer.elm | 5 +++-- modules/webapp/src/main/elm/Data/BasicSize.elm | 5 +++-- modules/webapp/src/main/elm/Data/CalEvent.elm | 5 +++-- modules/webapp/src/main/elm/Data/Color.elm | 5 +++-- modules/webapp/src/main/elm/Data/ContactType.elm | 5 +++-- modules/webapp/src/main/elm/Data/CustomFieldChange.elm | 5 +++-- modules/webapp/src/main/elm/Data/CustomFieldType.elm | 5 +++-- modules/webapp/src/main/elm/Data/Direction.elm | 5 +++-- modules/webapp/src/main/elm/Data/DropdownStyle.elm | 5 +++-- modules/webapp/src/main/elm/Data/EquipmentUse.elm | 5 +++-- modules/webapp/src/main/elm/Data/Fields.elm | 5 +++-- modules/webapp/src/main/elm/Data/Flags.elm | 5 +++-- modules/webapp/src/main/elm/Data/Icons.elm | 5 +++-- modules/webapp/src/main/elm/Data/ItemNav.elm | 5 +++-- modules/webapp/src/main/elm/Data/ItemQuery.elm | 5 +++-- modules/webapp/src/main/elm/Data/ItemSelection.elm | 5 +++-- modules/webapp/src/main/elm/Data/ItemTemplate.elm | 5 +++-- modules/webapp/src/main/elm/Data/Items.elm | 5 +++-- modules/webapp/src/main/elm/Data/Language.elm | 5 +++-- modules/webapp/src/main/elm/Data/ListType.elm | 5 +++-- modules/webapp/src/main/elm/Data/Money.elm | 5 +++-- modules/webapp/src/main/elm/Data/OrgUse.elm | 5 +++-- modules/webapp/src/main/elm/Data/PersonUse.elm | 5 +++-- modules/webapp/src/main/elm/Data/Priority.elm | 5 +++-- modules/webapp/src/main/elm/Data/QueryParseResult.elm | 5 +++-- modules/webapp/src/main/elm/Data/SSLType.elm | 5 +++-- modules/webapp/src/main/elm/Data/SourceState.elm | 5 +++-- modules/webapp/src/main/elm/Data/UiSettings.elm | 5 +++-- modules/webapp/src/main/elm/Data/UiTheme.elm | 5 +++-- modules/webapp/src/main/elm/Data/UserState.elm | 5 +++-- modules/webapp/src/main/elm/Data/Validated.elm | 5 +++-- modules/webapp/src/main/elm/Main.elm | 5 +++-- modules/webapp/src/main/elm/Messages.elm | 5 +++-- modules/webapp/src/main/elm/Messages/App.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Basics.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm | 5 +++-- .../src/main/elm/Messages/Comp/ClassifierSettingsForm.elm | 5 +++-- .../src/main/elm/Messages/Comp/CollectiveSettingsForm.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm | 5 +++-- .../src/main/elm/Messages/Comp/CustomFieldMultiInput.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm | 5 +++-- .../src/main/elm/Messages/Comp/EmailSettingsManage.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/EquipmentManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/HttpError.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm | 5 +++-- .../src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm | 5 +++-- .../src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm | 5 +++-- .../src/main/elm/Messages/Comp/ItemDetail/EditForm.elm | 5 +++-- .../src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm | 5 +++-- .../src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm | 5 +++-- .../main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/NotificationForm.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/NotificationManage.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/NotificationTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/SearchStatsView.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/SentMails.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/TagForm.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/TagManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/TagTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm | 5 +++-- .../webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/UserForm.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/UserManage.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Comp/UserTable.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/Color.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/ContactType.elm | 5 +++-- .../webapp/src/main/elm/Messages/Data/CustomFieldType.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/Direction.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/Fields.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/Language.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/OrgUse.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/PersonUse.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Data/SSLType.elm | 5 +++-- modules/webapp/src/main/elm/Messages/DateFormat.elm | 5 +++-- .../webapp/src/main/elm/Messages/Page/CollectiveSettings.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/Home.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/Login.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/ManageData.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/NewInvite.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/Queue.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/Register.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/Upload.elm | 5 +++-- modules/webapp/src/main/elm/Messages/Page/UserSettings.elm | 5 +++-- modules/webapp/src/main/elm/Messages/UiLanguage.elm | 5 +++-- modules/webapp/src/main/elm/Page.elm | 5 +++-- modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm | 5 +++-- .../webapp/src/main/elm/Page/CollectiveSettings/Update.elm | 5 +++-- .../webapp/src/main/elm/Page/CollectiveSettings/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/Home/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/Home/SideMenu.elm | 5 +++-- modules/webapp/src/main/elm/Page/Home/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/Home/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/ItemDetail/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/ItemDetail/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/ItemDetail/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/Login/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/Login/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/Login/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/ManageData/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/ManageData/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/ManageData/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/NewInvite/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/NewInvite/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/NewInvite/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/Queue/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/Queue/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/Queue/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/Register/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/Register/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/Register/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/Upload/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/Upload/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/Upload/View2.elm | 5 +++-- modules/webapp/src/main/elm/Page/UserSettings/Data.elm | 5 +++-- modules/webapp/src/main/elm/Page/UserSettings/Update.elm | 5 +++-- modules/webapp/src/main/elm/Page/UserSettings/View2.elm | 5 +++-- modules/webapp/src/main/elm/Ports.elm | 5 +++-- modules/webapp/src/main/elm/Styles.elm | 5 +++-- modules/webapp/src/main/elm/Util/Address.elm | 5 +++-- modules/webapp/src/main/elm/Util/Contact.elm | 5 +++-- modules/webapp/src/main/elm/Util/CustomField.elm | 5 +++-- modules/webapp/src/main/elm/Util/Duration.elm | 5 +++-- modules/webapp/src/main/elm/Util/File.elm | 5 +++-- modules/webapp/src/main/elm/Util/Folder.elm | 5 +++-- modules/webapp/src/main/elm/Util/Html.elm | 5 +++-- modules/webapp/src/main/elm/Util/Http.elm | 5 +++-- modules/webapp/src/main/elm/Util/ItemDragDrop.elm | 5 +++-- modules/webapp/src/main/elm/Util/List.elm | 5 +++-- modules/webapp/src/main/elm/Util/Maybe.elm | 5 +++-- modules/webapp/src/main/elm/Util/Person.elm | 5 +++-- modules/webapp/src/main/elm/Util/Result.elm | 5 +++-- modules/webapp/src/main/elm/Util/Size.elm | 5 +++-- modules/webapp/src/main/elm/Util/String.elm | 5 +++-- modules/webapp/src/main/elm/Util/Tag.elm | 5 +++-- modules/webapp/src/main/elm/Util/Time.elm | 5 +++-- modules/webapp/src/main/elm/Util/Update.elm | 5 +++-- 271 files changed, 813 insertions(+), 542 deletions(-) diff --git a/modules/webapp/src/main/elm/Api.elm b/modules/webapp/src/main/elm/Api.elm index 3f5e447c..590b79a9 100644 --- a/modules/webapp/src/main/elm/Api.elm +++ b/modules/webapp/src/main/elm/Api.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Api exposing ( addConcEquip , addConcPerson diff --git a/modules/webapp/src/main/elm/App/Data.elm b/modules/webapp/src/main/elm/App/Data.elm index d61ba672..fe44da24 100644 --- a/modules/webapp/src/main/elm/App/Data.elm +++ b/modules/webapp/src/main/elm/App/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module App.Data exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/App/Update.elm b/modules/webapp/src/main/elm/App/Update.elm index b718c1a0..04b752e0 100644 --- a/modules/webapp/src/main/elm/App/Update.elm +++ b/modules/webapp/src/main/elm/App/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module App.Update exposing ( initPage , update diff --git a/modules/webapp/src/main/elm/App/View2.elm b/modules/webapp/src/main/elm/App/View2.elm index 0a57c3d6..88c56407 100644 --- a/modules/webapp/src/main/elm/App/View2.elm +++ b/modules/webapp/src/main/elm/App/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module App.View2 exposing (view) import Api.Model.AuthResult exposing (AuthResult) diff --git a/modules/webapp/src/main/elm/Comp/AddressForm.elm b/modules/webapp/src/main/elm/Comp/AddressForm.elm index b294b60d..835c18e6 100644 --- a/modules/webapp/src/main/elm/Comp/AddressForm.elm +++ b/modules/webapp/src/main/elm/Comp/AddressForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.AddressForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm b/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm index 3e4901df..a3cc710b 100644 --- a/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm +++ b/modules/webapp/src/main/elm/Comp/AttachmentMeta.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.AttachmentMeta exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/Basic.elm b/modules/webapp/src/main/elm/Comp/Basic.elm index c0b7c314..75f88803 100644 --- a/modules/webapp/src/main/elm/Comp/Basic.elm +++ b/modules/webapp/src/main/elm/Comp/Basic.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.Basic exposing ( editLinkLabel , editLinkTableCell diff --git a/modules/webapp/src/main/elm/Comp/BasicSizeField.elm b/modules/webapp/src/main/elm/Comp/BasicSizeField.elm index a1675682..5be47420 100644 --- a/modules/webapp/src/main/elm/Comp/BasicSizeField.elm +++ b/modules/webapp/src/main/elm/Comp/BasicSizeField.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.BasicSizeField exposing ( Msg , update diff --git a/modules/webapp/src/main/elm/Comp/CalEventInput.elm b/modules/webapp/src/main/elm/Comp/CalEventInput.elm index 0855b617..b7701f5e 100644 --- a/modules/webapp/src/main/elm/Comp/CalEventInput.elm +++ b/modules/webapp/src/main/elm/Comp/CalEventInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.CalEventInput exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm index 1821b684..06577d20 100644 --- a/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm +++ b/modules/webapp/src/main/elm/Comp/ChangePasswordForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ChangePasswordForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm b/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm index 1fc3e3c4..119e9dcd 100644 --- a/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm +++ b/modules/webapp/src/main/elm/Comp/ClassifierSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ClassifierSettingsForm exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm b/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm index ea0404a9..4d24d817 100644 --- a/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm +++ b/modules/webapp/src/main/elm/Comp/CollectiveSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.CollectiveSettingsForm exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ColorTagger.elm b/modules/webapp/src/main/elm/Comp/ColorTagger.elm index 16645e6a..60df1d1c 100644 --- a/modules/webapp/src/main/elm/Comp/ColorTagger.elm +++ b/modules/webapp/src/main/elm/Comp/ColorTagger.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ColorTagger exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ConfirmModal.elm b/modules/webapp/src/main/elm/Comp/ConfirmModal.elm index 9254d171..c267e151 100644 --- a/modules/webapp/src/main/elm/Comp/ConfirmModal.elm +++ b/modules/webapp/src/main/elm/Comp/ConfirmModal.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ConfirmModal exposing ( Settings , defaultSettings diff --git a/modules/webapp/src/main/elm/Comp/ContactField.elm b/modules/webapp/src/main/elm/Comp/ContactField.elm index 5c1106e2..f6732c22 100644 --- a/modules/webapp/src/main/elm/Comp/ContactField.elm +++ b/modules/webapp/src/main/elm/Comp/ContactField.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ContactField exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm index 08243b16..49b9bf4d 100644 --- a/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm +++ b/modules/webapp/src/main/elm/Comp/CustomFieldForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.CustomFieldForm exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm b/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm index 36d5750b..5a30c023 100644 --- a/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm +++ b/modules/webapp/src/main/elm/Comp/CustomFieldInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.CustomFieldInput exposing ( FieldResult(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm b/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm index f84c51ab..e8ba37a7 100644 --- a/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm +++ b/modules/webapp/src/main/elm/Comp/CustomFieldManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.CustomFieldManage exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm b/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm index b74e3b12..b9ca6282 100644 --- a/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm +++ b/modules/webapp/src/main/elm/Comp/CustomFieldMultiInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.CustomFieldMultiInput exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm b/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm index bcd33b64..1075a30e 100644 --- a/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm +++ b/modules/webapp/src/main/elm/Comp/CustomFieldTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.CustomFieldTable exposing ( Action(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/DatePicker.elm b/modules/webapp/src/main/elm/Comp/DatePicker.elm index 1a401c99..eb2d0474 100644 --- a/modules/webapp/src/main/elm/Comp/DatePicker.elm +++ b/modules/webapp/src/main/elm/Comp/DatePicker.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.DatePicker exposing ( Msg , defaultSettings diff --git a/modules/webapp/src/main/elm/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Comp/DetailEdit.elm index 0d6ec46a..96cbd2f9 100644 --- a/modules/webapp/src/main/elm/Comp/DetailEdit.elm +++ b/modules/webapp/src/main/elm/Comp/DetailEdit.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.DetailEdit exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/Dropdown.elm b/modules/webapp/src/main/elm/Comp/Dropdown.elm index eb792c8f..76d46b3c 100644 --- a/modules/webapp/src/main/elm/Comp/Dropdown.elm +++ b/modules/webapp/src/main/elm/Comp/Dropdown.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.Dropdown exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/Dropzone.elm b/modules/webapp/src/main/elm/Comp/Dropzone.elm index e3e99807..c8c5cd57 100644 --- a/modules/webapp/src/main/elm/Comp/Dropzone.elm +++ b/modules/webapp/src/main/elm/Comp/Dropzone.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + -- inspired from here: https://ellie-app.com/3T5mNms7SwKa1 diff --git a/modules/webapp/src/main/elm/Comp/EmailInput.elm b/modules/webapp/src/main/elm/Comp/EmailInput.elm index 7525b9f3..218297ba 100644 --- a/modules/webapp/src/main/elm/Comp/EmailInput.elm +++ b/modules/webapp/src/main/elm/Comp/EmailInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.EmailInput exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm index 427acbe7..36ec4fb8 100644 --- a/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm +++ b/modules/webapp/src/main/elm/Comp/EmailSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.EmailSettingsForm exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm index 54acfea5..95221f17 100644 --- a/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm +++ b/modules/webapp/src/main/elm/Comp/EmailSettingsManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.EmailSettingsManage exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm index dc54ec5f..52177d18 100644 --- a/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm +++ b/modules/webapp/src/main/elm/Comp/EmailSettingsTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.EmailSettingsTable exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm index 4d91a575..61f8e30f 100644 --- a/modules/webapp/src/main/elm/Comp/EquipmentForm.elm +++ b/modules/webapp/src/main/elm/Comp/EquipmentForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.EquipmentForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm index 09ab1bf6..1d771639 100644 --- a/modules/webapp/src/main/elm/Comp/EquipmentManage.elm +++ b/modules/webapp/src/main/elm/Comp/EquipmentManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.EquipmentManage exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm index b9bc351b..116c96af 100644 --- a/modules/webapp/src/main/elm/Comp/EquipmentTable.elm +++ b/modules/webapp/src/main/elm/Comp/EquipmentTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.EquipmentTable exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm b/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm index 58dda86b..c90f3e67 100644 --- a/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm +++ b/modules/webapp/src/main/elm/Comp/ExpandCollapse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ExpandCollapse exposing ( collapseToggle , expandToggle diff --git a/modules/webapp/src/main/elm/Comp/FieldListSelect.elm b/modules/webapp/src/main/elm/Comp/FieldListSelect.elm index fcd724c0..c35d1d17 100644 --- a/modules/webapp/src/main/elm/Comp/FieldListSelect.elm +++ b/modules/webapp/src/main/elm/Comp/FieldListSelect.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.FieldListSelect exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/FixedDropdown.elm b/modules/webapp/src/main/elm/Comp/FixedDropdown.elm index 9ca59bb9..199413cd 100644 --- a/modules/webapp/src/main/elm/Comp/FixedDropdown.elm +++ b/modules/webapp/src/main/elm/Comp/FixedDropdown.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.FixedDropdown exposing ( Item , Model diff --git a/modules/webapp/src/main/elm/Comp/FolderDetail.elm b/modules/webapp/src/main/elm/Comp/FolderDetail.elm index 87da6fdc..3e5f5b68 100644 --- a/modules/webapp/src/main/elm/Comp/FolderDetail.elm +++ b/modules/webapp/src/main/elm/Comp/FolderDetail.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.FolderDetail exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/FolderManage.elm b/modules/webapp/src/main/elm/Comp/FolderManage.elm index e581d2cd..9917d7bd 100644 --- a/modules/webapp/src/main/elm/Comp/FolderManage.elm +++ b/modules/webapp/src/main/elm/Comp/FolderManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.FolderManage exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/FolderSelect.elm b/modules/webapp/src/main/elm/Comp/FolderSelect.elm index 19a5d28d..6bc6cf9f 100644 --- a/modules/webapp/src/main/elm/Comp/FolderSelect.elm +++ b/modules/webapp/src/main/elm/Comp/FolderSelect.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.FolderSelect exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/FolderTable.elm b/modules/webapp/src/main/elm/Comp/FolderTable.elm index 9745b97f..1c9fea1d 100644 --- a/modules/webapp/src/main/elm/Comp/FolderTable.elm +++ b/modules/webapp/src/main/elm/Comp/FolderTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.FolderTable exposing ( Action(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm index 693a2f70..1004dbfb 100644 --- a/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm +++ b/modules/webapp/src/main/elm/Comp/ImapSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ImapSettingsForm exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm index 2301a9d5..27cf26d1 100644 --- a/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm +++ b/modules/webapp/src/main/elm/Comp/ImapSettingsManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ImapSettingsManage exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm index 9c535ff2..3fb48497 100644 --- a/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm +++ b/modules/webapp/src/main/elm/Comp/ImapSettingsTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ImapSettingsTable exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/IntField.elm b/modules/webapp/src/main/elm/Comp/IntField.elm index 9a082034..783cdf9a 100644 --- a/modules/webapp/src/main/elm/Comp/IntField.elm +++ b/modules/webapp/src/main/elm/Comp/IntField.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.IntField exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ItemCard.elm b/modules/webapp/src/main/elm/Comp/ItemCard.elm index ddb299f7..23c54701 100644 --- a/modules/webapp/src/main/elm/Comp/ItemCard.elm +++ b/modules/webapp/src/main/elm/Comp/ItemCard.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemCard exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Comp/ItemCardList.elm index d0125eee..d9087b59 100644 --- a/modules/webapp/src/main/elm/Comp/ItemCardList.elm +++ b/modules/webapp/src/main/elm/Comp/ItemCardList.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemCardList exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Comp/ItemDetail.elm index a649813c..ec9917f2 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail exposing ( Model , emptyModel diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm index 0f74f532..7ce99ca7 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/AddFilesForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.AddFilesForm exposing (view) import Comp.Dropzone diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm index 3334e941..bd5ad03c 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/ConfirmModalView.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.ConfirmModalView exposing (view) import Comp.ConfirmModal diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm index aa872abe..e9247c0c 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.EditForm exposing (formTabs, view2) import Comp.CustomFieldMultiInput diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm index 97e75a8d..ca11e29e 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/FieldTabState.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.FieldTabState exposing (EditTab(..), allTabs, findTab, tabName, tabState) import Comp.CustomFieldMultiInput diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm index bf332bc9..14d7b0e2 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.FormChange exposing ( FormChange(..) , multiUpdate diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm index f7e51f66..568dcac3 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/ItemInfoHeader.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.ItemInfoHeader exposing (view) import Api.Model.IdName exposing (IdName) diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm index b0dddc19..58c44201 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.Model exposing ( AttachmentRename , ConfirmModalValue(..) diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm index a0aad0c6..a9231590 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.MultiEditMenu exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm index a92742b7..6f7f55a1 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Notes.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.Notes exposing (view) import Comp.ItemDetail.Model diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm index 0a39c76c..0838a985 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.SingleAttachment exposing (view) import Api diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm index cb560040..7e2200f5 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm index a90a4537..0770eb41 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemDetail.View2 exposing (view) import Comp.Basic as B diff --git a/modules/webapp/src/main/elm/Comp/ItemMail.elm b/modules/webapp/src/main/elm/Comp/ItemMail.elm index 5467280c..bfe90193 100644 --- a/modules/webapp/src/main/elm/Comp/ItemMail.elm +++ b/modules/webapp/src/main/elm/Comp/ItemMail.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ItemMail exposing ( FormAction(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/KeyInput.elm b/modules/webapp/src/main/elm/Comp/KeyInput.elm index 8b92c99c..31704cc4 100644 --- a/modules/webapp/src/main/elm/Comp/KeyInput.elm +++ b/modules/webapp/src/main/elm/Comp/KeyInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.KeyInput exposing ( KeyInput , Model diff --git a/modules/webapp/src/main/elm/Comp/LinkTarget.elm b/modules/webapp/src/main/elm/Comp/LinkTarget.elm index 1163a888..1412155c 100644 --- a/modules/webapp/src/main/elm/Comp/LinkTarget.elm +++ b/modules/webapp/src/main/elm/Comp/LinkTarget.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.LinkTarget exposing ( LinkTarget(..) , makeConcLink diff --git a/modules/webapp/src/main/elm/Comp/MarkdownInput.elm b/modules/webapp/src/main/elm/Comp/MarkdownInput.elm index 3f9f8160..1c3b10ef 100644 --- a/modules/webapp/src/main/elm/Comp/MarkdownInput.elm +++ b/modules/webapp/src/main/elm/Comp/MarkdownInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.MarkdownInput exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/MenuBar.elm b/modules/webapp/src/main/elm/Comp/MenuBar.elm index f7a19e5d..7fa61324 100644 --- a/modules/webapp/src/main/elm/Comp/MenuBar.elm +++ b/modules/webapp/src/main/elm/Comp/MenuBar.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.MenuBar exposing ( ButtonData , CheckboxData diff --git a/modules/webapp/src/main/elm/Comp/NotificationForm.elm b/modules/webapp/src/main/elm/Comp/NotificationForm.elm index f895371b..32ea132e 100644 --- a/modules/webapp/src/main/elm/Comp/NotificationForm.elm +++ b/modules/webapp/src/main/elm/Comp/NotificationForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.NotificationForm exposing ( Action(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/NotificationList.elm b/modules/webapp/src/main/elm/Comp/NotificationList.elm index 7825d200..31f6104c 100644 --- a/modules/webapp/src/main/elm/Comp/NotificationList.elm +++ b/modules/webapp/src/main/elm/Comp/NotificationList.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.NotificationList exposing ( Action(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/NotificationManage.elm b/modules/webapp/src/main/elm/Comp/NotificationManage.elm index 8b993c08..f57af511 100644 --- a/modules/webapp/src/main/elm/Comp/NotificationManage.elm +++ b/modules/webapp/src/main/elm/Comp/NotificationManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.NotificationManage exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/OrgForm.elm b/modules/webapp/src/main/elm/Comp/OrgForm.elm index 860fa288..e0eea71c 100644 --- a/modules/webapp/src/main/elm/Comp/OrgForm.elm +++ b/modules/webapp/src/main/elm/Comp/OrgForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.OrgForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/OrgManage.elm b/modules/webapp/src/main/elm/Comp/OrgManage.elm index 5035a9db..0e46d760 100644 --- a/modules/webapp/src/main/elm/Comp/OrgManage.elm +++ b/modules/webapp/src/main/elm/Comp/OrgManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.OrgManage exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/OrgTable.elm b/modules/webapp/src/main/elm/Comp/OrgTable.elm index bec9603c..fd75b0b1 100644 --- a/modules/webapp/src/main/elm/Comp/OrgTable.elm +++ b/modules/webapp/src/main/elm/Comp/OrgTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.OrgTable exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/PasswordInput.elm b/modules/webapp/src/main/elm/Comp/PasswordInput.elm index 4d911f6e..00a69c20 100644 --- a/modules/webapp/src/main/elm/Comp/PasswordInput.elm +++ b/modules/webapp/src/main/elm/Comp/PasswordInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.PasswordInput exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/PersonForm.elm b/modules/webapp/src/main/elm/Comp/PersonForm.elm index a881bf11..4278f895 100644 --- a/modules/webapp/src/main/elm/Comp/PersonForm.elm +++ b/modules/webapp/src/main/elm/Comp/PersonForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.PersonForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/PersonManage.elm b/modules/webapp/src/main/elm/Comp/PersonManage.elm index 46ba7047..a58e18fa 100644 --- a/modules/webapp/src/main/elm/Comp/PersonManage.elm +++ b/modules/webapp/src/main/elm/Comp/PersonManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.PersonManage exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/PersonTable.elm b/modules/webapp/src/main/elm/Comp/PersonTable.elm index 28b46411..bd2eb177 100644 --- a/modules/webapp/src/main/elm/Comp/PersonTable.elm +++ b/modules/webapp/src/main/elm/Comp/PersonTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.PersonTable exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm b/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm index 2ba79200..39b5f185 100644 --- a/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm +++ b/modules/webapp/src/main/elm/Comp/PowerSearchInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.PowerSearchInput exposing ( Action(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/Progress.elm b/modules/webapp/src/main/elm/Comp/Progress.elm index 871aa178..341d36a3 100644 --- a/modules/webapp/src/main/elm/Comp/Progress.elm +++ b/modules/webapp/src/main/elm/Comp/Progress.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.Progress exposing ( progress2 , smallIndicating diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm index 6c5caca9..e6c69809 100644 --- a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm +++ b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ScanMailboxForm exposing ( Action(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm index 66d16e9e..4a8c810e 100644 --- a/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm +++ b/modules/webapp/src/main/elm/Comp/ScanMailboxList.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ScanMailboxList exposing ( Action(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm index cefc2f2f..5f51a518 100644 --- a/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm +++ b/modules/webapp/src/main/elm/Comp/ScanMailboxManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.ScanMailboxManage exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Comp/SearchMenu.elm index 21eb4094..627d4b64 100644 --- a/modules/webapp/src/main/elm/Comp/SearchMenu.elm +++ b/modules/webapp/src/main/elm/Comp/SearchMenu.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.SearchMenu exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/SearchStatsView.elm b/modules/webapp/src/main/elm/Comp/SearchStatsView.elm index 93939a18..01a9335d 100644 --- a/modules/webapp/src/main/elm/Comp/SearchStatsView.elm +++ b/modules/webapp/src/main/elm/Comp/SearchStatsView.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.SearchStatsView exposing ( nameOrLabel , sortFields diff --git a/modules/webapp/src/main/elm/Comp/SentMails.elm b/modules/webapp/src/main/elm/Comp/SentMails.elm index f460e75c..9eb40942 100644 --- a/modules/webapp/src/main/elm/Comp/SentMails.elm +++ b/modules/webapp/src/main/elm/Comp/SentMails.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.SentMails exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/SourceForm.elm b/modules/webapp/src/main/elm/Comp/SourceForm.elm index 5fed0bfc..b483c88f 100644 --- a/modules/webapp/src/main/elm/Comp/SourceForm.elm +++ b/modules/webapp/src/main/elm/Comp/SourceForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.SourceForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/SourceManage.elm b/modules/webapp/src/main/elm/Comp/SourceManage.elm index 6de92a90..1753eb31 100644 --- a/modules/webapp/src/main/elm/Comp/SourceManage.elm +++ b/modules/webapp/src/main/elm/Comp/SourceManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.SourceManage exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/SourceTable.elm b/modules/webapp/src/main/elm/Comp/SourceTable.elm index 0a9967e0..5bcdff0a 100644 --- a/modules/webapp/src/main/elm/Comp/SourceTable.elm +++ b/modules/webapp/src/main/elm/Comp/SourceTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.SourceTable exposing ( Msg , SelectMode(..) diff --git a/modules/webapp/src/main/elm/Comp/StringListInput.elm b/modules/webapp/src/main/elm/Comp/StringListInput.elm index bc07f83c..49196e14 100644 --- a/modules/webapp/src/main/elm/Comp/StringListInput.elm +++ b/modules/webapp/src/main/elm/Comp/StringListInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.StringListInput exposing ( ItemAction(..) , Model diff --git a/modules/webapp/src/main/elm/Comp/Tabs.elm b/modules/webapp/src/main/elm/Comp/Tabs.elm index 268a505d..18f54d0c 100644 --- a/modules/webapp/src/main/elm/Comp/Tabs.elm +++ b/modules/webapp/src/main/elm/Comp/Tabs.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.Tabs exposing ( State(..) , Style diff --git a/modules/webapp/src/main/elm/Comp/TagForm.elm b/modules/webapp/src/main/elm/Comp/TagForm.elm index 06e9bc79..010e8c7b 100644 --- a/modules/webapp/src/main/elm/Comp/TagForm.elm +++ b/modules/webapp/src/main/elm/Comp/TagForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.TagForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/TagManage.elm b/modules/webapp/src/main/elm/Comp/TagManage.elm index bfc3062f..3ac89f82 100644 --- a/modules/webapp/src/main/elm/Comp/TagManage.elm +++ b/modules/webapp/src/main/elm/Comp/TagManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.TagManage exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/TagSelect.elm b/modules/webapp/src/main/elm/Comp/TagSelect.elm index f4baf86b..cc600ffe 100644 --- a/modules/webapp/src/main/elm/Comp/TagSelect.elm +++ b/modules/webapp/src/main/elm/Comp/TagSelect.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.TagSelect exposing ( CategoryCount , Model diff --git a/modules/webapp/src/main/elm/Comp/TagTable.elm b/modules/webapp/src/main/elm/Comp/TagTable.elm index be9f1c2d..6cab6c31 100644 --- a/modules/webapp/src/main/elm/Comp/TagTable.elm +++ b/modules/webapp/src/main/elm/Comp/TagTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.TagTable exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm index bf4ee798..29202295 100644 --- a/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm +++ b/modules/webapp/src/main/elm/Comp/UiSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.UiSettingsForm exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm index f3014e33..1c3685ae 100644 --- a/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm +++ b/modules/webapp/src/main/elm/Comp/UiSettingsManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.UiSettingsManage exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm b/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm index 2e1e127d..c84645d7 100644 --- a/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm +++ b/modules/webapp/src/main/elm/Comp/UiSettingsMigrate.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.UiSettingsMigrate exposing ( Model , Msg diff --git a/modules/webapp/src/main/elm/Comp/UserForm.elm b/modules/webapp/src/main/elm/Comp/UserForm.elm index dd0ffb74..046e5996 100644 --- a/modules/webapp/src/main/elm/Comp/UserForm.elm +++ b/modules/webapp/src/main/elm/Comp/UserForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.UserForm exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/UserManage.elm b/modules/webapp/src/main/elm/Comp/UserManage.elm index 27a61365..e894612a 100644 --- a/modules/webapp/src/main/elm/Comp/UserManage.elm +++ b/modules/webapp/src/main/elm/Comp/UserManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.UserManage exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/UserTable.elm b/modules/webapp/src/main/elm/Comp/UserTable.elm index c7e9f49a..169d294f 100644 --- a/modules/webapp/src/main/elm/Comp/UserTable.elm +++ b/modules/webapp/src/main/elm/Comp/UserTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.UserTable exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm b/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm index 223337b3..43987085 100644 --- a/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm +++ b/modules/webapp/src/main/elm/Comp/YesNoDimmer.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Comp.YesNoDimmer exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Data/BasicSize.elm b/modules/webapp/src/main/elm/Data/BasicSize.elm index 268c9531..d67305f9 100644 --- a/modules/webapp/src/main/elm/Data/BasicSize.elm +++ b/modules/webapp/src/main/elm/Data/BasicSize.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.BasicSize exposing ( BasicSize(..) , all diff --git a/modules/webapp/src/main/elm/Data/CalEvent.elm b/modules/webapp/src/main/elm/Data/CalEvent.elm index df11db62..764a7bc6 100644 --- a/modules/webapp/src/main/elm/Data/CalEvent.elm +++ b/modules/webapp/src/main/elm/Data/CalEvent.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.CalEvent exposing ( CalEvent , everyMonth diff --git a/modules/webapp/src/main/elm/Data/Color.elm b/modules/webapp/src/main/elm/Data/Color.elm index 777a1050..b63aa656 100644 --- a/modules/webapp/src/main/elm/Data/Color.elm +++ b/modules/webapp/src/main/elm/Data/Color.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Color exposing ( Color(..) , all diff --git a/modules/webapp/src/main/elm/Data/ContactType.elm b/modules/webapp/src/main/elm/Data/ContactType.elm index da3219bb..cc23f073 100644 --- a/modules/webapp/src/main/elm/Data/ContactType.elm +++ b/modules/webapp/src/main/elm/Data/ContactType.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.ContactType exposing ( ContactType(..) , all diff --git a/modules/webapp/src/main/elm/Data/CustomFieldChange.elm b/modules/webapp/src/main/elm/Data/CustomFieldChange.elm index 5d6db0ce..124d0ec4 100644 --- a/modules/webapp/src/main/elm/Data/CustomFieldChange.elm +++ b/modules/webapp/src/main/elm/Data/CustomFieldChange.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.CustomFieldChange exposing ( CustomFieldChange(..) , CustomFieldValueCollect diff --git a/modules/webapp/src/main/elm/Data/CustomFieldType.elm b/modules/webapp/src/main/elm/Data/CustomFieldType.elm index 6ef3ed84..331efafb 100644 --- a/modules/webapp/src/main/elm/Data/CustomFieldType.elm +++ b/modules/webapp/src/main/elm/Data/CustomFieldType.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.CustomFieldType exposing ( CustomFieldType(..) , all diff --git a/modules/webapp/src/main/elm/Data/Direction.elm b/modules/webapp/src/main/elm/Data/Direction.elm index 6945d57f..7805ae0c 100644 --- a/modules/webapp/src/main/elm/Data/Direction.elm +++ b/modules/webapp/src/main/elm/Data/Direction.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Direction exposing ( Direction(..) , all diff --git a/modules/webapp/src/main/elm/Data/DropdownStyle.elm b/modules/webapp/src/main/elm/Data/DropdownStyle.elm index 3b6e4072..5b1919cf 100644 --- a/modules/webapp/src/main/elm/Data/DropdownStyle.elm +++ b/modules/webapp/src/main/elm/Data/DropdownStyle.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.DropdownStyle exposing ( DropdownStyle , mainStyle diff --git a/modules/webapp/src/main/elm/Data/EquipmentUse.elm b/modules/webapp/src/main/elm/Data/EquipmentUse.elm index e1fb4a99..3dac0c84 100644 --- a/modules/webapp/src/main/elm/Data/EquipmentUse.elm +++ b/modules/webapp/src/main/elm/Data/EquipmentUse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.EquipmentUse exposing ( EquipmentUse(..) , all diff --git a/modules/webapp/src/main/elm/Data/Fields.elm b/modules/webapp/src/main/elm/Data/Fields.elm index 440a70ae..306ad630 100644 --- a/modules/webapp/src/main/elm/Data/Fields.elm +++ b/modules/webapp/src/main/elm/Data/Fields.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Fields exposing ( Field(..) , all diff --git a/modules/webapp/src/main/elm/Data/Flags.elm b/modules/webapp/src/main/elm/Data/Flags.elm index c945bb5d..df841b51 100644 --- a/modules/webapp/src/main/elm/Data/Flags.elm +++ b/modules/webapp/src/main/elm/Data/Flags.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Flags exposing ( Config , Flags diff --git a/modules/webapp/src/main/elm/Data/Icons.elm b/modules/webapp/src/main/elm/Data/Icons.elm index 3abb33b1..f0fd4976 100644 --- a/modules/webapp/src/main/elm/Data/Icons.elm +++ b/modules/webapp/src/main/elm/Data/Icons.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Icons exposing ( addFiles , addFiles2 diff --git a/modules/webapp/src/main/elm/Data/ItemNav.elm b/modules/webapp/src/main/elm/Data/ItemNav.elm index b0b37942..eb57c887 100644 --- a/modules/webapp/src/main/elm/Data/ItemNav.elm +++ b/modules/webapp/src/main/elm/Data/ItemNav.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.ItemNav exposing (ItemNav, fromList) import Api.Model.ItemLight exposing (ItemLight) diff --git a/modules/webapp/src/main/elm/Data/ItemQuery.elm b/modules/webapp/src/main/elm/Data/ItemQuery.elm index 2c48e845..72ab54ca 100644 --- a/modules/webapp/src/main/elm/Data/ItemQuery.elm +++ b/modules/webapp/src/main/elm/Data/ItemQuery.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.ItemQuery exposing ( AttrMatch(..) , ItemQuery(..) diff --git a/modules/webapp/src/main/elm/Data/ItemSelection.elm b/modules/webapp/src/main/elm/Data/ItemSelection.elm index 31002e36..b2b4daac 100644 --- a/modules/webapp/src/main/elm/Data/ItemSelection.elm +++ b/modules/webapp/src/main/elm/Data/ItemSelection.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.ItemSelection exposing ( ItemSelection(..) , isActive diff --git a/modules/webapp/src/main/elm/Data/ItemTemplate.elm b/modules/webapp/src/main/elm/Data/ItemTemplate.elm index df97162a..e2d81f9f 100644 --- a/modules/webapp/src/main/elm/Data/ItemTemplate.elm +++ b/modules/webapp/src/main/elm/Data/ItemTemplate.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.ItemTemplate exposing ( ItemTemplate , TemplateContext diff --git a/modules/webapp/src/main/elm/Data/Items.elm b/modules/webapp/src/main/elm/Data/Items.elm index ebc61622..36a0cab9 100644 --- a/modules/webapp/src/main/elm/Data/Items.elm +++ b/modules/webapp/src/main/elm/Data/Items.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Items exposing ( concat , first diff --git a/modules/webapp/src/main/elm/Data/Language.elm b/modules/webapp/src/main/elm/Data/Language.elm index d67bd2d1..94b8a033 100644 --- a/modules/webapp/src/main/elm/Data/Language.elm +++ b/modules/webapp/src/main/elm/Data/Language.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Language exposing ( Language(..) , all diff --git a/modules/webapp/src/main/elm/Data/ListType.elm b/modules/webapp/src/main/elm/Data/ListType.elm index 4dd7a5be..d80e6a24 100644 --- a/modules/webapp/src/main/elm/Data/ListType.elm +++ b/modules/webapp/src/main/elm/Data/ListType.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.ListType exposing ( ListType(..) , all diff --git a/modules/webapp/src/main/elm/Data/Money.elm b/modules/webapp/src/main/elm/Data/Money.elm index 932d4df5..90968bef 100644 --- a/modules/webapp/src/main/elm/Data/Money.elm +++ b/modules/webapp/src/main/elm/Data/Money.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Money exposing ( Money , MoneyParseError(..) diff --git a/modules/webapp/src/main/elm/Data/OrgUse.elm b/modules/webapp/src/main/elm/Data/OrgUse.elm index 9783b2d7..f5ff59cd 100644 --- a/modules/webapp/src/main/elm/Data/OrgUse.elm +++ b/modules/webapp/src/main/elm/Data/OrgUse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.OrgUse exposing ( OrgUse(..) , all diff --git a/modules/webapp/src/main/elm/Data/PersonUse.elm b/modules/webapp/src/main/elm/Data/PersonUse.elm index f2b2fabc..c6cfc1f8 100644 --- a/modules/webapp/src/main/elm/Data/PersonUse.elm +++ b/modules/webapp/src/main/elm/Data/PersonUse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.PersonUse exposing ( PersonUse(..) , all diff --git a/modules/webapp/src/main/elm/Data/Priority.elm b/modules/webapp/src/main/elm/Data/Priority.elm index ed898fb3..afaf7b25 100644 --- a/modules/webapp/src/main/elm/Data/Priority.elm +++ b/modules/webapp/src/main/elm/Data/Priority.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Priority exposing ( Priority(..) , all diff --git a/modules/webapp/src/main/elm/Data/QueryParseResult.elm b/modules/webapp/src/main/elm/Data/QueryParseResult.elm index dfd0e2a2..4314e601 100644 --- a/modules/webapp/src/main/elm/Data/QueryParseResult.elm +++ b/modules/webapp/src/main/elm/Data/QueryParseResult.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.QueryParseResult exposing (QueryParseResult, success) diff --git a/modules/webapp/src/main/elm/Data/SSLType.elm b/modules/webapp/src/main/elm/Data/SSLType.elm index dbeeee9c..a63b2402 100644 --- a/modules/webapp/src/main/elm/Data/SSLType.elm +++ b/modules/webapp/src/main/elm/Data/SSLType.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.SSLType exposing ( SSLType(..) , all diff --git a/modules/webapp/src/main/elm/Data/SourceState.elm b/modules/webapp/src/main/elm/Data/SourceState.elm index f77963f0..74accd48 100644 --- a/modules/webapp/src/main/elm/Data/SourceState.elm +++ b/modules/webapp/src/main/elm/Data/SourceState.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.SourceState exposing ( SourceState(..) , all diff --git a/modules/webapp/src/main/elm/Data/UiSettings.elm b/modules/webapp/src/main/elm/Data/UiSettings.elm index ca5cf32a..93b1903b 100644 --- a/modules/webapp/src/main/elm/Data/UiSettings.elm +++ b/modules/webapp/src/main/elm/Data/UiSettings.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.UiSettings exposing ( ItemPattern , Pos(..) diff --git a/modules/webapp/src/main/elm/Data/UiTheme.elm b/modules/webapp/src/main/elm/Data/UiTheme.elm index ed1b1506..88268112 100644 --- a/modules/webapp/src/main/elm/Data/UiTheme.elm +++ b/modules/webapp/src/main/elm/Data/UiTheme.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.UiTheme exposing ( UiTheme(..) , cycle diff --git a/modules/webapp/src/main/elm/Data/UserState.elm b/modules/webapp/src/main/elm/Data/UserState.elm index d6eed5c9..7a7054c9 100644 --- a/modules/webapp/src/main/elm/Data/UserState.elm +++ b/modules/webapp/src/main/elm/Data/UserState.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.UserState exposing ( UserState(..) , all diff --git a/modules/webapp/src/main/elm/Data/Validated.elm b/modules/webapp/src/main/elm/Data/Validated.elm index 2171298b..e92a88e9 100644 --- a/modules/webapp/src/main/elm/Data/Validated.elm +++ b/modules/webapp/src/main/elm/Data/Validated.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Data.Validated exposing ( Validated(..) , isInvalid diff --git a/modules/webapp/src/main/elm/Main.elm b/modules/webapp/src/main/elm/Main.elm index b3a20d36..72cd6638 100644 --- a/modules/webapp/src/main/elm/Main.elm +++ b/modules/webapp/src/main/elm/Main.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Main exposing (init, main) import Api diff --git a/modules/webapp/src/main/elm/Messages.elm b/modules/webapp/src/main/elm/Messages.elm index cdef8f9a..f3bff9ae 100644 --- a/modules/webapp/src/main/elm/Messages.elm +++ b/modules/webapp/src/main/elm/Messages.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages exposing ( Messages , fromIso2 diff --git a/modules/webapp/src/main/elm/Messages/App.elm b/modules/webapp/src/main/elm/Messages/App.elm index b273530b..3835e3b5 100644 --- a/modules/webapp/src/main/elm/Messages/App.elm +++ b/modules/webapp/src/main/elm/Messages/App.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.App exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Basics.elm b/modules/webapp/src/main/elm/Messages/Basics.elm index c1f8f749..4c1b4126 100644 --- a/modules/webapp/src/main/elm/Messages/Basics.elm +++ b/modules/webapp/src/main/elm/Messages/Basics.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Basics exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm b/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm index c5901283..fe0ed891 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/AddressForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.AddressForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm b/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm index 2d78fca9..f46684b8 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/AttachmentMeta.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.AttachmentMeta exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm b/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm index 6146a92d..efb10b27 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/CalEventInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.CalEventInput exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm index 34f5e2b0..6c38805d 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ChangePasswordForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ChangePasswordForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm index 69cdc2bd..dc5781c8 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ClassifierSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ClassifierSettingsForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm index fcf3a1b6..d4bd8274 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/CollectiveSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.CollectiveSettingsForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm index 72689a33..7aaf66d3 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.CustomFieldForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm index 184165e9..5a9aad12 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.CustomFieldInput exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm index 50bff996..c3320463 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.CustomFieldManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm index 91c99aa9..e6ee71d8 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldMultiInput.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.CustomFieldMultiInput exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm index 37c9175b..8be17d6d 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/CustomFieldTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.CustomFieldTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm index e631538a..91ffe8a9 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.DetailEdit exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm b/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm index 23b8edde..d38449d0 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/Dropzone.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.Dropzone exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm index cbc999f6..8898ab34 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.EmailSettingsForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm index 3d385230..a80b804c 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.EmailSettingsManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm index 5d102fde..8abcc5dc 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/EmailSettingsTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.EmailSettingsTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm index 144b9624..3ac1a14e 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.EquipmentForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm index d2e4100d..67dcda36 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.EquipmentManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm b/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm index ba71dda0..8d84dac4 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/EquipmentTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.EquipmentTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm b/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm index eb47261f..323d2dd4 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ExpandCollapse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ExpandCollapse exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm index 99a87c31..561cf1c6 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/FolderDetail.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.FolderDetail exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm index c507ea89..1b0eadb9 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/FolderManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.FolderManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm index 608c60d1..ddef9092 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/FolderSelect.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.FolderSelect exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm b/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm index 9fc93d72..8e097a60 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/FolderTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.FolderTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm b/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm index 2d3c7e71..99cbaa7d 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/HttpError.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.HttpError exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm index 33d73bfb..11b79e5f 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ImapSettingsForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm index 646312af..b7e77553 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ImapSettingsManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm index 2481c553..7ae93ff5 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ImapSettingsTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ImapSettingsTable exposing (Texts, de, gb) import Messages.Basics diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm index 21357c67..6ba44fd7 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemCard.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemCard exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm index f4d7a6f6..8c22a430 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemCardList.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemCardList exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm index a7bce63d..26905f5d 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm index cd0b9069..efbdc47b 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/AddFilesForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail.AddFilesForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm index e749b5a1..a823f890 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ConfirmModal.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail.ConfirmModal exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm index 85290f8d..ed616b68 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail.EditForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm index 8a43783b..0779c924 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/ItemInfoHeader.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail.ItemInfoHeader exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm index 7ea697cc..c6e724e8 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail.MultiEditMenu exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm index d1be4a8e..d2e7ed07 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/Notes.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail.Notes exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm index 44147a0a..b26acff6 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/SingleAttachment.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemDetail.SingleAttachment exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm index 3f07aedf..09a413a6 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemMail.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ItemMail exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm index 2be6002a..a00ef06f 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.NotificationForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm index e7363e97..88678374 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.NotificationManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm b/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm index 03af1fa7..761550cb 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/NotificationTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.NotificationTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm index d3269c27..c0fbb3bb 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/OrgForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.OrgForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm index 01546807..de4f40a3 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/OrgManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.OrgManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm b/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm index d7951787..d940492b 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/OrgTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.OrgTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm index 8d01112c..72de7ae0 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/PersonForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.PersonForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm index 0e0e8e93..14ac65a0 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/PersonManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.PersonManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm b/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm index b98dd3cb..81e9c551 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/PersonTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.PersonTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm index 48ec65cf..85eac9b1 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ScanMailboxForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm index 74d9a4ea..717f58d6 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ScanMailboxManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm index 18673608..835dec50 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ScanMailboxTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.ScanMailboxTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm index 856f9c01..27be0496 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.SearchMenu exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm b/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm index fe73f6ad..9d4f81de 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/SearchStatsView.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.SearchStatsView exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm b/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm index 7146b31b..9fb9d67a 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/SentMails.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.SentMails exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm index ffa9f750..66886f79 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/SourceForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.SourceForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm index 279648d6..b1feb946 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/SourceManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.SourceManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm b/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm index 934ff771..7639acc9 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/SourceTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.SourceTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm b/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm index 006b4f21..4ab42651 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/TagForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.TagForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm b/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm index a7a7437c..10ff1f39 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/TagManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.TagManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm b/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm index 574e2247..d8142c83 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/TagSelect.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.TagSelect exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm b/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm index 80b2171a..3e7e6f91 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/TagTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.TagTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm index 3d2dfe5a..908559ec 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.UiSettingsForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm index 91422191..6e11aa75 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/UiSettingsManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.UiSettingsManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm b/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm index b82494f0..1475ce99 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/UserForm.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.UserForm exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm b/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm index 99bf6000..60d5f054 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/UserManage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.UserManage exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm b/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm index 40a38187..059b7181 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/UserTable.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Comp.UserTable exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Data/Color.elm b/modules/webapp/src/main/elm/Messages/Data/Color.elm index c03ad4e2..e650f55a 100644 --- a/modules/webapp/src/main/elm/Messages/Data/Color.elm +++ b/modules/webapp/src/main/elm/Messages/Data/Color.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.Color exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/ContactType.elm b/modules/webapp/src/main/elm/Messages/Data/ContactType.elm index 7a4eafe0..c361f297 100644 --- a/modules/webapp/src/main/elm/Messages/Data/ContactType.elm +++ b/modules/webapp/src/main/elm/Messages/Data/ContactType.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.ContactType exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm b/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm index d952b91c..c8e6c109 100644 --- a/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm +++ b/modules/webapp/src/main/elm/Messages/Data/CustomFieldType.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.CustomFieldType exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/Direction.elm b/modules/webapp/src/main/elm/Messages/Data/Direction.elm index 09351645..69897f18 100644 --- a/modules/webapp/src/main/elm/Messages/Data/Direction.elm +++ b/modules/webapp/src/main/elm/Messages/Data/Direction.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.Direction exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm b/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm index d79ce3dc..fcdbc50b 100644 --- a/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm +++ b/modules/webapp/src/main/elm/Messages/Data/EquipmentUse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.EquipmentUse exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/Fields.elm b/modules/webapp/src/main/elm/Messages/Data/Fields.elm index 1d70beaa..b713fea0 100644 --- a/modules/webapp/src/main/elm/Messages/Data/Fields.elm +++ b/modules/webapp/src/main/elm/Messages/Data/Fields.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.Fields exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/Language.elm b/modules/webapp/src/main/elm/Messages/Data/Language.elm index b52d1c4d..3f66c7f6 100644 --- a/modules/webapp/src/main/elm/Messages/Data/Language.elm +++ b/modules/webapp/src/main/elm/Messages/Data/Language.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.Language exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm b/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm index 745d2a37..09abfa50 100644 --- a/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm +++ b/modules/webapp/src/main/elm/Messages/Data/OrgUse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.OrgUse exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm b/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm index 3a35057c..72d39769 100644 --- a/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm +++ b/modules/webapp/src/main/elm/Messages/Data/PersonUse.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.PersonUse exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/Data/SSLType.elm b/modules/webapp/src/main/elm/Messages/Data/SSLType.elm index 41ce8afa..a78801d9 100644 --- a/modules/webapp/src/main/elm/Messages/Data/SSLType.elm +++ b/modules/webapp/src/main/elm/Messages/Data/SSLType.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Data.SSLType exposing ( de , gb diff --git a/modules/webapp/src/main/elm/Messages/DateFormat.elm b/modules/webapp/src/main/elm/Messages/DateFormat.elm index 842ef11a..2079fa08 100644 --- a/modules/webapp/src/main/elm/Messages/DateFormat.elm +++ b/modules/webapp/src/main/elm/Messages/DateFormat.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.DateFormat exposing ( format , formatDateLong diff --git a/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm b/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm index 5c1ac26d..315349aa 100644 --- a/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm +++ b/modules/webapp/src/main/elm/Messages/Page/CollectiveSettings.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.CollectiveSettings exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/Home.elm b/modules/webapp/src/main/elm/Messages/Page/Home.elm index 632cb914..00eaae7c 100644 --- a/modules/webapp/src/main/elm/Messages/Page/Home.elm +++ b/modules/webapp/src/main/elm/Messages/Page/Home.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.Home exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm b/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm index a175ab0e..94e685ad 100644 --- a/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm +++ b/modules/webapp/src/main/elm/Messages/Page/HomeSideMenu.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.HomeSideMenu exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm b/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm index fd011be5..f6f0b236 100644 --- a/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm +++ b/modules/webapp/src/main/elm/Messages/Page/ItemDetail.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.ItemDetail exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/Login.elm b/modules/webapp/src/main/elm/Messages/Page/Login.elm index 3923df12..a9b0bdb7 100644 --- a/modules/webapp/src/main/elm/Messages/Page/Login.elm +++ b/modules/webapp/src/main/elm/Messages/Page/Login.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.Login exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/ManageData.elm b/modules/webapp/src/main/elm/Messages/Page/ManageData.elm index 7191b56a..8fff4892 100644 --- a/modules/webapp/src/main/elm/Messages/Page/ManageData.elm +++ b/modules/webapp/src/main/elm/Messages/Page/ManageData.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.ManageData exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm b/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm index 638fe568..d2fdf62e 100644 --- a/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm +++ b/modules/webapp/src/main/elm/Messages/Page/NewInvite.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.NewInvite exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/Queue.elm b/modules/webapp/src/main/elm/Messages/Page/Queue.elm index 382e0f07..d40c832a 100644 --- a/modules/webapp/src/main/elm/Messages/Page/Queue.elm +++ b/modules/webapp/src/main/elm/Messages/Page/Queue.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.Queue exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/Register.elm b/modules/webapp/src/main/elm/Messages/Page/Register.elm index 9f766d4e..db1be4b4 100644 --- a/modules/webapp/src/main/elm/Messages/Page/Register.elm +++ b/modules/webapp/src/main/elm/Messages/Page/Register.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.Register exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/Upload.elm b/modules/webapp/src/main/elm/Messages/Page/Upload.elm index b06d7c52..570fe61f 100644 --- a/modules/webapp/src/main/elm/Messages/Page/Upload.elm +++ b/modules/webapp/src/main/elm/Messages/Page/Upload.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.Upload exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm index d3b2a841..0c22ac71 100644 --- a/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm +++ b/modules/webapp/src/main/elm/Messages/Page/UserSettings.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.Page.UserSettings exposing ( Texts , de diff --git a/modules/webapp/src/main/elm/Messages/UiLanguage.elm b/modules/webapp/src/main/elm/Messages/UiLanguage.elm index 7da3adfb..9f1f1ba1 100644 --- a/modules/webapp/src/main/elm/Messages/UiLanguage.elm +++ b/modules/webapp/src/main/elm/Messages/UiLanguage.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Messages.UiLanguage exposing ( UiLanguage(..) , all diff --git a/modules/webapp/src/main/elm/Page.elm b/modules/webapp/src/main/elm/Page.elm index b4de34ec..d6a4afa4 100644 --- a/modules/webapp/src/main/elm/Page.elm +++ b/modules/webapp/src/main/elm/Page.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page exposing ( Page(..) , fromUrl diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm index c34484ba..1831bf0c 100644 --- a/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm +++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.CollectiveSettings.Data exposing ( FormState(..) , Model diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm index f22cf85f..1b695289 100644 --- a/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm +++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.CollectiveSettings.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm b/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm index 54fa391c..b190ec82 100644 --- a/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm +++ b/modules/webapp/src/main/elm/Page/CollectiveSettings/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.CollectiveSettings.View2 exposing (viewContent, viewSidebar) import Api.Model.TagCount exposing (TagCount) diff --git a/modules/webapp/src/main/elm/Page/Home/Data.elm b/modules/webapp/src/main/elm/Page/Home/Data.elm index 7a3005b6..032c922f 100644 --- a/modules/webapp/src/main/elm/Page/Home/Data.elm +++ b/modules/webapp/src/main/elm/Page/Home/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Home.Data exposing ( ConfirmModalValue(..) , Model diff --git a/modules/webapp/src/main/elm/Page/Home/SideMenu.elm b/modules/webapp/src/main/elm/Page/Home/SideMenu.elm index fad0b83e..63cf16a0 100644 --- a/modules/webapp/src/main/elm/Page/Home/SideMenu.elm +++ b/modules/webapp/src/main/elm/Page/Home/SideMenu.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Home.SideMenu exposing (view) import Comp.Basic as B diff --git a/modules/webapp/src/main/elm/Page/Home/Update.elm b/modules/webapp/src/main/elm/Page/Home/Update.elm index 83029264..dece6888 100644 --- a/modules/webapp/src/main/elm/Page/Home/Update.elm +++ b/modules/webapp/src/main/elm/Page/Home/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Home.Update exposing ( UpdateResult , update diff --git a/modules/webapp/src/main/elm/Page/Home/View2.elm b/modules/webapp/src/main/elm/Page/Home/View2.elm index 48e681e2..ad464746 100644 --- a/modules/webapp/src/main/elm/Page/Home/View2.elm +++ b/modules/webapp/src/main/elm/Page/Home/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Home.View2 exposing (viewContent, viewSidebar) import Comp.Basic as B diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm b/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm index 8bfba482..84ee3605 100644 --- a/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm +++ b/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.ItemDetail.Data exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm index e22f9c4d..0d0a9a88 100644 --- a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.ItemDetail.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm b/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm index de32963b..1c0d574b 100644 --- a/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm +++ b/modules/webapp/src/main/elm/Page/ItemDetail/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.ItemDetail.View2 exposing (viewContent, viewSidebar) import Comp.Basic as B diff --git a/modules/webapp/src/main/elm/Page/Login/Data.elm b/modules/webapp/src/main/elm/Page/Login/Data.elm index 931ad97d..1d8ffd79 100644 --- a/modules/webapp/src/main/elm/Page/Login/Data.elm +++ b/modules/webapp/src/main/elm/Page/Login/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Login.Data exposing ( FormState(..) , Model diff --git a/modules/webapp/src/main/elm/Page/Login/Update.elm b/modules/webapp/src/main/elm/Page/Login/Update.elm index f8cb3766..56882fcd 100644 --- a/modules/webapp/src/main/elm/Page/Login/Update.elm +++ b/modules/webapp/src/main/elm/Page/Login/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Login.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Page/Login/View2.elm b/modules/webapp/src/main/elm/Page/Login/View2.elm index 57cc3d93..9ac3c8db 100644 --- a/modules/webapp/src/main/elm/Page/Login/View2.elm +++ b/modules/webapp/src/main/elm/Page/Login/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Login.View2 exposing (viewContent, viewSidebar) import Api.Model.VersionInfo exposing (VersionInfo) diff --git a/modules/webapp/src/main/elm/Page/ManageData/Data.elm b/modules/webapp/src/main/elm/Page/ManageData/Data.elm index f67f8dbc..07f79c48 100644 --- a/modules/webapp/src/main/elm/Page/ManageData/Data.elm +++ b/modules/webapp/src/main/elm/Page/ManageData/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.ManageData.Data exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Page/ManageData/Update.elm b/modules/webapp/src/main/elm/Page/ManageData/Update.elm index 487ff837..8a2df98b 100644 --- a/modules/webapp/src/main/elm/Page/ManageData/Update.elm +++ b/modules/webapp/src/main/elm/Page/ManageData/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.ManageData.Update exposing (update) import Comp.CustomFieldManage diff --git a/modules/webapp/src/main/elm/Page/ManageData/View2.elm b/modules/webapp/src/main/elm/Page/ManageData/View2.elm index 22788317..f4b46695 100644 --- a/modules/webapp/src/main/elm/Page/ManageData/View2.elm +++ b/modules/webapp/src/main/elm/Page/ManageData/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.ManageData.View2 exposing (viewContent, viewSidebar) import Comp.CustomFieldManage diff --git a/modules/webapp/src/main/elm/Page/NewInvite/Data.elm b/modules/webapp/src/main/elm/Page/NewInvite/Data.elm index b05d8e86..4f716345 100644 --- a/modules/webapp/src/main/elm/Page/NewInvite/Data.elm +++ b/modules/webapp/src/main/elm/Page/NewInvite/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.NewInvite.Data exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Page/NewInvite/Update.elm b/modules/webapp/src/main/elm/Page/NewInvite/Update.elm index c5723937..cfff6024 100644 --- a/modules/webapp/src/main/elm/Page/NewInvite/Update.elm +++ b/modules/webapp/src/main/elm/Page/NewInvite/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.NewInvite.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Page/NewInvite/View2.elm b/modules/webapp/src/main/elm/Page/NewInvite/View2.elm index 3431b39d..37f2077f 100644 --- a/modules/webapp/src/main/elm/Page/NewInvite/View2.elm +++ b/modules/webapp/src/main/elm/Page/NewInvite/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.NewInvite.View2 exposing (viewContent, viewSidebar) import Data.Flags exposing (Flags) diff --git a/modules/webapp/src/main/elm/Page/Queue/Data.elm b/modules/webapp/src/main/elm/Page/Queue/Data.elm index 89ac27db..ba0ba4a7 100644 --- a/modules/webapp/src/main/elm/Page/Queue/Data.elm +++ b/modules/webapp/src/main/elm/Page/Queue/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Queue.Data exposing ( FormState(..) , Model diff --git a/modules/webapp/src/main/elm/Page/Queue/Update.elm b/modules/webapp/src/main/elm/Page/Queue/Update.elm index 5e5754d7..d3ae08a0 100644 --- a/modules/webapp/src/main/elm/Page/Queue/Update.elm +++ b/modules/webapp/src/main/elm/Page/Queue/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Queue.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Page/Queue/View2.elm b/modules/webapp/src/main/elm/Page/Queue/View2.elm index 3a181f0c..00b45a7d 100644 --- a/modules/webapp/src/main/elm/Page/Queue/View2.elm +++ b/modules/webapp/src/main/elm/Page/Queue/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Queue.View2 exposing (viewContent, viewSidebar) import Api.Model.JobDetail exposing (JobDetail) diff --git a/modules/webapp/src/main/elm/Page/Register/Data.elm b/modules/webapp/src/main/elm/Page/Register/Data.elm index e78dc244..f89d5660 100644 --- a/modules/webapp/src/main/elm/Page/Register/Data.elm +++ b/modules/webapp/src/main/elm/Page/Register/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Register.Data exposing ( FormState(..) , Model diff --git a/modules/webapp/src/main/elm/Page/Register/Update.elm b/modules/webapp/src/main/elm/Page/Register/Update.elm index 7e3a85d0..8eb22439 100644 --- a/modules/webapp/src/main/elm/Page/Register/Update.elm +++ b/modules/webapp/src/main/elm/Page/Register/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Register.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Page/Register/View2.elm b/modules/webapp/src/main/elm/Page/Register/View2.elm index 579bf7b0..2942c0c0 100644 --- a/modules/webapp/src/main/elm/Page/Register/View2.elm +++ b/modules/webapp/src/main/elm/Page/Register/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Register.View2 exposing (viewContent, viewSidebar) import Comp.Basic as B diff --git a/modules/webapp/src/main/elm/Page/Upload/Data.elm b/modules/webapp/src/main/elm/Page/Upload/Data.elm index 6c9d31d6..b93c102e 100644 --- a/modules/webapp/src/main/elm/Page/Upload/Data.elm +++ b/modules/webapp/src/main/elm/Page/Upload/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Upload.Data exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Page/Upload/Update.elm b/modules/webapp/src/main/elm/Page/Upload/Update.elm index c494d21c..12c448a3 100644 --- a/modules/webapp/src/main/elm/Page/Upload/Update.elm +++ b/modules/webapp/src/main/elm/Page/Upload/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Upload.Update exposing (update) import Api diff --git a/modules/webapp/src/main/elm/Page/Upload/View2.elm b/modules/webapp/src/main/elm/Page/Upload/View2.elm index e1bcf3c3..98f200b4 100644 --- a/modules/webapp/src/main/elm/Page/Upload/View2.elm +++ b/modules/webapp/src/main/elm/Page/Upload/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.Upload.View2 exposing (viewContent, viewSidebar) import Comp.Dropzone diff --git a/modules/webapp/src/main/elm/Page/UserSettings/Data.elm b/modules/webapp/src/main/elm/Page/UserSettings/Data.elm index 87042efc..17d4aeaf 100644 --- a/modules/webapp/src/main/elm/Page/UserSettings/Data.elm +++ b/modules/webapp/src/main/elm/Page/UserSettings/Data.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.UserSettings.Data exposing ( Model , Msg(..) diff --git a/modules/webapp/src/main/elm/Page/UserSettings/Update.elm b/modules/webapp/src/main/elm/Page/UserSettings/Update.elm index ddff1c9c..925d3b57 100644 --- a/modules/webapp/src/main/elm/Page/UserSettings/Update.elm +++ b/modules/webapp/src/main/elm/Page/UserSettings/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.UserSettings.Update exposing (UpdateResult, update) import Comp.ChangePasswordForm diff --git a/modules/webapp/src/main/elm/Page/UserSettings/View2.elm b/modules/webapp/src/main/elm/Page/UserSettings/View2.elm index 3c400fd2..1c058f4e 100644 --- a/modules/webapp/src/main/elm/Page/UserSettings/View2.elm +++ b/modules/webapp/src/main/elm/Page/UserSettings/View2.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Page.UserSettings.View2 exposing (viewContent, viewSidebar) import Comp.ChangePasswordForm diff --git a/modules/webapp/src/main/elm/Ports.elm b/modules/webapp/src/main/elm/Ports.elm index d1f696b0..7fd14f39 100644 --- a/modules/webapp/src/main/elm/Ports.elm +++ b/modules/webapp/src/main/elm/Ports.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + port module Ports exposing ( checkSearchQueryString , initClipboard diff --git a/modules/webapp/src/main/elm/Styles.elm b/modules/webapp/src/main/elm/Styles.elm index 3592101d..9fa740b6 100644 --- a/modules/webapp/src/main/elm/Styles.elm +++ b/modules/webapp/src/main/elm/Styles.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Styles exposing (..) diff --git a/modules/webapp/src/main/elm/Util/Address.elm b/modules/webapp/src/main/elm/Util/Address.elm index a849f597..56b56868 100644 --- a/modules/webapp/src/main/elm/Util/Address.elm +++ b/modules/webapp/src/main/elm/Util/Address.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Address exposing (toString) import Api.Model.Address exposing (Address) diff --git a/modules/webapp/src/main/elm/Util/Contact.elm b/modules/webapp/src/main/elm/Util/Contact.elm index ec4a8940..2f3f3cd6 100644 --- a/modules/webapp/src/main/elm/Util/Contact.elm +++ b/modules/webapp/src/main/elm/Util/Contact.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Contact exposing (toString) import Api.Model.Contact exposing (Contact) diff --git a/modules/webapp/src/main/elm/Util/CustomField.elm b/modules/webapp/src/main/elm/Util/CustomField.elm index 1811380f..0868fefc 100644 --- a/modules/webapp/src/main/elm/Util/CustomField.elm +++ b/modules/webapp/src/main/elm/Util/CustomField.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.CustomField exposing ( boolValue , nameOrLabel diff --git a/modules/webapp/src/main/elm/Util/Duration.elm b/modules/webapp/src/main/elm/Util/Duration.elm index 2814b349..23ec1bd6 100644 --- a/modules/webapp/src/main/elm/Util/Duration.elm +++ b/modules/webapp/src/main/elm/Util/Duration.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Duration exposing (Duration, toHuman) -- 486ms -> 12s -> 1:05 -> 59:45 -> 1:02:12 diff --git a/modules/webapp/src/main/elm/Util/File.elm b/modules/webapp/src/main/elm/Util/File.elm index bf79fca3..d6253cce 100644 --- a/modules/webapp/src/main/elm/Util/File.elm +++ b/modules/webapp/src/main/elm/Util/File.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.File exposing (makeFileId) import File exposing (File) diff --git a/modules/webapp/src/main/elm/Util/Folder.elm b/modules/webapp/src/main/elm/Util/Folder.elm index 93996276..d66ad9e6 100644 --- a/modules/webapp/src/main/elm/Util/Folder.elm +++ b/modules/webapp/src/main/elm/Util/Folder.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Folder exposing ( isFolderMember , mkFolderOption diff --git a/modules/webapp/src/main/elm/Util/Html.elm b/modules/webapp/src/main/elm/Util/Html.elm index ff5e7d30..761fd7fa 100644 --- a/modules/webapp/src/main/elm/Util/Html.elm +++ b/modules/webapp/src/main/elm/Util/Html.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Html exposing ( KeyCode(..) , checkbox2 diff --git a/modules/webapp/src/main/elm/Util/Http.elm b/modules/webapp/src/main/elm/Util/Http.elm index 758b51e7..38ed20ce 100644 --- a/modules/webapp/src/main/elm/Util/Http.elm +++ b/modules/webapp/src/main/elm/Util/Http.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Http exposing ( authDelete , authGet diff --git a/modules/webapp/src/main/elm/Util/ItemDragDrop.elm b/modules/webapp/src/main/elm/Util/ItemDragDrop.elm index 0347f483..186aaf31 100644 --- a/modules/webapp/src/main/elm/Util/ItemDragDrop.elm +++ b/modules/webapp/src/main/elm/Util/ItemDragDrop.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.ItemDragDrop exposing ( DragDropData , Dropped diff --git a/modules/webapp/src/main/elm/Util/List.elm b/modules/webapp/src/main/elm/Util/List.elm index a3093f18..2063b538 100644 --- a/modules/webapp/src/main/elm/Util/List.elm +++ b/modules/webapp/src/main/elm/Util/List.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.List exposing ( distinct , dropRight diff --git a/modules/webapp/src/main/elm/Util/Maybe.elm b/modules/webapp/src/main/elm/Util/Maybe.elm index 8bb21d3b..3a9a0ca0 100644 --- a/modules/webapp/src/main/elm/Util/Maybe.elm +++ b/modules/webapp/src/main/elm/Util/Maybe.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Maybe exposing ( filter , fromString diff --git a/modules/webapp/src/main/elm/Util/Person.elm b/modules/webapp/src/main/elm/Util/Person.elm index 32b0e726..c16ba525 100644 --- a/modules/webapp/src/main/elm/Util/Person.elm +++ b/modules/webapp/src/main/elm/Util/Person.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Person exposing (mkPersonOption) import Api.Model.IdName exposing (IdName) diff --git a/modules/webapp/src/main/elm/Util/Result.elm b/modules/webapp/src/main/elm/Util/Result.elm index e91de07c..e8c69ed9 100644 --- a/modules/webapp/src/main/elm/Util/Result.elm +++ b/modules/webapp/src/main/elm/Util/Result.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Result exposing (fold) diff --git a/modules/webapp/src/main/elm/Util/Size.elm b/modules/webapp/src/main/elm/Util/Size.elm index 29ca2fb6..bf128340 100644 --- a/modules/webapp/src/main/elm/Util/Size.elm +++ b/modules/webapp/src/main/elm/Util/Size.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Size exposing ( SizeUnit(..) , bytesReadable diff --git a/modules/webapp/src/main/elm/Util/String.elm b/modules/webapp/src/main/elm/Util/String.elm index 5569be0a..cab8a71e 100644 --- a/modules/webapp/src/main/elm/Util/String.elm +++ b/modules/webapp/src/main/elm/Util/String.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.String exposing ( crazyEncode , ellipsis diff --git a/modules/webapp/src/main/elm/Util/Tag.elm b/modules/webapp/src/main/elm/Util/Tag.elm index 8171e12e..212018dc 100644 --- a/modules/webapp/src/main/elm/Util/Tag.elm +++ b/modules/webapp/src/main/elm/Util/Tag.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Tag exposing ( catSettings , getCategories diff --git a/modules/webapp/src/main/elm/Util/Time.elm b/modules/webapp/src/main/elm/Util/Time.elm index 7d73d962..58eaee75 100644 --- a/modules/webapp/src/main/elm/Util/Time.elm +++ b/modules/webapp/src/main/elm/Util/Time.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Time exposing (formatIsoDateTime) import DateFormat diff --git a/modules/webapp/src/main/elm/Util/Update.elm b/modules/webapp/src/main/elm/Util/Update.elm index aeadc1e1..5f8d8f07 100644 --- a/modules/webapp/src/main/elm/Util/Update.elm +++ b/modules/webapp/src/main/elm/Util/Update.elm @@ -1,9 +1,10 @@ {- - Copyright 2020 Docspell Contributors + Copyright 2020 Docspell Contributors - SPDX-License-Identifier: GPL-3.0-or-later + SPDX-License-Identifier: GPL-3.0-or-later -} + module Util.Update exposing ( andThen1 , andThen2 From 782ca0fa4fc827c32c02e361d25f30decd2c0cfe Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 16:03:52 +0200 Subject: [PATCH 11/46] Remove a deleted item from search results When an item is deleted in detail view, the results must be updated to reflect the new state. The results are now changed by removing the corresponding item. Fixes: #920 --- modules/webapp/src/main/elm/App/Update.elm | 14 ++++++++--- .../webapp/src/main/elm/Comp/ItemCardList.elm | 20 ++++++++++++++++ .../src/main/elm/Comp/ItemDetail/Model.elm | 9 +++---- .../src/main/elm/Comp/ItemDetail/Update.elm | 24 ++++++++++++------- .../webapp/src/main/elm/Page/Home/Data.elm | 1 + .../webapp/src/main/elm/Page/Home/Update.elm | 3 +++ .../src/main/elm/Page/ItemDetail/Data.elm | 1 + .../src/main/elm/Page/ItemDetail/Update.elm | 6 +++-- 8 files changed, 61 insertions(+), 17 deletions(-) diff --git a/modules/webapp/src/main/elm/App/Update.elm b/modules/webapp/src/main/elm/App/Update.elm index 04b752e0..b5381433 100644 --- a/modules/webapp/src/main/elm/App/Update.elm +++ b/modules/webapp/src/main/elm/App/Update.elm @@ -331,10 +331,18 @@ updateItemDetail lmsg model = ( hm, hc, hs ) = updateHome (Page.Home.Data.SetLinkTarget result.linkTarget) model_ + + ( hm1, hc1, hs1 ) = + case result.removedItem of + Just removedId -> + updateHome (Page.Home.Data.RemoveItem removedId) hm + + Nothing -> + ( hm, hc, hs ) in - ( hm - , Cmd.batch [ Cmd.map ItemDetailMsg result.cmd, hc ] - , Sub.batch [ Sub.map ItemDetailMsg result.sub, hs ] + ( hm1 + , Cmd.batch [ Cmd.map ItemDetailMsg result.cmd, hc, hc1 ] + , Sub.batch [ Sub.map ItemDetailMsg result.sub, hs, hs1 ] ) diff --git a/modules/webapp/src/main/elm/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Comp/ItemCardList.elm index d9087b59..4be8d40f 100644 --- a/modules/webapp/src/main/elm/Comp/ItemCardList.elm +++ b/modules/webapp/src/main/elm/Comp/ItemCardList.elm @@ -46,6 +46,7 @@ type Msg = SetResults ItemLightList | AddResults ItemLightList | ItemCardMsg ItemLight Comp.ItemCard.Msg + | RemoveItem String init : Model @@ -145,6 +146,13 @@ updateDrag dm _ msg model = result.selection result.linkTarget + RemoveItem id -> + UpdateResult { model | results = removeItemById id model.results } + Cmd.none + dm + Data.ItemSelection.Inactive + Comp.LinkTarget.LinkNone + --- View2 @@ -232,3 +240,15 @@ isMultiSelectMode cfg = Data.ItemSelection.Inactive -> False + + +removeItemById : String -> ItemLightList -> ItemLightList +removeItemById id list = + let + filterItem item = + item.id /= id + + filterGroup group = + { group | items = List.filter filterItem group.items } + in + { list | groups = List.map filterGroup list.groups } diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm index 58c44201..65246daf 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Model.elm @@ -276,7 +276,7 @@ type Msg | ItemModalCancelled | RequestDelete | SaveResp (Result Http.Error BasicResult) - | DeleteResp (Result Http.Error BasicResult) + | DeleteResp String (Result Http.Error BasicResult) | GetItemResp (Result Http.Error ItemDetail) | GetProposalResp (Result Http.Error ItemProposals) | RemoveDueDate @@ -352,22 +352,23 @@ type alias UpdateResult = , cmd : Cmd Msg , sub : Sub Msg , linkTarget : LinkTarget + , removedItem : Maybe String } resultModel : Model -> UpdateResult resultModel model = - UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone + UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone Nothing resultModelCmd : ( Model, Cmd Msg ) -> UpdateResult resultModelCmd ( model, cmd ) = - UpdateResult model cmd Sub.none Comp.LinkTarget.LinkNone + UpdateResult model cmd Sub.none Comp.LinkTarget.LinkNone Nothing resultModelCmdSub : ( Model, Cmd Msg, Sub Msg ) -> UpdateResult resultModelCmdSub ( model, cmd, sub ) = - UpdateResult model cmd sub Comp.LinkTarget.LinkNone + UpdateResult model cmd sub Comp.LinkTarget.LinkNone Nothing personMatchesOrg : Model -> Bool diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm index 7e2200f5..6e9ebe1f 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm @@ -279,6 +279,7 @@ update key flags inav settings msg model = , res9.sub ] , linkTarget = Comp.LinkTarget.LinkNone + , removedItem = Nothing } SetActiveAttachment pos -> @@ -560,7 +561,7 @@ update key flags inav settings msg model = DeleteItemConfirmed -> let cmd = - Api.deleteItem flags model.item.id DeleteResp + Api.deleteItem flags model.item.id (DeleteResp model.item.id) in resultModelCmd ( { model | itemModal = Nothing }, cmd ) @@ -677,6 +678,7 @@ update key flags inav settings msg model = , cmd = Cmd.batch [ res1.cmd, res2.cmd ] , sub = Sub.batch [ res1.sub, res2.sub ] , linkTarget = Comp.LinkTarget.LinkNone + , removedItem = Nothing } GetPersonResp (Err _) -> @@ -720,19 +722,23 @@ update key flags inav settings msg model = SaveNameResp (Err _) -> resultModel { model | nameState = SaveFailed } - DeleteResp (Ok res) -> + DeleteResp removedId (Ok res) -> if res.success then - case inav.next of - Just id -> - resultModelCmd ( model, Page.set key (ItemDetailPage id) ) + let + result_ = + case inav.next of + Just id -> + resultModelCmd ( model, Page.set key (ItemDetailPage id) ) - Nothing -> - resultModelCmd ( model, Page.set key HomePage ) + Nothing -> + resultModelCmd ( model, Page.set key HomePage ) + in + { result_ | removedItem = Just removedId } else resultModel model - DeleteResp (Err _) -> + DeleteResp _ (Err _) -> resultModel model GetItemResp (Ok item) -> @@ -1421,6 +1427,7 @@ update key flags inav settings msg model = , cmd = Cmd.none , sub = Sub.none , linkTarget = lt + , removedItem = Nothing } CustomFieldMsg lm -> @@ -1747,6 +1754,7 @@ withSub ( m, c ) = m.customFieldThrottle ] , linkTarget = Comp.LinkTarget.LinkNone + , removedItem = Nothing } diff --git a/modules/webapp/src/main/elm/Page/Home/Data.elm b/modules/webapp/src/main/elm/Page/Home/Data.elm index 032c922f..8560ca9d 100644 --- a/modules/webapp/src/main/elm/Page/Home/Data.elm +++ b/modules/webapp/src/main/elm/Page/Home/Data.elm @@ -201,6 +201,7 @@ type Msg | RequestReprocessSelected | ReprocessSelectedConfirmed | ClientSettingsSaveResp UiSettings (Result Http.Error BasicResult) + | RemoveItem String type SearchType diff --git a/modules/webapp/src/main/elm/Page/Home/Update.elm b/modules/webapp/src/main/elm/Page/Home/Update.elm index dece6888..55a45ce7 100644 --- a/modules/webapp/src/main/elm/Page/Home/Update.elm +++ b/modules/webapp/src/main/elm/Page/Home/Update.elm @@ -652,6 +652,9 @@ update mId key flags settings msg model = KeyUpPowerSearchbarMsg _ -> withSub ( model, Cmd.none ) + RemoveItem id -> + update mId key flags settings (ItemCardListMsg (Comp.ItemCardList.RemoveItem id)) model + --- Helpers diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm b/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm index 84ee3605..0d679da7 100644 --- a/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm +++ b/modules/webapp/src/main/elm/Page/ItemDetail/Data.elm @@ -44,4 +44,5 @@ type alias UpdateResult = , cmd : Cmd Msg , sub : Sub Msg , linkTarget : LinkTarget + , removedItem : Maybe String } diff --git a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm index 0d0a9a88..1ac23be2 100644 --- a/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Page/ItemDetail/Update.elm @@ -46,6 +46,7 @@ update key flags inav settings msg model = ] , sub = Sub.map ItemDetailMsg result.sub , linkTarget = result.linkTarget + , removedItem = result.removedItem } ItemDetailMsg lmsg -> @@ -65,6 +66,7 @@ update key flags inav settings msg model = , cmd = Cmd.batch [ pageSwitch, Cmd.map ItemDetailMsg result.cmd ] , sub = Sub.map ItemDetailMsg result.sub , linkTarget = result.linkTarget + , removedItem = result.removedItem } ItemResp (Ok item) -> @@ -75,10 +77,10 @@ update key flags inav settings msg model = update key flags inav settings (ItemDetailMsg lmsg) model ItemResp (Err _) -> - UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone + UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone Nothing ScrollResult _ -> - UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone + UpdateResult model Cmd.none Sub.none Comp.LinkTarget.LinkNone Nothing UiSettingsUpdated -> let From fcef52856a0c5a5f2f548338c662c4334802eeb6 Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 21:24:08 +0200 Subject: [PATCH 12/46] Allow tag ids or tag names when replacing tags --- .../src/main/scala/docspell/backend/ops/OItem.scala | 13 +++++++------ .../restapi/src/main/resources/docspell-openapi.yml | 4 +++- .../restserver/routes/ItemMultiRoutes.scala | 9 ++++++--- .../docspell/restserver/routes/ItemRoutes.scala | 4 ++-- modules/webapp/src/main/elm/Api.elm | 4 ++-- .../webapp/src/main/elm/Comp/ItemDetail/Update.elm | 10 ++++------ 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala b/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala index 611eacd4..d9826904 100644 --- a/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala +++ b/modules/backend/src/main/scala/docspell/backend/ops/OItem.scala @@ -24,7 +24,7 @@ import org.log4s.getLogger trait OItem[F[_]] { /** Sets the given tags (removing all existing ones). */ - def setTags(item: Ident, tagIds: List[Ident], collective: Ident): F[UpdateResult] + def setTags(item: Ident, tagIds: List[String], collective: Ident): F[UpdateResult] /** Sets tags for multiple items. The tags of the items will be * replaced with the given ones. Same as `setTags` but for multiple @@ -32,7 +32,7 @@ trait OItem[F[_]] { */ def setTagsMultipleItems( items: NonEmptyList[Ident], - tags: List[Ident], + tags: List[String], collective: Ident ): F[UpdateResult] @@ -304,19 +304,20 @@ object OItem { def setTags( item: Ident, - tagIds: List[Ident], + tagIds: List[String], collective: Ident ): F[UpdateResult] = setTagsMultipleItems(NonEmptyList.of(item), tagIds, collective) def setTagsMultipleItems( items: NonEmptyList[Ident], - tags: List[Ident], + tags: List[String], collective: Ident ): F[UpdateResult] = UpdateResult.fromUpdate(store.transact(for { - k <- RTagItem.deleteItemTags(items, collective) - res <- items.traverse(i => RTagItem.setAllTags(i, tags)) + k <- RTagItem.deleteItemTags(items, collective) + rtags <- RTag.findAllByNameOrId(tags, collective) + res <- items.traverse(i => RTagItem.setAllTags(i, rtags.map(_.tagId))) n = res.fold } yield k + n)) diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index b928b6be..e4e7b17b 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -1628,6 +1628,8 @@ paths: Update the tags associated to an item. This will remove all existing ones and sets the given tags, such that after this returns, the item has exactly the tags as given. + + Tags may be specified as names or ids. security: - authTokenHeader: [] parameters: @@ -1636,7 +1638,7 @@ paths: content: application/json: schema: - $ref: "#/components/schemas/ReferenceList" + $ref: "#/components/schemas/StringList" responses: 200: description: Ok diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala index a7422c9e..bbda6df0 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemMultiRoutes.scala @@ -59,9 +59,12 @@ object ItemMultiRoutes extends MultiIdSupport { for { json <- req.as[ItemsAndRefs] items <- readIds[F](json.items) - tags <- json.refs.traverse(readId[F]) - res <- backend.item.setTagsMultipleItems(items, tags, user.account.collective) - resp <- Ok(Conversions.basicResult(res, "Tags updated")) + res <- backend.item.setTagsMultipleItems( + items, + json.refs, + user.account.collective + ) + resp <- Ok(Conversions.basicResult(res, "Tags updated")) } yield resp case req @ POST -> Root / "tags" => diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala index 8a30f930..7e677c66 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala @@ -146,8 +146,8 @@ object ItemRoutes { case req @ PUT -> Root / Ident(id) / "tags" => for { - tags <- req.as[ReferenceList].map(_.items) - res <- backend.item.setTags(id, tags.map(_.id), user.account.collective) + tags <- req.as[StringList].map(_.items) + res <- backend.item.setTags(id, tags, user.account.collective) resp <- Ok(Conversions.basicResult(res, "Tags updated")) } yield resp diff --git a/modules/webapp/src/main/elm/Api.elm b/modules/webapp/src/main/elm/Api.elm index 590b79a9..abba1ebc 100644 --- a/modules/webapp/src/main/elm/Api.elm +++ b/modules/webapp/src/main/elm/Api.elm @@ -1783,12 +1783,12 @@ itemDetail flags id receive = } -setTags : Flags -> String -> ReferenceList -> (Result Http.Error BasicResult -> msg) -> Cmd msg +setTags : Flags -> String -> StringList -> (Result Http.Error BasicResult -> msg) -> Cmd msg setTags flags item tags receive = Http2.authPut { url = flags.config.baseUrl ++ "/api/v1/sec/item/" ++ item ++ "/tags" , account = getAccount flags - , body = Http.jsonBody (Api.Model.ReferenceList.encode tags) + , body = Http.jsonBody (Api.Model.StringList.encode tags) , expect = Http.expectJson receive Api.Model.BasicResult.decoder } diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm index 6e9ebe1f..5697907b 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm @@ -19,11 +19,9 @@ import Api.Model.MoveAttachment exposing (MoveAttachment) import Api.Model.OptionalDate exposing (OptionalDate) import Api.Model.OptionalId exposing (OptionalId) import Api.Model.OptionalText exposing (OptionalText) -import Api.Model.ReferenceList exposing (ReferenceList) -import Api.Model.Tag exposing (Tag) +import Api.Model.StringList exposing (StringList) import Browser.Navigation as Nav import Comp.AttachmentMeta -import Comp.ConfirmModal import Comp.CustomFieldMultiInput import Comp.DatePicker import Comp.DetailEdit @@ -1628,8 +1626,8 @@ saveTags flags model = tags = Comp.Dropdown.getSelected model.tagModel |> Util.List.distinct - |> List.map (\t -> IdName t.id t.name) - |> ReferenceList + |> List.map (\t -> t.id) + |> StringList in Api.setTags flags model.item.id tags SaveResp @@ -1762,7 +1760,7 @@ resetField : Flags -> String -> (Field -> Result Http.Error BasicResult -> msg) resetField flags item tagger field = case field of Data.Fields.Tag -> - Api.setTags flags item Api.Model.ReferenceList.empty (tagger Data.Fields.Tag) + Api.setTags flags item Api.Model.StringList.empty (tagger Data.Fields.Tag) Data.Fields.Folder -> Api.setFolder flags item Api.Model.OptionalId.empty (tagger Data.Fields.Folder) From 3483dfe32e44fff05465747ef5d02eea2b4243d9 Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 22:00:54 +0200 Subject: [PATCH 13/46] Fix openapi doc --- modules/restapi/src/main/resources/docspell-openapi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index e4e7b17b..c34116ca 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -1674,7 +1674,7 @@ paths: $ref: "#/components/schemas/BasicResult" /sec/item/{id}/taglink: - post: + put: operationId: "sec-item-link-tags" tags: [Item] summary: Link existing tags to an item. From 9578dd2b2b1cc6ca5ed0acefc70ac4355289575d Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 22:01:09 +0200 Subject: [PATCH 14/46] Add route to remove tags for a single item --- .../src/main/resources/docspell-openapi.yml | 25 +++++++++++++++++++ .../restserver/routes/ItemRoutes.scala | 11 ++++++++ 2 files changed, 36 insertions(+) diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index c34116ca..741e101f 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -1727,6 +1727,31 @@ paths: schema: $ref: "#/components/schemas/BasicResult" + /sec/item/{id}/tagsremove: + post: + operationId: "sec-item-remove-tags" + tags: [ Item ] + summary: Remove tags from an item + description: | + Remove the given tags from the item. The tags can be specified + via ids or names. + security: + - authTokenHeader: [] + parameters: + - $ref: "#/components/parameters/id" + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/StringList" + responses: + 200: + description: Ok + content: + application/json: + schema: + $ref: "#/components/schemas/BasicResult" + /sec/item/{id}/direction: put: operationId: "sec-item-set-direction" diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala index 7e677c66..f2bec1fc 100644 --- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala +++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala @@ -173,6 +173,17 @@ object ItemRoutes { resp <- Ok(Conversions.basicResult(res, "Tags linked")) } yield resp + case req @ POST -> Root / Ident(id) / "tagsremove" => + for { + json <- req.as[StringList] + res <- backend.item.removeTagsMultipleItems( + NonEmptyList.of(id), + json.items, + user.account.collective + ) + resp <- Ok(Conversions.basicResult(res, "Tags removed")) + } yield resp + case req @ PUT -> Root / Ident(id) / "direction" => for { dir <- req.as[DirectionValue] From 7ceb11b2f3066ea44b7a8666cef01751b7279d6c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 26 Jul 2021 16:28:44 +0200 Subject: [PATCH 15/46] Update flyway-core to 7.11.4 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dcb737f7..c0468a71 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { val DoobieVersion = "1.0.0-M5" val EmilVersion = "0.10.0-M2" val FlexmarkVersion = "0.62.2" - val FlywayVersion = "7.11.3" + val FlywayVersion = "7.11.4" val Fs2Version = "3.0.6" val Fs2CronVersion = "0.7.1" val H2Version = "1.4.200" From c97d827471d68a4001aa8ec53733c1b4a30fc596 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 26 Jul 2021 18:35:43 +0200 Subject: [PATCH 16/46] Update logback-classic to 1.2.5 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c0468a71..6565add4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -26,7 +26,7 @@ object Dependencies { val KittensVersion = "2.3.2" val LevigoJbig2Version = "2.0" val Log4sVersion = "1.10.0" - val LogbackVersion = "1.2.4" + val LogbackVersion = "1.2.5" val MariaDbVersion = "2.7.3" val MUnitVersion = "0.7.27" val MUnitCatsEffectVersion = "1.0.5" From 15b15666bf069fb1b488f1cf399bf5aabb99559d Mon Sep 17 00:00:00 2001 From: eikek Date: Tue, 27 Jul 2021 17:33:13 +0200 Subject: [PATCH 17/46] Allow to use the created timestamp in item queries Refs: 925 --- .../shared/src/main/scala/docspell/query/ItemQuery.scala | 1 + .../main/scala/docspell/query/internal/AttrParser.scala | 5 ++++- .../main/scala/docspell/query/internal/Constants.scala | 2 ++ .../main/scala/docspell/query/internal/MacroParser.scala | 4 ++++ .../docspell/query/internal/SimpleExprParserTest.scala | 8 ++++++++ .../docspell/store/qb/generator/ItemQueryGenerator.scala | 2 ++ website/site/content/docs/query/_index.md | 4 +++- 7 files changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala b/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala index 918b6d33..082b6f44 100644 --- a/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala +++ b/modules/query/shared/src/main/scala/docspell/query/ItemQuery.scala @@ -53,6 +53,7 @@ object ItemQuery { case object ItemId extends StringAttr case object Date extends DateAttr case object DueDate extends DateAttr + case object CreatedDate extends DateAttr case object AttachCount extends IntAttr object Correspondent { diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala b/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala index 25b92f5a..c229702e 100644 --- a/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala +++ b/modules/query/shared/src/main/scala/docspell/query/internal/AttrParser.scala @@ -31,6 +31,9 @@ object AttrParser { val dueDate: P[Attr.DateAttr] = P.ignoreCase(C.due).as(Attr.DueDate) + val created: P[Attr.DateAttr] = + P.ignoreCase(C.created).as(Attr.CreatedDate) + val corrOrgId: P[Attr.StringAttr] = P.ignoreCase(C.corrOrgId) .as(Attr.Correspondent.OrgId) @@ -78,7 +81,7 @@ object AttrParser { attachCountAttr val dateAttr: P[Attr.DateAttr] = - P.oneOf(List(date, dueDate)) + P.oneOf(List(date, dueDate, created)) val stringAttr: P[Attr.StringAttr] = P.oneOf( diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala b/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala index 157cd9f8..d809b152 100644 --- a/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala +++ b/modules/query/shared/src/main/scala/docspell/query/internal/Constants.scala @@ -23,6 +23,8 @@ object Constants { val corrOrgName = "corr.org.name" val corrPersId = "corr.pers.id" val corrPersName = "corr.pers.name" + val created = "created" + val createdIn = "createdIn" val customField = "f" val customFieldId = "f.id" val date = "date" diff --git a/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala b/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala index d9c8290e..77a2a7b8 100644 --- a/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala +++ b/modules/query/shared/src/main/scala/docspell/query/internal/MacroParser.scala @@ -35,6 +35,9 @@ object MacroParser { val dueDateRangeMacro: P[Expr.DateRangeMacro] = dateRangeMacroImpl(C.dueIn, Attr.DueDate) + val createdDateRangeMacro: P[Expr.DateRangeMacro] = + dateRangeMacroImpl(C.createdIn, Attr.CreatedDate) + val yearDateMacro: P[Expr.YearMacro] = yearMacroImpl(C.year, Attr.Date) @@ -52,6 +55,7 @@ object MacroParser { namesMacro, dateRangeMacro, dueDateRangeMacro, + createdDateRangeMacro, yearDateMacro, corrMacro, concMacro diff --git a/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala b/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala index 00c7dd7f..bc18949a 100644 --- a/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala +++ b/modules/query/shared/src/test/scala/docspell/query/internal/SimpleExprParserTest.scala @@ -56,6 +56,14 @@ class SimpleExprParserTest extends FunSuite with ValueHelper { p.parseAll("due<2021-03-14"), Right(dateExpr(Operator.Lt, Attr.DueDate, ld(2021, 3, 14))) ) + assertEquals( + p.parseAll("created:2021-03-14"), + Right(dateExpr(Operator.Like, Attr.CreatedDate, ld(2021, 3, 14))) + ) + assertEquals( + p.parseAll("created<2021-03-14"), + Right(dateExpr(Operator.Lt, Attr.CreatedDate, ld(2021, 3, 14))) + ) assertEquals( p.parseAll("due~=2021-03-14,2021-03-13"), Right(Expr.InDateExpr(Attr.DueDate, Nel.of(ld(2021, 3, 14), ld(2021, 3, 13)))) diff --git a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala index 4e356ae2..84d36d1f 100644 --- a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala +++ b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala @@ -228,6 +228,8 @@ object ItemQueryGenerator { coalesce(tables.item.itemDate.s, tables.item.created.s).s case Attr.DueDate => tables.item.dueDate.s + case Attr.CreatedDate => + tables.item.created.s } private def stringColumn(tables: Tables)(attr: Attr.StringAttr): Column[String] = diff --git a/website/site/content/docs/query/_index.md b/website/site/content/docs/query/_index.md index 83c3a6e6..db17043a 100644 --- a/website/site/content/docs/query/_index.md +++ b/website/site/content/docs/query/_index.md @@ -88,6 +88,7 @@ These fields map to at most one value: - `id` the item id - `date` the item date - `due` the due date of the item +- `created` the date when the item was created - `attach.count` the number of attachments of the item - `corr.org.id` the id of the correspondent organization - `corr.org.name` the name of the correspondent organization @@ -124,6 +125,7 @@ Other special fields: - `f.id` for referencing custom fields by their id - `dateIn` a shortcut for a range search - `dueIn` a shortcut for a range search +- `createdIn` a shortcut for a range search - `exist` check if some porperty exists - `names` a shortcut to search in several names via `:` - `year` a shortcut for a year range @@ -469,7 +471,7 @@ attach.id=5YjdnuTAdKJ-V6ofWTYsqKV-mAwB5aXTNWE-FAbeRU58qLb Shortcuts are only a short form of a longer query and are provided for convenience. The following exist: -- `dateIn` and `dueIn` +- `dateIn`, `dueIn` and `createdIn` - `year` - `names` - `conc` From 09b224b07a10560466f3e1ab30daf3236f45b4f0 Mon Sep 17 00:00:00 2001 From: eikek Date: Tue, 27 Jul 2021 18:10:18 +0200 Subject: [PATCH 18/46] Left align item separator and make it more prominent Refs: #950 --- modules/webapp/src/main/elm/Comp/ItemCardList.elm | 10 +++++----- modules/webapp/src/main/elm/Styles.elm | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/ItemCardList.elm b/modules/webapp/src/main/elm/Comp/ItemCardList.elm index 4be8d40f..7c7cc19d 100644 --- a/modules/webapp/src/main/elm/Comp/ItemCardList.elm +++ b/modules/webapp/src/main/elm/Comp/ItemCardList.elm @@ -179,13 +179,13 @@ viewGroup2 : Texts -> Model -> ViewConfig -> UiSettings -> ItemLightGroup -> Htm viewGroup2 texts model cfg settings group = div [ class "ds-item-group" ] [ div - [ class "flex py-0 mt-2 flex flex-row items-center" - , class "bg-white dark:bg-bluegray-800 text-lg z-35" + [ class "flex py-1 mt-2 mb-2 flex flex-row items-center" + , class "bg-white dark:bg-bluegray-800 text-xl font-bold z-35" , class "relative sticky top-10" ] [ hr - [ class S.border - , class "flex-grow" + [ class S.border2 + , class "w-16" ] [] , div [ class "px-6" ] @@ -195,7 +195,7 @@ viewGroup2 texts model cfg settings group = ] ] , hr - [ class S.border + [ class S.border2 , class "flex-grow" ] [] diff --git a/modules/webapp/src/main/elm/Styles.elm b/modules/webapp/src/main/elm/Styles.elm index 9fa740b6..f08a3d15 100644 --- a/modules/webapp/src/main/elm/Styles.elm +++ b/modules/webapp/src/main/elm/Styles.elm @@ -298,6 +298,11 @@ border = " border dark:border-bluegray-600 " +border2 : String +border2 = + " border-2 dark:border-bluegray-600 " + + header1 : String header1 = " text-3xl mt-3 mb-5 font-semibold tracking-wide break-all" From f994d4b2488e64668ee064676f8c6469d9ccc1be Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 28 Jul 2021 20:05:38 +0200 Subject: [PATCH 19/46] Add japanese document language --- docker/dockerfiles/joex.dockerfile | 1 + .../docspell/analysis/date/DateFind.scala | 3 ++- .../docspell/analysis/date/MonthName.scala | 17 +++++++++++++ .../docspell/analysis/date/DateFindSpec.scala | 25 +++++++++++++++++++ .../main/scala/docspell/common/Language.scala | 8 +++++- modules/webapp/src/main/elm/Data/Language.elm | 8 ++++++ .../src/main/elm/Messages/Data/Language.elm | 6 +++++ 7 files changed, 66 insertions(+), 2 deletions(-) diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile index 130f7c30..a75de16c 100644 --- a/docker/dockerfiles/joex.dockerfile +++ b/docker/dockerfiles/joex.dockerfile @@ -29,6 +29,7 @@ RUN JDKPKG="openjdk11"; \ tesseract-ocr-data-rus \ tesseract-ocr-data-ron \ tesseract-ocr-data-lav \ + tesseract-ocr-data-jpn \ unpaper \ wkhtmltopdf \ libreoffice \ diff --git a/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala b/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala index 038dba08..ebb7ad7a 100644 --- a/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala +++ b/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala @@ -22,7 +22,7 @@ object DateFind { def findDates(text: String, lang: Language): Stream[Pure, NerDateLabel] = TextSplitter - .splitToken(text, " \t.,\n\r/".toSet) + .splitToken(text, " \t.,\n\r/年月日".toSet) .filter(w => lang != Language.Latvian || w.value != "gada") .sliding(3) .filter(_.size == 3) @@ -89,6 +89,7 @@ object DateFind { case Language.Swedish => ymd.or(dmy).or(mdy) case Language.Dutch => dmy.or(ymd).or(mdy) case Language.Latvian => dmy.or(lavLong).or(ymd) + case Language.Japanese => ymd } p.read(parts) match { case Result.Success(sds, _) => diff --git a/modules/analysis/src/main/scala/docspell/analysis/date/MonthName.scala b/modules/analysis/src/main/scala/docspell/analysis/date/MonthName.scala index 8a5852d0..37b16852 100644 --- a/modules/analysis/src/main/scala/docspell/analysis/date/MonthName.scala +++ b/modules/analysis/src/main/scala/docspell/analysis/date/MonthName.scala @@ -50,6 +50,8 @@ object MonthName { russian case Language.Latvian => latvian + case Language.Japanese => + japanese } private val numbers = List( @@ -290,4 +292,19 @@ object MonthName { List("novembris", "nov."), List("decembris", "dec.") ) + + private val japanese = List( + List("1", "一"), + List("2", "二"), + List("3", "三"), + List("4", "四"), + List("5", "五"), + List("6", "六"), + List("7", "七"), + List("8", "八"), + List("9", "九"), + List("10", "十"), + List("11", "十一"), + List("12", "十二") + ) } diff --git a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala index 7784fd2f..f7109b70 100644 --- a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala +++ b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala @@ -143,4 +143,29 @@ class DateFindSpec extends FunSuite { ) } + test("find japanese dates") { + assertEquals( + DateFind + .findDates("some text in japanese 2021.7.21 and more", Language.Japanese) + .toVector, + Vector( + NerDateLabel( + LocalDate.of(2021, 7, 21), + NerLabel("2021.7.21", NerTag.Date, 22, 31) + ) + ) + ) + assertEquals( + DateFind + .findDates("some text in japanese 2021年7月21日 and more", Language.Japanese) + .toVector, + Vector( + NerDateLabel( + LocalDate.of(2021, 7, 21), + NerLabel("2021年7月21", NerTag.Date, 22, 31) + ) + ) + ) + } + } diff --git a/modules/common/src/main/scala/docspell/common/Language.scala b/modules/common/src/main/scala/docspell/common/Language.scala index a3e012fa..d46aba3a 100644 --- a/modules/common/src/main/scala/docspell/common/Language.scala +++ b/modules/common/src/main/scala/docspell/common/Language.scala @@ -108,6 +108,11 @@ object Language { val iso3 = "lav" } + case object Japanese extends Language { + val iso2 = "ja" + val iso3 = "jpn" + } + val all: List[Language] = List( German, @@ -124,7 +129,8 @@ object Language { Swedish, Russian, Romanian, - Latvian + Latvian, + Japanese ) def fromString(str: String): Either[String, Language] = { diff --git a/modules/webapp/src/main/elm/Data/Language.elm b/modules/webapp/src/main/elm/Data/Language.elm index 94b8a033..41522878 100644 --- a/modules/webapp/src/main/elm/Data/Language.elm +++ b/modules/webapp/src/main/elm/Data/Language.elm @@ -29,6 +29,7 @@ type Language | Romanian | Dutch | Latvian + | Japanese fromString : String -> Maybe Language @@ -78,6 +79,9 @@ fromString str = else if str == "lav" || str == "lv" || str == "latvian" then Just Latvian + else if str == "jpn" || str == "ja" || str == "japanese" then + Just Japanese + else Nothing @@ -130,6 +134,9 @@ toIso3 lang = Latvian -> "lav" + Japanese -> + "jpn" + all : List Language all = @@ -148,4 +155,5 @@ all = , Russian , Romanian , Latvian + , Japanese ] diff --git a/modules/webapp/src/main/elm/Messages/Data/Language.elm b/modules/webapp/src/main/elm/Messages/Data/Language.elm index 3f66c7f6..60070c56 100644 --- a/modules/webapp/src/main/elm/Messages/Data/Language.elm +++ b/modules/webapp/src/main/elm/Messages/Data/Language.elm @@ -61,6 +61,9 @@ gb lang = Latvian -> "Latvian" + Japanese -> + "Japanese" + de : Language -> String de lang = @@ -109,3 +112,6 @@ de lang = Latvian -> "Lettisch" + + Japanese -> + "Japanisch" From 119a4ffdc95677756f774d6a58c0dd3475845932 Mon Sep 17 00:00:00 2001 From: wallace11 <11wallace11@gmail.com> Date: Thu, 29 Jul 2021 01:08:48 +0300 Subject: [PATCH 20/46] Update Japanese tests with more sensible data --- .../src/test/scala/docspell/analysis/date/DateFindSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala index f7109b70..48a5ed1d 100644 --- a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala +++ b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala @@ -146,7 +146,7 @@ class DateFindSpec extends FunSuite { test("find japanese dates") { assertEquals( DateFind - .findDates("some text in japanese 2021.7.21 and more", Language.Japanese) + .findDates("今日の日付は2021.7.21です。", Language.Japanese) .toVector, Vector( NerDateLabel( @@ -157,7 +157,7 @@ class DateFindSpec extends FunSuite { ) assertEquals( DateFind - .findDates("some text in japanese 2021年7月21日 and more", Language.Japanese) + .findDates("今日の日付は2021年7月21日です。", Language.Japanese) .toVector, Vector( NerDateLabel( From 1095a7d56f7b870831f2a465259665b27c873090 Mon Sep 17 00:00:00 2001 From: wallace11 <11wallace11@gmail.com> Date: Thu, 29 Jul 2021 01:13:22 +0300 Subject: [PATCH 21/46] Add another Japanese test --- .../scala/docspell/analysis/date/DateFindSpec.scala | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala index 48a5ed1d..4ba026f1 100644 --- a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala +++ b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala @@ -166,6 +166,17 @@ class DateFindSpec extends FunSuite { ) ) ) + assertEquals( + DateFind + .findDates("年月日2021年7月21日（日）", Language.Japanese) + .toVector, + Vector( + NerDateLabel( + LocalDate.of(2021, 7, 21), + NerLabel("2021年7月21", NerTag.Date, 22, 31) + ) + ) + ) } } From e8348e2809cd69542e47eafca16f6e7913ae88bd Mon Sep 17 00:00:00 2001 From: wallace <11wallace11@gmail.com> Date: Thu, 29 Jul 2021 02:08:48 +0300 Subject: [PATCH 22/46] Remove excessive spaces --- .../src/test/scala/docspell/analysis/date/DateFindSpec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala index 4ba026f1..07a09a4c 100644 --- a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala +++ b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala @@ -176,7 +176,7 @@ class DateFindSpec extends FunSuite { NerLabel("2021年7月21", NerTag.Date, 22, 31) ) ) - ) + ) } } From 4af8dd0950e949b9e142123dbf3915b048075fdd Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 01:35:15 +0200 Subject: [PATCH 23/46] Preprocess japanese texts to find dates Not very efficient, but should work to find the position of dates in japanese text. --- .../docspell/analysis/date/DateFind.scala | 18 +++++++++++++++--- .../docspell/analysis/date/DateFindSpec.scala | 6 +++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala b/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala index ebb7ad7a..4d90324e 100644 --- a/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala +++ b/modules/analysis/src/main/scala/docspell/analysis/date/DateFind.scala @@ -21,9 +21,7 @@ import docspell.common._ object DateFind { def findDates(text: String, lang: Language): Stream[Pure, NerDateLabel] = - TextSplitter - .splitToken(text, " \t.,\n\r/年月日".toSet) - .filter(w => lang != Language.Latvian || w.value != "gada") + splitWords(text, lang) .sliding(3) .filter(_.size == 3) .flatMap(q => @@ -44,6 +42,20 @@ object DateFind { ) ) + private[this] val jpnChars = + ("年月日" + MonthName.getAll(Language.Japanese).map(_.mkString).mkString).toSet + + private def splitWords(text: String, lang: Language): Stream[Pure, Word] = { + val stext = + if (lang == Language.Japanese) { + text.map(c => if (jpnChars.contains(c)) c else ' ') + } else text + + TextSplitter + .splitToken(stext, " \t.,\n\r/年月日".toSet) + .filter(w => lang != Language.Latvian || w.value != "gada") + } + case class SimpleDate(year: Int, month: Int, day: Int) { def toLocalDate: LocalDate = LocalDate.of(if (year < 100) 2000 + year else year, month, day) diff --git a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala index 07a09a4c..a41eb6d3 100644 --- a/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala +++ b/modules/analysis/src/test/scala/docspell/analysis/date/DateFindSpec.scala @@ -151,7 +151,7 @@ class DateFindSpec extends FunSuite { Vector( NerDateLabel( LocalDate.of(2021, 7, 21), - NerLabel("2021.7.21", NerTag.Date, 22, 31) + NerLabel("2021.7.21", NerTag.Date, 6, 15) ) ) ) @@ -162,7 +162,7 @@ class DateFindSpec extends FunSuite { Vector( NerDateLabel( LocalDate.of(2021, 7, 21), - NerLabel("2021年7月21", NerTag.Date, 22, 31) + NerLabel("2021年7月21", NerTag.Date, 6, 15) ) ) ) @@ -173,7 +173,7 @@ class DateFindSpec extends FunSuite { Vector( NerDateLabel( LocalDate.of(2021, 7, 21), - NerLabel("2021年7月21", NerTag.Date, 22, 31) + NerLabel("2021年7月21", NerTag.Date, 3, 12) ) ) ) From b01cb7715e987076cc67d91f334e0449c2b26a1b Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 19 Jul 2021 01:39:00 +0200 Subject: [PATCH 24/46] Add documentation for the cli tool --- tools/webextension/native/native.py | 10 +- website/site/content/docs/api/upload.md | 9 +- website/site/content/docs/features/_index.md | 1 + website/site/content/docs/install/docker.md | 50 ++-- .../site/content/docs/install/download_run.md | 6 +- website/site/content/docs/install/nix.md | 6 +- .../site/content/docs/joex/file-processing.md | 4 +- website/site/content/docs/tools/_index.md | 2 +- website/site/content/docs/tools/browserext.md | 20 +- website/site/content/docs/tools/cli.md | 266 ++++++++++++++++++ .../content/docs/tools/consumedir-cleaner.md | 10 +- website/site/content/docs/tools/consumedir.md | 11 +- .../content/docs/tools/convert-all-pdf.md | 12 +- website/site/content/docs/tools/ds.md | 11 +- .../content/docs/tools/regenerate-previews.md | 10 +- .../site/content/docs/tools/reset-password.md | 12 +- website/site/content/docs/webapp/uploading.md | 4 +- .../site/templates/shortcodes/infobubble.html | 2 +- 18 files changed, 383 insertions(+), 63 deletions(-) create mode 100644 website/site/content/docs/tools/cli.md diff --git a/tools/webextension/native/native.py b/tools/webextension/native/native.py index bb3f5300..b8bd0941 100755 --- a/tools/webextension/native/native.py +++ b/tools/webextension/native/native.py @@ -7,13 +7,13 @@ import os from os.path import expanduser import subprocess -# The path to the ds.sh tool. +# The path to the dsc tool. try: home = expanduser("~") - with open(home + '/.config/docspell/ds.cmd', 'r') as file: - DS_SH_CMD = file.read().replace('\n', '') + with open(home + '/.config/docspell/dsc.cmd', 'r') as file: + DSC_CMD = file.read().replace('\n', '') except: - DS_SH_CMD="ds.sh" + DSC_SH_CMD="dsc" # Read a message from stdin and decode it. @@ -43,7 +43,7 @@ def send_message(encoded_message): while True: filename = get_message() FNULL = open(os.devnull, 'w') - rc = subprocess.call(args=[DS_SH_CMD, filename], stdout=FNULL, stderr=FNULL, close_fds=True) + rc = subprocess.call(args=[DSC_CMD, "upload", "--delete", filename], stdout=FNULL, stderr=FNULL, close_fds=True) os.remove(filename) if rc == 0: send_message(encode_message(rc)) diff --git a/website/site/content/docs/api/upload.md b/website/site/content/docs/api/upload.md index 007b86a4..34eda0e9 100644 --- a/website/site/content/docs/api/upload.md +++ b/website/site/content/docs/api/upload.md @@ -94,8 +94,8 @@ specified via a JSON structure in a part with name `meta`: # Endpoints -Docspell needs to the collective that owns the files. There are the -following ways for this. +Docspell needs to know the collective that owns the files. There are +the following ways for this. ## Authenticated User @@ -160,5 +160,6 @@ checksum with: /api/v1/open/integration/checkfile/[collective-name]/[sha256-checksum] ``` -See the [SMTP gateway](@/docs/tools/smtpgateway.md) or the [consumedir -script](@/docs/tools/consumedir.md) for examples to use this endpoint. +See the [SMTP gateway](@/docs/tools/smtpgateway.md) or the [dsc +watch/upload](@/docs/tools/cli.md#docker) command for example can use +this endpoint. diff --git a/website/site/content/docs/features/_index.md b/website/site/content/docs/features/_index.md index 5a3497d5..bf3eab03 100644 --- a/website/site/content/docs/features/_index.md +++ b/website/site/content/docs/features/_index.md @@ -87,3 +87,4 @@ considering docspell at the moment. - Documents cannot be modified. - You can remove and add documents but there is no versioning. +- There are no user/groups nor permission management diff --git a/website/site/content/docs/install/docker.md b/website/site/content/docs/install/docker.md index 790929a1..4dcd6ee9 100644 --- a/website/site/content/docs/install/docker.md +++ b/website/site/content/docs/install/docker.md @@ -18,15 +18,16 @@ There are images for all components that are available from the github release page. The images contain all the necessary [prerequisites](@/docs/install/prereq.md). -- `docspell-restserver` this images contains the http server -- `docspell-joex` this image contains the job executor and all +- `docspell/restserver` this images contains the http server +- `docspell/joex` this image contains the job executor and all required software (ocrmypdf, unoconv etc) mentioned in [prerequisites](@/docs/install/prereq.md). -- `docspell-tools` this image simply contains all the scripts from the - `tools/` folder. They are installed into a location in `$PATH`. It - doesn't specify a `CMD` or `ENTRYPOINT`, so you must choose which - script to run. The scripts are all prefixed by `ds-`. So to run the - `consumedir.sh` script, execute `ds-consumedir`. +- `docspell/dsc` this is an image containing a + [cli](@/docs/tools/cli.md) for docspell that can be used to watch + directories for new files. It doesn't specify a `CMD` or + `ENTRYPOINT`, so you must specify the exact command to run. Here, it + is used to watch a directory for uploading files. This runs the `dsc + watch` command. ### Examples @@ -90,20 +91,20 @@ After this `docker ps` should show these two containers. Go to When signing up, use the same name for collective and user and then login with this name. -For the last part, we use the `docspell/tools` image to create another +For the last part, we use the `docspell/dsc` image to create another container that watches a directory and pushes files to docspell. ``` bash $ docker run -d --name ds-consume \ --network dsnet --ip 10.4.3.4 \ -v /tmp/inbox:/var/inbox \ - docspell/tools:latest ds-consumedir -imdv --iheader "Docspell-Integration:test123" \ - --path /var/inbox "http://10.4.3.3:7880/api/v1/open/integration/item" + docspell/dsc:latest dsc -v -d http://10.4.3.3:7880 watch -r --delete -i \ + --header "Docspell-Integration:test123" /var/inbox ``` -This starts the [consumedir](@/docs/tools/consumedir.md) script that -watches a directory and uploads arriving files to docspell server. -This requires the value from the `integration-endpoint` setting to be +This starts the [dsc](@/docs/tools/cli.md) tool that watches a +directory and uploads arriving files to the docspell server. This +requires the value from the `integration-endpoint` setting to be allowed to upload files. It also requires you to explicitely enable this: go to *Collective Profile → Settings* and enable the *Integration Endpoint*. Then create a subdirectory in `/tmp/inbox` @@ -111,11 +112,14 @@ with the name of the *collective* that you registered and place a file into the `/tmp/inbox/[collective]` directory. The file is pushed to docspell and processed shortly after. -To see all available options, run the script with the `--help` option: +To see all available options, run `dsc` with the `--help` option: ``` bash -$ docker run docspell/tools:latest ds-consumedir --help +$ docker run docspell/dsc:latest dsc --help ``` +Or just [download the +binary](https://github.com/docspell/dsc/releases/latest), no docker +required. Note that this is just an example and is only to demonstrate how to use the docker images. For instance, this setup does not provide @@ -127,9 +131,9 @@ below. There is a [docker-compose](https://docs.docker.com/compose/) setup available in the `/docker/docker-compose` folder. This setup is -similiar to the example above, adding fulltext search and a PostgreSQL -database by using just one command. It's only a few steps to get -started. +similiar to the example above, but adding fulltext search and a +PostgreSQL database by using just one command. It's only a few steps +to get started. ### Start Docspell #### 1. Get the docker-compose files @@ -172,10 +176,12 @@ $ export DOCSPELL_HEADER_VALUE="my-secret-123" $ docker-compose up ``` -The environment variable defines a secret that is shared between some -containers. You can define whatever you like. Please see the -[consumedir.sh](@/docs/tools/consumedir.md#docker) docs for additional -info. +The environment variable defines a secret that is shared between the +container watching a directory and the server. It is the header +defined for the [integration +endpoint](@/docs/api/upload.md#integration-endpoint) containers. You +can use whatever you like. Please see the help to the [dsc +tool](@/docs/tools/cli.md) docs for additional info. Goto `http://localhost:7880`, signup and login. When signing up, you choose the same name for collective and user. Then login with this diff --git a/website/site/content/docs/install/download_run.md b/website/site/content/docs/install/download_run.md index 5ec930cc..03d82577 100644 --- a/website/site/content/docs/install/download_run.md +++ b/website/site/content/docs/install/download_run.md @@ -116,6 +116,6 @@ page](@/docs/configure/_index.md#full-text-search-solr). ### Watching a directory -The [consumedir](@/docs/tools/consumedir.md) script can be used for -this. Using systemd or something similar, it is possible to create a -system service that runs the script in "watch mode". +The [dsc](@/docs/tools/cli.md) tool with the `watch` subcommand can be +used for this. Using systemd or something similar, it is possible to +create a system service that runs the script in "watch mode". diff --git a/website/site/content/docs/install/nix.md b/website/site/content/docs/install/nix.md index 426cfee4..a60c24c3 100644 --- a/website/site/content/docs/install/nix.md +++ b/website/site/content/docs/install/nix.md @@ -84,8 +84,8 @@ There are the following modules provided: - joex - consumedir -The `consumedir` module defines a systemd unit that starts the -`consumedir.sh` script to watch one or more directories for new files. +The `consumedir` module defines a systemd unit that starts the `dsc +watch` command to watch one or more directories for new files. You need to import the `release.nix` file as described above in your `configuration.nix` and then append the docspell module to your list of @@ -125,7 +125,7 @@ in services.docspell-consumedir = { enable = true; watchDirs = ["/tmp/test"]; - urls = ["http://localhost:7880/api/v1/open/upload/item/the-source-id"]; + source-id = "the-source-id"; }; ... diff --git a/website/site/content/docs/joex/file-processing.md b/website/site/content/docs/joex/file-processing.md index 92e9db7f..5ab0e0b1 100644 --- a/website/site/content/docs/joex/file-processing.md +++ b/website/site/content/docs/joex/file-processing.md @@ -323,8 +323,8 @@ docspell.joex { When this is changed, you must re-generate all preview images. Check the api for this, there is an endpoint to regenerate all preview -images for a collective. There is also a bash script provided in the -`tools/` directory that can be used to call this endpoint. +images for a collective. The [cli tool](../../tools/cli/) can be +used for this. {% end %} diff --git a/website/site/content/docs/tools/_index.md b/website/site/content/docs/tools/_index.md index 4627f68a..d4793cda 100644 --- a/website/site/content/docs/tools/_index.md +++ b/website/site/content/docs/tools/_index.md @@ -4,7 +4,7 @@ description = "There are several tools distributed with docspell, like a program weight = 60 insert_anchor_links = "right" template = "pages.html" -redirect_to = "docs/tools/ds" +redirect_to = "docs/tools/cli/" sort_by = "weight" [extra] mktoc = false diff --git a/website/site/content/docs/tools/browserext.md b/website/site/content/docs/tools/browserext.md index 7560df2b..058c06b8 100644 --- a/website/site/content/docs/tools/browserext.md +++ b/website/site/content/docs/tools/browserext.md @@ -13,10 +13,10 @@ firefox. Installation is a bit complicated, since you need to install external tools and the web extension. Both work together. -# Install `ds.sh` +# Install `dsc` -First copy the `ds.sh` tool somewhere in your `PATH`, maybe -`/usr/local/bin` as described above. +First copy the [dsc](@/docs/tools/cli.md) tool somewhere in your +`PATH`, maybe `/usr/local/bin`. # Install the native part @@ -44,10 +44,14 @@ for details. And you might want to modify this json file, so the path to the `native.py` script is correct (it must be absolute). -If the `ds.sh` script is in your `$PATH`, then this should -work. Otherwise, edit the `native.py` script and change the path to -the tool. Or create a file `$HOME/.config/docspell/ds.cmd` whose -content is the path to the `ds.sh` script. +If the `dsc` tool is in your `$PATH`, then this should work. You need +to provide a default source id in your `~/.config/dsc/config.toml` so +that the upload command can be used without further arguments. + +Otherwise, edit the `native.py` script and change the path to the tool +and/or the arguments. Or create a file +`$HOME/.config/docspell/dsc.cmd` whose content is the path to the +`dsc` tool. # Install the extension @@ -73,7 +77,7 @@ alternatives: When you right click on a file link, there should be a context menu entry *'Docspell Upload Helper'*. The add-on will download this file using the browser and then send the file path to the `native.py` -script. This script will in turn call `ds.sh` which finally uploads it +script. This script will in turn call `dsc` which finally uploads it to your configured URLs. Open the Add-ons page (`Ctrl`+`Shift`+`A`), the new add-on should be diff --git a/website/site/content/docs/tools/cli.md b/website/site/content/docs/tools/cli.md new file mode 100644 index 00000000..d52b2bd5 --- /dev/null +++ b/website/site/content/docs/tools/cli.md @@ -0,0 +1,266 @@ ++++ +title = "CLI" +description = "A command line interface to." +weight = 5 ++++ + +# Introduction + +The **d**oc**s**pell **c**lient, short +[dsc](https://github.com/docspell/dsc), is a tool to use +docspell through the command line. It is also aims to be useful for +your own scripts and programs. + +It is supposed to replace most of the shell scripts from the `tools/` +directory. + +It is a work in progress; eventually most of the +[api](@/docs/api/_index.md) will be covered. + +# Usage + +Download the binary for your architecture from the [release +page](https://github.com/docspell/dsc/releases/latest) and rename it +to `dsc`. Then run `dsc help` to see an overview of all commands. The +help of each command is available via `dsc help [command]` or `dsc +[command] --help`. + + +There are docker images at +[dockerhub](https://hub.docker.com/repository/docker/docspell/dsc), +but it's usually easier to just download the binary. They should work +on most systems without additional setups. + +Below are some quick infos to get started, please see [the project +page](https://github.com/docspell/dsc) for more info. + + +## Configuration + +A configuration file can be used to have some predefined settings, for +example the docspell url, the admin secret etc. They can be overriden +by specifying them as options. + +The config looks like this: + +``` toml +docspell_url = "http://localhost:7880" +default_format = "Tabular" +admin_secret = "admin123" +default_account = "demo" +pdf_viewer = ["zathura", "{}"] +#pass_entry = "my/entry" +``` + +For linuxes, the default location is `~/.config/dsc/config.toml`. You +can give a config file explicitly via an option or the environment +variable `DSC_CONFIG`. + +If you use the [pass](https://passwordstore.org) password manager, you +can add your password entry to the config file as well. + +## Output format + +The "output format" defines how the information is printed on screen. +The default output format is `Tabular` which prints a simple table. +This table can also be formatted as CSV using `csv` as output format. +These two modes are intended for humans and they may not present all +information available. + +Alternatively, there is `json` and `lisp` as output format. These are +intended for machine consumption. They always contain all information. +If you look for some detail, use for example `json` to get all data in +a structured form. On the shell you can use the awesome tool +[jq](https://stedolan.github.io/jq/) to get exactly what you want. + +## Login + +Many tasks require to be logged in. This can be done via the `login` +subcommand. You can specify account and password or fallback to the +values in the config file. + +Once logged in, the session token will be saved to the filesystem +(next to the config file) and is used for subsequent commands. It is +renewed if expiry is near. If you don't issue any commands for a while +you need to `login` again. + +# Use Cases / Examples + + +## Uploads files + +The `upload` subcommand can uploads files to docspell. This is the +replacement for the `ds.sh` shell script. + +You can specify a list of files that are all being uploaded. This +command doesn't require to be logged in, it can also upload via a +[source id](@/docs/webapp/uploading.md#anonymous-upload) or via the +[integration endpoint](@/docs/api/upload.md#integration-endpoint). + +A source id can be given in the config file, then there are no +additional options required. The simplest form is this: + +``` shell +❯ dsc upload *.pdf +File already in Docspell: article-velo.pdf +Adding to request: test-ocr.pdf +Sending request … +┌─────────┬──────────────────┐ +│ success │ message │ +├─────────┼──────────────────┤ +│ true │ Files submitted. │ +└─────────┴──────────────────┘ +``` + +By default, duplicate files are detected and not uploaded. This +uploads all files in one single request. By default, each file results +in one item. Using `--single-item` all files can be put into one item. + +It is possible to specify certain metadata, like tags or a folder, +that is then attached to the resulting item. + + +## Upload by traversing a directory + +The above use case was about uploading files. Using the `upload` +subcommand with the `--traverse` option, you can traverse directories +and upload all files in them. In this mode, each file will be uploaded +in a separate request, so the `--single-item` option cannot be used. + +There are options to exclude/include files based on a [glob +pattern](https://docs.rs/glob/0.3.0/glob/struct.Pattern.html). + +``` shell +❯ dsc upload --traverse . +File already in Docspell: article-velo.pdf +File already in Docspell: demo/dirc/scan.21-03-12.15-50-54.pdf +File already in Docspell: demo/dirc/test-stamp.pdf +File already in Docspell: demo/letter-de.pdf +Uploading eike/keywords.pdf +File already in Docspell: eike/large-file.pdf +Uploading eike/letter-en.pdf +File already in Docspell: test-ocr.pdf +┌─────────┬────────────┐ +│ success │ message │ +├─────────┼────────────┤ +│ true │ Uploaded 2 │ +└─────────┴────────────┘ +``` + + +## Watch a directory + +The `watch` subcommand can be used to watch one or more directories +and upload files when they arrive. It uses the `upload` command under +the hood and therefore most options are also available here. + +It detects file creations and skips a rename within a watched folder. +The flag `-r` or `--recursive` is required to recursively watch a +directory. + +``` shell +❯ dsc watch -r . +Watching directory (Recursive): . +Press Ctrl-C to quit. +------------------------------------------------------------------------------ +Got: /home/eike/workspace/projects/dsc/local/files/./demo/letter-de.pdf +Adding to request: /home/eike/workspace/projects/dsc/local/files/./demo/letter-de.pdf +Sending request … +Server: Files submitted. +``` + +The `--matches` option allows to define a pattern for files to include. + +If watching a directory is not possible due to system constraints +(e.g. when using NFS or SAMBA shares), a less efficient option is to +use the `upload` subcommand with `--poll` option which periodically +traverses a directory. + +## Admin commands + +These are a set of commands that simply call a route at the server to +submit a maintenance task or to reset the password of some user. These +commands require the [admin +secret](@/docs/configure/_index.md#admin-endpoint) either in the +config file or as an argument. + +Reset user password: +``` shell +❯ dsc admin reset-password --account demo +┌─────────┬──────────────┬──────────────────┐ +│ success │ new password │ message │ +├─────────┼──────────────┼──────────────────┤ +│ true │ 2q2UeCVvMYg │ Password updated │ +└─────────┴──────────────┴──────────────────┘ +``` + +Recreate fulltext index: +``` shell +❯ dsc admin --admin-secret admin123 recreate-index +┌─────────┬─────────────────────────────────────┐ +│ success │ message │ +├─────────┼─────────────────────────────────────┤ +│ true │ Full-text index will be re-created. │ +└─────────┴─────────────────────────────────────┘ +``` + +## Search for items + +The `search` command takes a [query](@/docs/query/_index.md) and +prints the results. + +``` shell +❯ dsc search 'corr:*' +┌──────────┬────────────────────────────┬───────────┬────────────┬─────┬───────────────────────────┬───────────────┬────────┬─────────────┬────────────┬───────┐ +│ id │ name │ state │ date │ due │ correspondent │ concerning │ folder │ tags │ fields │ files │ +├──────────┼────────────────────────────┼───────────┼────────────┼─────┼───────────────────────────┼───────────────┼────────┼─────────────┼────────────┼───────┤ +│ HVK7JuCF │ test-ocr.pdf │ created │ 2021-07-18 │ │ Pancake Company │ │ │ Certificate │ │ 1 │ +│ 3odNawKE │ letter-en.pdf │ confirmed │ 2021-07-18 │ │ Pancake Company │ │ │ invoice │ │ 1 │ +│ 3MA5NdhS │ large-file.pdf │ confirmed │ 2021-07-18 │ │ Axa │ │ │ Certificate │ │ 1 │ +│ HDumXkRm │ keywords.pdf │ confirmed │ 2021-07-18 │ │ Pancake Company │ │ │ invoice │ │ 1 │ +│ 733gM656 │ test-stamp.pdf │ created │ 2021-07-18 │ │ Pancake Company │ │ │ Contract │ │ 1 │ +│ 8LiciitB │ scan.21-03-12.15-50-54.pdf │ confirmed │ 2021-07-18 │ │ Supermarket │ │ │ Receipt │ CHF 89.44 │ 1 │ +│ 8nFt2z7T │ article-velo.pdf │ confirmed │ 2021-07-18 │ │ Supermarket/Rudolf Müller │ Rudolf Müller │ │ invoice │ CHF 123.11 │ 1 │ +│ kfugGdXU │ letter-de.pdf │ created │ 2021-07-18 │ │ Axa │ Rudolf Müller │ │ invoice │ │ 1 │ +└──────────┴────────────────────────────┴───────────┴────────────┴─────┴───────────────────────────┴───────────────┴────────┴─────────────┴────────────┴───────┘ +``` + +The same can be formatted as json and, for example, only print the ids: +``` shell +❯ dsc -f json search 'corr:*' | jq '.groups[].items[].id' +"HVK7JuCFt4W-qxkcwq1cWCV-dvpGo4DpZzU-Q16Xoujojas" +"3odNawKE1Ek-YJrWfPzekAq-47cjt14sexd-GK35JAEAanx" +"3MA5NdhSrbx-3JkjEpqHiyU-XyVNb15tioh-SUVjMLi1aoV" +"HDumXkRmDea-dNryjtRjk3V-ysdJmJNQGQS-UFb4DWNZJ3F" +"733gM656S4T-d4HmEgdAV6Z-9zuHAd3biKM-mBwNriZpqMB" +"8LiciitBVTi-DTmgiEUdqAJ-xXPckMvFHMc-JSiJMYvLaWh" +"8nFt2z7T9go-1qaCTTgodub-592n6gpmdNR-VRcyYAyT7qj" +"kfugGdXUGUc-mReaUnJxyUL-R44Lf7yH6RK-2JbZ1bv7dw" +``` + + +# Docker + +The provided docker-compose setup runs this script to watch a single +directory, `./docs` in current directory, for new files. If a new file +is detected, it is pushed to docspell. + +This utilizes the [integration +endpoint](@/docs/api/upload.md#integration-endpoint), which is enabled +in the config file, to allow uploading documents for all collectives. +A subfolder must be created for each registered collective. The docker +containers are configured to use http-header protection for the +integration endpoint. This requires you to provide a secret, that is +shared between the rest-server and the `dsc` tool. This can be done by +defining an environment variable which gets picked up by the +containers defined in `docker-compose.yml`: + +``` bash +export DOCSPELL_HEADER_VALUE="my-secret" +docker-compose up +``` + + +Now you can create a folder `./docs/` and place all +files in there that you want to import. Once dropped in this folder +the `consumedir` container will push it to docspell. diff --git a/website/site/content/docs/tools/consumedir-cleaner.md b/website/site/content/docs/tools/consumedir-cleaner.md index fc1a756e..2c2e3f26 100644 --- a/website/site/content/docs/tools/consumedir-cleaner.md +++ b/website/site/content/docs/tools/consumedir-cleaner.md @@ -1,9 +1,15 @@ +++ -title = "Directory Cleaner" +title = "Directory Cleaner (⊗)" description = "Clean directories from files in docspell" -weight = 32 +weight = 150 +++ +{% infobubble(mode="info", title="⚠ Please note") %} +This script is now obsolete, you can use the [**CLI tool**](../cli/) instead. + +Use the `cleanup` or the `upload` command. +{% end %} + # Introduction This script is made for cleaning up the consumption directory used for diff --git a/website/site/content/docs/tools/consumedir.md b/website/site/content/docs/tools/consumedir.md index 2fc5a5f0..db82833d 100644 --- a/website/site/content/docs/tools/consumedir.md +++ b/website/site/content/docs/tools/consumedir.md @@ -1,9 +1,16 @@ +++ -title = "Consume Directory" +title = "Consume Directory (⊗)" description = "A script to watch a directory for new files and upload them to docspell." -weight = 30 +weight = 110 +++ + +{% infobubble(mode="info", title="⚠ Please note") %} +This script is now obsolete, you can use the [**CLI tool**](../cli/) instead. + +You can use the `watch` command, or the `upload` command with `--poll`. +{% end %} + # Introduction The `consumerdir.sh` is a bash script that works in two modes: diff --git a/website/site/content/docs/tools/convert-all-pdf.md b/website/site/content/docs/tools/convert-all-pdf.md index 412c363b..9679b48f 100644 --- a/website/site/content/docs/tools/convert-all-pdf.md +++ b/website/site/content/docs/tools/convert-all-pdf.md @@ -1,9 +1,17 @@ +++ -title = "Convert All PDFs" +title = "Convert All PDFs (⊗)" description = "Convert all PDF files using OcrMyPdf." -weight = 60 +weight = 160 +++ +{% infobubble(mode="info", title="⚠ Please note") %} +This script is now obsolete, you can use the [**CLI tool**](../cli/) instead. + +Use the `convert-all-pdfs` admin command, e.g. `dsc admin +convert-all-pdfs`. +{% end %} + + # convert-all-pdf.sh With version 0.9.0 there was support added for another external tool, diff --git a/website/site/content/docs/tools/ds.md b/website/site/content/docs/tools/ds.md index e59bf842..4aa901cb 100644 --- a/website/site/content/docs/tools/ds.md +++ b/website/site/content/docs/tools/ds.md @@ -1,9 +1,16 @@ +++ -title = "Upload CLI" +title = "Upload CLI (⊗)" description = "A script to quickly upload files from the command line." -weight = 10 +weight = 100 +++ + +{% infobubble(mode="info", title="⚠ Please note") %} +This script is now obsolete, you can use the [**CLI tool**](../cli/) instead. + +Use the `upload` command (or the `up` alias), like `dsc up *.pdf`. +{% end %} + # Introduction The `tools/ds.sh` is a bash script to quickly upload files from the diff --git a/website/site/content/docs/tools/regenerate-previews.md b/website/site/content/docs/tools/regenerate-previews.md index 114f1c40..a0fb2e65 100644 --- a/website/site/content/docs/tools/regenerate-previews.md +++ b/website/site/content/docs/tools/regenerate-previews.md @@ -1,9 +1,15 @@ +++ -title = "Regenerate Preview Images" +title = "Regenerate Preview Images (⊗)" description = "Re-generates all preview images." -weight = 80 +weight = 130 +++ +{% infobubble(mode="info", title="⚠ Please note") %} +This script is now obsolete, you can use the [**CLI tool**](../cli/) instead. + +Use the `generate-previews` admin command, e.g. `dsc admin generate-previews`. +{% end %} + # regenerate-previews.sh This is a simple bash script to trigger the endpoint that submits task diff --git a/website/site/content/docs/tools/reset-password.md b/website/site/content/docs/tools/reset-password.md index 9c34b667..84aa20ec 100644 --- a/website/site/content/docs/tools/reset-password.md +++ b/website/site/content/docs/tools/reset-password.md @@ -1,9 +1,17 @@ +++ -title = "Reset Password" +title = "Reset Password (⊗)" description = "Resets a user password." -weight = 70 +weight = 120 +++ +{% infobubble(mode="info", title="⚠ Please note") %} +This script is now obsolete, you can use the [**CLI tool**](../cli/) instead. + +Use the `reset-password` admin command, e.g. `dsc admin reset-password +--account "smith/john"`, where `smith` is the collective id and `john` +the username. +{% end %} + This script can be used to reset a user password. This can be done by admins, who know the `admin-endpoint.secret` value in the diff --git a/website/site/content/docs/webapp/uploading.md b/website/site/content/docs/webapp/uploading.md index 2047a1a8..015d931f 100644 --- a/website/site/content/docs/webapp/uploading.md +++ b/website/site/content/docs/webapp/uploading.md @@ -78,8 +78,8 @@ $ curl -XPOST -F file=@test.pdf http://192.168.1.95:7880/api/v1/open/upload/item {"success":true,"message":"Files submitted."} ``` -There is a [script provided](@/docs/tools/ds.md) that uses curl to -upload files from the command line more conveniently. +There is a [cli](@/docs/tools/cli.md) to upload files from the command +line more conveniently. When files are uploaded to an source endpoint, the items resulting from this uploads are marked with the name of the source. So you know diff --git a/website/site/templates/shortcodes/infobubble.html b/website/site/templates/shortcodes/infobubble.html index b78b31d6..c2f27adf 100644 --- a/website/site/templates/shortcodes/infobubble.html +++ b/website/site/templates/shortcodes/infobubble.html @@ -1,4 +1,4 @@ -
    +

    {{ title }} From 96adde71721b6968ee1bf4b872d380ef693cc9cb Mon Sep 17 00:00:00 2001 From: eikek Date: Sun, 25 Jul 2021 00:14:34 +0200 Subject: [PATCH 25/46] Use the dsc tool for the consumedir docker container --- docker/docker-compose/docker-compose.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml index 25a6139b..7e069111 100644 --- a/docker/docker-compose/docker-compose.yml +++ b/docker/docker-compose/docker-compose.yml @@ -30,16 +30,19 @@ services: - solr consumedir: - image: docspell/tools:latest + image: docspell/dsc:nightly container_name: docspell-consumedir command: - - ds-consumedir - - "-vmdi" - - "--path" - - "/opt/docs" - - "--iheader" + - dsc + - "-vv" + - "-d" + - "http://docspell-restserver:7880" + - "watch" + - "--delete" + - "-ir" + - "--header" - "Docspell-Integration:$DOCSPELL_HEADER_VALUE" - - "http://docspell-restserver:7880/api/v1/open/integration/item" + - "/opt/docs" restart: unless-stopped env_file: ./.env volumes: From 2ae2af0752566eb600832ef4a75a18d5809d5b01 Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 26 Jul 2021 00:26:00 +0200 Subject: [PATCH 26/46] Fix feature list --- website/site/content/docs/features/_index.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/website/site/content/docs/features/_index.md b/website/site/content/docs/features/_index.md index bf3eab03..14202090 100644 --- a/website/site/content/docs/features/_index.md +++ b/website/site/content/docs/features/_index.md @@ -64,19 +64,16 @@ description = "A list of features and limitations." - [eml](https://en.wikipedia.org/wiki/Email#Filename_extensions) (e-mail files in plain text MIME) - Tooling: + - [Command Line Interface](@/docs/tools/cli.md) allowing to upload + files, watch folders and many more! - [Android App](@/docs/tools/android.md) to quickly upload files from your android devices - - [Watch a folder](@/docs/tools/consumedir.md): watch folders for - changes and send files to docspell - - [Simple CLI for uploading files](@/docs/tools/ds.md) - [Firefox plugin](@/docs/tools/browserext.md): right click on a link and send the file to docspell - [SMTP Gateway](@/docs/tools/smtpgateway.md): Setup a SMTP server that delivers mails directly to docspell. - [Paperless Import](@/docs/tools/paperless-import.md) for importing your data from paperless - - [Directory Cleaner](@/docs/tools/consumedir-cleaner.md) clean - directories with files that have been uploaded to docspell - License: GPLv3 From 29b8b5e9c7aa559bcd5c512a707d4bb9660e8f6f Mon Sep 17 00:00:00 2001 From: eikek Date: Tue, 27 Jul 2021 00:12:14 +0200 Subject: [PATCH 27/46] Add docs about export command and deprecate export shell script --- website/site/content/docs/tools/cli.md | 112 +++++++++++++++++- .../site/content/docs/tools/export-files.md | 11 +- .../content/docs/tools/paperless-import.md | 2 +- 3 files changed, 121 insertions(+), 4 deletions(-) diff --git a/website/site/content/docs/tools/cli.md b/website/site/content/docs/tools/cli.md index d52b2bd5..7215738d 100644 --- a/website/site/content/docs/tools/cli.md +++ b/website/site/content/docs/tools/cli.md @@ -86,10 +86,13 @@ you need to `login` again. # Use Cases / Examples +These are some examples. Each command has a good help explaining all +the options. Run `dsc [subcommand] --help` to see it. + ## Uploads files -The `upload` subcommand can uploads files to docspell. This is the +The `upload` subcommand can upload files to docspell. This is the replacement for the `ds.sh` shell script. You can specify a list of files that are all being uploaded. This @@ -147,6 +150,9 @@ File already in Docspell: test-ocr.pdf └─────────┴────────────┘ ``` +The `--poll` option allows to periodically traverse and upload +directories. + ## Watch a directory @@ -176,6 +182,110 @@ If watching a directory is not possible due to system constraints use the `upload` subcommand with `--poll` option which periodically traverses a directory. +## Download files + +The `download` command allows to download files that match a given +query. It is possible to download them all flat into some directory or +directly into a zip file. For example, download all files that are +tagged with `todo` into a zip file: + +``` shell +❯ dsc download --zip 'tag:todo' +Zipping 2 attachments into docspell-files.zip +Downloading DOC-20191223-155707.jpg.pdf … +Downloading DOC-20200803-174448.jpg.pdf … +``` + +It downloads the converted PDF files by default, which can be changed +via some options. + +``` shell +❯ dsc download --zip --original 'tag:todo' +Zipping original files of 2 attachments into docspell-files.zip +Downloading DOC-20191223-155707.jpg … +Downloading DOC-20200803-174448.jpg … +``` + + +## Export data + +The `export` command allows to download all items with metadata and +their files. It downloads all items by default, but a query is also +supported. + +In contrast to the `download` command, this is intended for getting +everything out of docspell in some independent format. Files are +downloaded (only original files) and the items metadata is also +stored. So you don't loose the tags and correspondents that are +carefully maintained with each item. + +It expects one directory where it will create a specfific directory +structure as follows: + +``` +exports/ +├── by_date +│ ├── 2019-07 +│ ├── 2020-08 +| ├── BV2po65mAFU-…-bqUiwjz8f2W -> ../../items/BV/BV2po65mAFU-…-bqUiwjz8f2W +| └── FTUnhZ3AE1H-…-RQ9KhtRi486 -> ../../items/FT/FTUnhZ3AE1H-…-RQ9KhtRi486 +│ ├── … +│ └── 2021-07 +├── by_tag +│ ├── Contract +│ ├── Important +│ ├── Invoice +| │ ├── 455h3cQNdna-…-t6dF7NjAuDm -> ../../items/45/455h3cQNdna-…-t6dF7NjAuDm +| │ ├── 5yQ95tQ4khY-…-S9KrxcbRkZR -> ../../items/5y/5yQ95tQ4khY-…-S9KrxcbRkZR +| │ ├── 7xoiE4XdwgD-…-Eb2S3BCSd38 -> ../../items/7x/7xoiE4XdwgD-…-Eb2S3BCSd38 +| │ └── 93npVoA73Cx-…-BnxYNsf4Qvi -> ../../items/93/93npVoA73Cx-…-BnxYNsf4Qvi +│ ├── … +│ └── Todo +└── items + ├── 45 + | └── 455h3cQNdna-w8oTEw9wtpE-G7bCJbVpZPw-t6dF7NjAuDm + | ├── files + | │ └── DOC-20200803-174448.jpg + | └── metadata.json + ├── … + └── Hb +``` + +All your items are stored below the `items` directory. It contains +subdirectories that are created from the first two characters of the +item id. Inside this folder, a folder with the complete item id is +created and there all the data to the item is stored: the metadata in +`metadata.json` and all files below `files/`. + +The options `--date-links` and `--tag-links` create the other two +folders: `by_tag` and `by_date`. In there you'll find symlinks into +the `items` folder that are organized by some metadata, namely tag and +the item date. + +Example run: +``` shell +❯ dsc export --all --date-links --tag-links --target exports +Exported item: test3.zip +Exported item: README.md +Exported item: LICENSE.txt +Exported item: TestRMarkdown.pdf +Exported item: DOC-20191223-155729.jpg +Exported item: DOC-20191223-155707.jpg +Exported item: DOC-20200808-154204.jpg +Exported item: DOC-20200807-115654.jpg +Exported item: DOC-20200803-174448.jpg +Exported item: DOC-20200803-174448.jpg +Exported item: DOC-20200803-174448.jpg +Exported item: DOC-20200803-174448.jpg +Exported item: DOC-20200804-132305.jpg +Exported item: DOC-20191223-155707.jpg +Exported item: keyweb.eml +Exported 15 items. +``` + +With output format `json` or `lisp` each item is printed instead in +full detail. + ## Admin commands These are a set of commands that simply call a route at the server to diff --git a/website/site/content/docs/tools/export-files.md b/website/site/content/docs/tools/export-files.md index 0e4a4d27..bc9c0286 100644 --- a/website/site/content/docs/tools/export-files.md +++ b/website/site/content/docs/tools/export-files.md @@ -1,9 +1,16 @@ +++ -title = "Export Files" +title = "Export Files (⊗)" description = "Downloads all files from docspell." -weight = 65 +weight = 165 +++ +{% infobubble(mode="info", title="⚠ Please note") %} +This script is now obsolete, you can use the [**CLI tool**](../cli/) instead. + +Use the `export` command, e.g. `dsc export --all --target .`. +{% end %} + + # export-files.sh This script can be used to download all files from docspell that have diff --git a/website/site/content/docs/tools/paperless-import.md b/website/site/content/docs/tools/paperless-import.md index c1f02d29..6439f7af 100644 --- a/website/site/content/docs/tools/paperless-import.md +++ b/website/site/content/docs/tools/paperless-import.md @@ -1,7 +1,7 @@ +++ title = "Paperless Import" description = "Import your data from paperless." -weight = 35 +weight = 60 +++ # Introduction From 85e4ab78da1f92f03cc485e437c4d2e8b298164e Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 28 Jul 2021 23:25:01 +0200 Subject: [PATCH 28/46] Update asciinema for dsc --- website/site/content/docs/feed/_index.md | 17 +++++++---------- website/site/content/docs/tools/cli.md | 9 +++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/website/site/content/docs/feed/_index.md b/website/site/content/docs/feed/_index.md index f193539a..7cc847e9 100644 --- a/website/site/content/docs/feed/_index.md +++ b/website/site/content/docs/feed/_index.md @@ -124,21 +124,18 @@ read more. # Command-Line -I like to use the command line, so there is a small script that -accepts one or more files and uploads them to a configured Docspell -url. It is possible to let the script delete all successfully uploaded -files. +I like to use the command line, and so there is a cli that can be used +for some tasks, for example uploading files. Below is a quick demo, it +supports many more options, see the link below for details. -

    -
    - +
    +
    +
    -The script can also be used to only check if a file already exists in -your account. -{{ buttonright(classes="is-primary ", href="/docs/tools/ds", text="More") }} +{{ buttonright(classes="is-primary ", href="/docs/tools/cli", text="More") }} # Browser Extension diff --git a/website/site/content/docs/tools/cli.md b/website/site/content/docs/tools/cli.md index 7215738d..8352d45f 100644 --- a/website/site/content/docs/tools/cli.md +++ b/website/site/content/docs/tools/cli.md @@ -84,6 +84,15 @@ Once logged in, the session token will be saved to the filesystem renewed if expiry is near. If you don't issue any commands for a while you need to `login` again. +## Demo + +
    +
    + +
    +
    + + # Use Cases / Examples These are some examples. Each command has a good help explaining all From 149f4d48ed03f44bb1f6e89e9ae89970d8850e21 Mon Sep 17 00:00:00 2001 From: eikek Date: Wed, 28 Jul 2021 23:52:46 +0200 Subject: [PATCH 29/46] Update changelog --- Changelog.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Changelog.md b/Changelog.md index 537e7052..6deec6d8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,28 @@ *Unreleased* +- Introducing a new CLI tool (#345) that replaces all the shell + scripts from the `tools/` directory! https://github.com/docspell/dsc +- UI changes: + - year separators are now more prominent (#950) + - fixes a bug in the item counter in detail view when an item is + deleted (#920) + - German translation improvements (#901) + - The number of selected files is shown in upload page (#896) +- The created date of an item can now be used in queries (#925, #958) +- Setting tags api has been improved (#955) +- Task for converting pdfs is now behind the admin secret (#949) +- Task for generating preview images is now behind the admin secret (#915) +- respond with 404 when the source-id is not correct (#931) +- Update of core libraries (#890) +- Add Japanese to the list of document languages (#948) +- Fix setting the folder from metadata when processing a file and + allow to specifiy it by name or id (#940) +- Fixes docspell config file in docker-compose setup (#909) +- Fixes selecting the next job in the job executor (#898) +- Fixes a bug that prevents uploading more than one file at once + (#938) + ### Rest API Changes - Removed `sec/item/convertallpdfs` endpoint in favor for new @@ -13,6 +35,14 @@ `admin/attachments/generatePreviews` endpoint which is now an admin task to generate previews for all files. The now removed enpoint did this only for one collective. +- `/sec/item/{id}/tags`: Setting tags to an item (replacing existing + tags) has been changed to allow tags to be specified as names or ids +- `/sec/item/{id}/tagsremove`: Added a route to remove tags for a + single item + +### Configuration Changes + +None. ## v0.24.0 From 2983fe375629f493a2e83315a02865b096851814 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 29 Jul 2021 04:30:09 +0200 Subject: [PATCH 30/46] Update viewerjs to 0.5.9 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6565add4..5d6ab840 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -43,7 +43,7 @@ object Dependencies { val SwaggerUIVersion = "3.51.1" val TwelveMonkeysVersion = "3.7.0" val JQueryVersion = "3.5.1" - val ViewerJSVersion = "0.5.8" + val ViewerJSVersion = "0.5.9" val catsParse = Seq( "org.typelevel" %% "cats-parse" % CatsParseVersion From 69295b059186796f459eeba3bb5ed1e76c4d0cf8 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 17:34:24 +0200 Subject: [PATCH 31/46] Update changelog --- Changelog.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6deec6d8..72229c3a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,7 @@ ## v0.25.0 -*Unreleased* +*Jul 29, 2021* - Introducing a new CLI tool (#345) that replaces all the shell scripts from the `tools/` directory! https://github.com/docspell/dsc @@ -18,7 +18,8 @@ - Task for generating preview images is now behind the admin secret (#915) - respond with 404 when the source-id is not correct (#931) - Update of core libraries (#890) -- Add Japanese to the list of document languages (#948) +- Add Japanese to the list of document languages. Thanks @wallace11 + for helping out (#948, #962) - Fix setting the folder from metadata when processing a file and allow to specifiy it by name or id (#940) - Fixes docspell config file in docker-compose setup (#909) From 17e49f40c79a1e3d5f49aacd2e493d0288b73250 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 17:47:53 +0200 Subject: [PATCH 32/46] Set version to 0.25.0 --- modules/joexapi/src/main/resources/joex-openapi.yml | 2 +- modules/restapi/src/main/resources/docspell-openapi.yml | 2 +- version.sbt | 2 +- website/site/config.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/joexapi/src/main/resources/joex-openapi.yml b/modules/joexapi/src/main/resources/joex-openapi.yml index 5f443047..b7d12b1a 100644 --- a/modules/joexapi/src/main/resources/joex-openapi.yml +++ b/modules/joexapi/src/main/resources/joex-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell JOEX - version: 0.25.0-SNAPSHOT + version: 0.25.0 description: | This is the remote API to the job executor component of Docspell. Docspell is a free document management system focused on small diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index 741e101f..b0e3b055 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell - version: 0.25.0-SNAPSHOT + version: 0.25.0 description: | This is the remote API to Docspell. Docspell is a free document management system focused on small groups or families. diff --git a/version.sbt b/version.sbt index 814585bd..5cba0532 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.25.0-SNAPSHOT" +ThisBuild / version := "0.25.0" diff --git a/website/site/config.toml b/website/site/config.toml index 40a180b3..fa5cf1fd 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -26,4 +26,4 @@ skip_anchor_prefixes = [ [extra] # Put all your custom variables here -version = "0.25.0-SNAPSHOT" +version = "0.25.0" From a7a4e8e14486c9c5011ddd5cd54a719a651e4e2d Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 18:09:49 +0200 Subject: [PATCH 33/46] Update nix setup --- nix/configuration-test.nix | 2 +- nix/release.nix | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/nix/configuration-test.nix b/nix/configuration-test.nix index 33d3e9a3..dbdb28a1 100644 --- a/nix/configuration-test.nix +++ b/nix/configuration-test.nix @@ -12,7 +12,7 @@ in i18n = { defaultLocale = "en_US.UTF-8"; }; - console.keyMap = "neo"; + console.keyMap = "de"; users.users.root = { password = "root"; diff --git a/nix/release.nix b/nix/release.nix index 21cc62da..1177183c 100644 --- a/nix/release.nix +++ b/nix/release.nix @@ -1,5 +1,20 @@ rec { cfg = { + v0_25_0 = rec { + version = "0.25.0"; + server = { + url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip"; + sha256 = "01wdjprf3vgnpax6p49ia4yzsjz013nwgwhq0fc5ny4wv3sm1sz8"; + }; + joex = { + url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip"; + sha256 = "0xhbkx84qavp9sl02yf780xmfldb4c5lh33nvrzfv5qw28akvs1v"; + }; + tools = { + url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip"; + sha256 = "07hwsr54spiyrrca6cdzl1mlml698q04260dia5blrlvbickwibi"; + }; + }; v0_24_0 = rec { version = "0.24.0"; server = { @@ -92,7 +107,7 @@ rec { }; }; pkg = v: import ./pkg.nix v; - currentPkg = pkg cfg.v0_24_0; + currentPkg = pkg cfg.v0_25_0; module-joex = ./module-joex.nix; module-restserver = ./module-server.nix; module-consumedir = ./module-consumedir.nix; From e696c06656d7a023c84d83bb92dc37c21d991b39 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 18:10:27 +0200 Subject: [PATCH 34/46] Set version to 0.26.0-SNAPSHOT --- modules/joexapi/src/main/resources/joex-openapi.yml | 2 +- modules/restapi/src/main/resources/docspell-openapi.yml | 2 +- version.sbt | 2 +- website/site/config.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/joexapi/src/main/resources/joex-openapi.yml b/modules/joexapi/src/main/resources/joex-openapi.yml index b7d12b1a..df3fd5b7 100644 --- a/modules/joexapi/src/main/resources/joex-openapi.yml +++ b/modules/joexapi/src/main/resources/joex-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell JOEX - version: 0.25.0 + version: 0.26.0-SNAPSHOT description: | This is the remote API to the job executor component of Docspell. Docspell is a free document management system focused on small diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index b0e3b055..e0d683bc 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell - version: 0.25.0 + version: 0.26.0-SNAPSHOT description: | This is the remote API to Docspell. Docspell is a free document management system focused on small groups or families. diff --git a/version.sbt b/version.sbt index 5cba0532..4772100d 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.25.0" +ThisBuild / version := "0.26.0-SNAPSHOT" diff --git a/website/site/config.toml b/website/site/config.toml index fa5cf1fd..dbb29d5b 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -26,4 +26,4 @@ skip_anchor_prefixes = [ [extra] # Put all your custom variables here -version = "0.25.0" +version = "0.26.0-SNAPSHOT" From c59d4f8a6d021ec4b01a92320c211248503f16a5 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 22:22:34 +0200 Subject: [PATCH 35/46] Add the japanese content field to solr This is a follow up on #961. It was forgotten when the japanese language was added. --- .../src/main/scala/docspell/ftssolr/SolrSetup.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala index 0bd16487..8349e443 100644 --- a/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala +++ b/modules/fts-solr/src/main/scala/docspell/ftssolr/SolrSetup.scala @@ -108,7 +108,13 @@ object SolrSetup { "Add latvian content field", addContentField(Language.Latvian) ), - SolrMigration.reIndexAll(13, "Re-Index after adding latvian content field") + SolrMigration.reIndexAll(13, "Re-Index after adding latvian content field"), + SolrMigration[F]( + 14, + "Add japanese content field", + addContentField(Language.Japanese) + ), + SolrMigration.reIndexAll(15, "Re-Index after adding japanese content field") ) def addFolderField: F[Unit] = From edd28818683493e92b42b1fb61df68f13f20af8a Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 22:53:36 +0200 Subject: [PATCH 36/46] Update changelog --- Changelog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Changelog.md b/Changelog.md index 72229c3a..9d374f39 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,14 @@ # Changelog +## v0.25.1 + +*Jul 29, 2021* + +- Fix solr fulltext search by adding the new japanese content field + +The SOLR fulltext search is broken in 0.25.0, so this is a fixup +release. + ## v0.25.0 *Jul 29, 2021* From fe06cc1e6b80c0864ea2ae314222e7934a8ae6b7 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 22:53:43 +0200 Subject: [PATCH 37/46] Set version to 0.25.1 --- .../src/main/resources/joex-openapi.yml | 2 +- .../src/main/resources/docspell-openapi.yml | 2 +- project/change-version.sh | 29 +++++++++++++++++++ version.sbt | 2 +- website/site/config.toml | 2 +- 5 files changed, 33 insertions(+), 4 deletions(-) create mode 100755 project/change-version.sh diff --git a/modules/joexapi/src/main/resources/joex-openapi.yml b/modules/joexapi/src/main/resources/joex-openapi.yml index df3fd5b7..2d97575a 100644 --- a/modules/joexapi/src/main/resources/joex-openapi.yml +++ b/modules/joexapi/src/main/resources/joex-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell JOEX - version: 0.26.0-SNAPSHOT + version: 0.25.1 description: | This is the remote API to the job executor component of Docspell. Docspell is a free document management system focused on small diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index e0d683bc..99fb6dfc 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell - version: 0.26.0-SNAPSHOT + version: 0.25.1 description: | This is the remote API to Docspell. Docspell is a free document management system focused on small groups or families. diff --git a/project/change-version.sh b/project/change-version.sh new file mode 100755 index 00000000..36cbb17b --- /dev/null +++ b/project/change-version.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +set -e + +cd "$(dirname $0)/.." + +edit_version() { + file="$1" + old="$2" + new="$3" + + sed -i "s/$old/$new/g" $file +} + +current_version() { + cat "version.sbt" | head -n1 | cut -d'=' -f2 | xargs +} + +curr="$(current_version)" + +if [ -z "$1" ]; then + echo "No new version given!" + exit 1 +fi + +edit_version "version.sbt" "$curr" "$1" +edit_version "modules/restapi/src/main/resources/docspell-openapi.yml" "$curr" "$1" +edit_version "modules/joexapi/src/main/resources/joex-openapi.yml" "$curr" "$1" +edit_version "website/site/config.toml" "$curr" "$1" diff --git a/version.sbt b/version.sbt index 4772100d..8e14daa0 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.26.0-SNAPSHOT" +ThisBuild / version := "0.25.1" diff --git a/website/site/config.toml b/website/site/config.toml index dbb29d5b..1f3c85b4 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -26,4 +26,4 @@ skip_anchor_prefixes = [ [extra] # Put all your custom variables here -version = "0.26.0-SNAPSHOT" +version = "0.25.1" From cd1330a3cd955d3638b8ca47a147e33545857cc9 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 23:11:11 +0200 Subject: [PATCH 38/46] Update nix setup --- nix/release.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nix/release.nix b/nix/release.nix index 1177183c..547f479a 100644 --- a/nix/release.nix +++ b/nix/release.nix @@ -1,18 +1,18 @@ rec { cfg = { - v0_25_0 = rec { - version = "0.25.0"; + v0_25_1 = rec { + version = "0.25.1"; server = { url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-restserver-${version}.zip"; - sha256 = "01wdjprf3vgnpax6p49ia4yzsjz013nwgwhq0fc5ny4wv3sm1sz8"; + sha256 = "0c6h9jh6kkqlc1ynqmagzb4ig6ci11jnm725p0mdgk1m5hqnm9dk"; }; joex = { url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-joex-${version}.zip"; - sha256 = "0xhbkx84qavp9sl02yf780xmfldb4c5lh33nvrzfv5qw28akvs1v"; + sha256 = "0plps0mvwrx57cn8n7kl6h8mr319hf40rjyji3l7ymi2c83jf8v7"; }; tools = { url = "https://github.com/eikek/docspell/releases/download/v${version}/docspell-tools-${version}.zip"; - sha256 = "07hwsr54spiyrrca6cdzl1mlml698q04260dia5blrlvbickwibi"; + sha256 = "1d7y6kjz7aqy8xiqx8592hg1pzfqmnz8jlz3770ahfj2yh3p8s3z"; }; }; v0_24_0 = rec { @@ -107,7 +107,7 @@ rec { }; }; pkg = v: import ./pkg.nix v; - currentPkg = pkg cfg.v0_25_0; + currentPkg = pkg cfg.v0_25_1; module-joex = ./module-joex.nix; module-restserver = ./module-server.nix; module-consumedir = ./module-consumedir.nix; From 1c3a1cc0dcf9b9eba6e787403c23ef1746cb10b0 Mon Sep 17 00:00:00 2001 From: eikek Date: Thu, 29 Jul 2021 23:11:36 +0200 Subject: [PATCH 39/46] Set version to 0.26.0-SNAPSHOT --- modules/joexapi/src/main/resources/joex-openapi.yml | 2 +- modules/restapi/src/main/resources/docspell-openapi.yml | 2 +- version.sbt | 2 +- website/site/config.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/joexapi/src/main/resources/joex-openapi.yml b/modules/joexapi/src/main/resources/joex-openapi.yml index 2d97575a..df3fd5b7 100644 --- a/modules/joexapi/src/main/resources/joex-openapi.yml +++ b/modules/joexapi/src/main/resources/joex-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell JOEX - version: 0.25.1 + version: 0.26.0-SNAPSHOT description: | This is the remote API to the job executor component of Docspell. Docspell is a free document management system focused on small diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index 99fb6dfc..e0d683bc 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -2,7 +2,7 @@ openapi: 3.0.0 info: title: Docspell - version: 0.25.1 + version: 0.26.0-SNAPSHOT description: | This is the remote API to Docspell. Docspell is a free document management system focused on small groups or families. diff --git a/version.sbt b/version.sbt index 8e14daa0..4772100d 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "0.25.1" +ThisBuild / version := "0.26.0-SNAPSHOT" diff --git a/website/site/config.toml b/website/site/config.toml index 1f3c85b4..dbb29d5b 100644 --- a/website/site/config.toml +++ b/website/site/config.toml @@ -26,4 +26,4 @@ skip_anchor_prefixes = [ [extra] # Put all your custom variables here -version = "0.25.1" +version = "0.26.0-SNAPSHOT" From ebb265a253e6df7c52266500d357ab27d8deff1b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 30 Jul 2021 14:15:42 +0200 Subject: [PATCH 40/46] Update flyway-core to 7.12.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 5d6ab840..b28a3159 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { val DoobieVersion = "1.0.0-M5" val EmilVersion = "0.10.0-M2" val FlexmarkVersion = "0.62.2" - val FlywayVersion = "7.11.4" + val FlywayVersion = "7.12.0" val Fs2Version = "3.0.6" val Fs2CronVersion = "0.7.1" val H2Version = "1.4.200" From 860e146bf00b156eec1cf6589efada2ad65cc660 Mon Sep 17 00:00:00 2001 From: eikek Date: Fri, 30 Jul 2021 16:45:38 +0200 Subject: [PATCH 41/46] Use latest dsc instead of nightly --- README.md | 3 ++- docker/docker-compose/docker-compose.yml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 45fa9f89..633882c5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,8 @@ fulltext search and has great e-mail integration. Everything is accessible via a REST/HTTP api. A mobile friendly SPA web application is the default user interface. An [Android app](https://github.com/docspell/android-client) exists for -conveniently uploading files from your phone/tablet. The [feature +conveniently uploading files from your phone/tablet and a +[cli](https://github.com/docspell/dsc). The [feature overview](https://docspell.org/#feature-selection) lists some more points. diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml index 7e069111..221a06c3 100644 --- a/docker/docker-compose/docker-compose.yml +++ b/docker/docker-compose/docker-compose.yml @@ -30,11 +30,10 @@ services: - solr consumedir: - image: docspell/dsc:nightly + image: docspell/dsc:latest container_name: docspell-consumedir command: - dsc - - "-vv" - "-d" - "http://docspell-restserver:7880" - "watch" From 1256a6e8cfe6dd29660532628d83371ea4cbdd53 Mon Sep 17 00:00:00 2001 From: eikek Date: Sat, 31 Jul 2021 01:23:37 +0200 Subject: [PATCH 42/46] Allo wildcards when searching by attachment ids --- .../qb/generator/ItemQueryGenerator.scala | 14 ++++++---- .../generator/ItemQueryGeneratorTest.scala | 28 +++++++++++++++++++ website/site/content/docs/query/_index.md | 7 +++-- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala index 84d36d1f..24fed950 100644 --- a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala +++ b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala @@ -171,12 +171,16 @@ object ItemQueryGenerator { tables.item.id.in(select.withSelect(Nel.of(RItem.as("i").id.s))) case Expr.AttachId(id) => - tables.item.id.in( - Select( - select(RAttachment.T.itemId), - from(RAttachment.T), + val idWildcard = QueryWildcard(id) + val query = + if (id == idWildcard) { RAttachment.T.id.cast[String] === id - ).distinct + } else { + RAttachment.T.id.cast[String].like(idWildcard) + } + + tables.item.id.in( + Select(select(RAttachment.T.itemId), from(RAttachment.T), query).distinct ) case Expr.Fulltext(_) => diff --git a/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala b/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala index db49f5cd..503cbc5a 100644 --- a/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala +++ b/modules/store/src/test/scala/docspell/store/generator/ItemQueryGeneratorTest.scala @@ -11,6 +11,7 @@ import java.time.LocalDate import docspell.common._ import docspell.query.ItemQueryParser import docspell.store.qb.DSL._ +import docspell.store.qb.Select import docspell.store.qb.generator.{ItemQueryGenerator, Tables} import docspell.store.queries.AttachCountTable import docspell.store.records._ @@ -56,4 +57,31 @@ class ItemQueryGeneratorTest extends FunSuite { assertEquals(cond, expect) } + test("attach.id with wildcard") { + val q = ItemQueryParser.parseUnsafe("attach.id=abcde*") + val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q) + val expect = tables.item.id.in( + Select( + select(RAttachment.T.itemId), + from(RAttachment.T), + RAttachment.T.id.cast[String].like("abcde%") + ).distinct + ) + + assertEquals(cond, expect) + } + + test("attach.id with equals") { + val q = ItemQueryParser.parseUnsafe("attach.id=abcde") + val cond = ItemQueryGenerator(now, tables, Ident.unsafe("coll"))(q) + val expect = tables.item.id.in( + Select( + select(RAttachment.T.itemId), + from(RAttachment.T), + RAttachment.T.id.cast[String] === "abcde" + ).distinct + ) + + assertEquals(cond, expect) + } } diff --git a/website/site/content/docs/query/_index.md b/website/site/content/docs/query/_index.md index db17043a..03b1f89d 100644 --- a/website/site/content/docs/query/_index.md +++ b/website/site/content/docs/query/_index.md @@ -459,13 +459,16 @@ When negating, it finds all items that are not in a folder: The `attach.id` field is a special field to find items by providing the id of an attachment. This can be helpful in certain situations -when you only have the id of an attachment. It always uses equality, -so all other operators are not supported. +when you only have the id or part of that of an attachment. It uses +equality if no wildcard is present. A wildcard `*` can be used at +beginning or end if only a part of the id is known. ``` attach.id=5YjdnuTAdKJ-V6ofWTYsqKV-mAwB5aXTNWE-FAbeRU58qLb +attach.id=5YjdnuTAdKJ* ``` + # Shortcuts Shortcuts are only a short form of a longer query and are provided for From df1ea4934dfc2cee1abaa6d7c0d792ee1f6e62db Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 31 Jul 2021 02:56:06 +0200 Subject: [PATCH 43/46] Update http4s-blaze-client, ... to 0.23.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b28a3159..7f6bab7d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -19,7 +19,7 @@ object Dependencies { val Fs2Version = "3.0.6" val Fs2CronVersion = "0.7.1" val H2Version = "1.4.200" - val Http4sVersion = "0.23.0-RC1" + val Http4sVersion = "0.23.0" val Icu4jVersion = "69.1" val JsoupVersion = "1.14.1" val KindProjectorVersion = "0.10.3" From 231ed731b2c6a8e6c33329218c80a35f4a4bf4e4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 2 Aug 2021 16:23:27 +0200 Subject: [PATCH 44/46] Update swagger-ui to 3.51.2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7f6bab7d..f88a76a1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -40,7 +40,7 @@ object Dependencies { val StanfordNlpVersion = "4.2.2" val TikaVersion = "2.0.0" val YamuscaVersion = "0.8.1" - val SwaggerUIVersion = "3.51.1" + val SwaggerUIVersion = "3.51.2" val TwelveMonkeysVersion = "3.7.0" val JQueryVersion = "3.5.1" val ViewerJSVersion = "0.5.9" From ec8ca5a607758a42a6981fa50e9fb7f3775c0412 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 2 Aug 2021 15:56:31 +0000 Subject: [PATCH 45/46] Update olafurpg/setup-scala action to v13 --- .github/workflows/ci.yml | 2 +- .github/workflows/release-nightly.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45b48147..d8a25793 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: working-directory: modules/webapp - name: Fetch tags run: git fetch --depth=100 origin +refs/tags/*:refs/tags/* - - uses: olafurpg/setup-scala@v12 + - uses: olafurpg/setup-scala@v13 with: java-version: ${{ matrix.java }} - name: Coursier cache diff --git a/.github/workflows/release-nightly.yml b/.github/workflows/release-nightly.yml index 624dd949..e5f0f671 100644 --- a/.github/workflows/release-nightly.yml +++ b/.github/workflows/release-nightly.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 - - uses: olafurpg/setup-scala@v12 + - uses: olafurpg/setup-scala@v13 with: java-version: ${{ matrix.java }} - uses: jorelali/setup-elm@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d606b396..ba3ff89c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2.3.4 with: fetch-depth: 0 - - uses: olafurpg/setup-scala@v12 + - uses: olafurpg/setup-scala@v13 with: java-version: ${{ matrix.java }} - uses: jorelali/setup-elm@v3 From 49d7b5e41dbb40f976c1277806d5286a1a387235 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Aug 2021 22:24:40 +0200 Subject: [PATCH 46/46] Update sbt-scalajs, scalajs-compiler, ... to 1.7.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d73086f1..d7a29f3a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,6 +9,6 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0") addSbtPlugin("io.kevinlee" % "sbt-github-pages" % "0.6.0") addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")