~jan0sch/cam_archiver
Showing details for patch e79fcc3534ed3a5875a89eea2382dbbc510348c4.
diff -rN -u old-cam_archiver/build.sbt new-cam_archiver/build.sbt --- old-cam_archiver/build.sbt 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/build.sbt 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1,100 @@ +// ***************************************************************************** +// Build settings +// ***************************************************************************** + +addCommandAlias("check", "Compile/scalafix --check; Test/scalafix --check; scalafmtCheckAll") +addCommandAlias("fix", "Compile/scalafix; Test/scalafix; scalafmtSbt; scalafmtAll") + +// Enable the semanticdb compiler plugin needed by the metals language server. +Global / semanticdbEnabled := true + +inThisBuild( + Seq( + scalaVersion := "3.3.6", + organization := "de.jan0sch", + organizationName := "Contributors as noted in the AUTHORS.md file", + version := "1.0.0", + scalacOptions ++= Seq( + "-deprecation", + "-explain", + "-explain-types", + "-feature", + "-language:higherKinds", + "-language:implicitConversions", + "-no-indent", // Prevent usage of indent based syntax. + "-old-syntax", // Enforce classic syntax. + "-unchecked", + "-Wunused:imports", // Warn on unused imports including given and wildcard imports. + "-Wunused:linted", // TODO: Find out what this does! + "-Wunused:locals", // Warn on unused local definitions. + "-Wunused:nowarn", // Warn on unused (useless) `@nowarn` annotations. + "-Wunused:params", // Warn on unused parameters. + "-Wunused:privates", // Warn on unused private definitions. + "-Wunused:unsafe-warn-patvars", // TODO: Find out what this does! + "-Wvalue-discard", // Warn on discarding computed values. + //"-Xfatal-warnings", // NOTE: You might want to disable this when changing much! + "-Ykind-projector" + ), + scalafmtOnCompile := false, + bomFormat := "xml", + coverageExcludedPackages := "<empty>;.*\\.views\\.html.*;.*\\.views\\.txt.*;.*\\.views\\.xml.*;", + Test / fork := true, + Test / parallelExecution := false, + Test / testOptions += Tests.Argument(TestFrameworks.MUnit, "-b") + ) +) + +// ***************************************************************************** +// Projects +// ***************************************************************************** + +lazy val cameraArchiver = + project + .in(file(".")) + .enablePlugins( + DebianPlugin, + JavaAppPackaging + ) + .settings( + name := "camera-archiver", + startYear := Option(2025), + libraryDependencies := Seq( + library.catsCore, + library.catsEffect, + library.decline, + library.declineEffect, + library.logback, + library.osLib, + ) + ) + +// ***************************************************************************** +// Library dependencies +// ***************************************************************************** + +lazy val library = + new { + object Version { + val cats = "2.13.0" + val catsEffect = "3.6.1" + val decline = "2.5.0" + val logback = "1.5.18" + val munit = "1.1.1" + val munitCatsEffect = "2.1.0" + val munitScalaCheck = "1.1.0" + val osLib = "0.11.4" + val scalaCheck = "1.18.1" + val scalaCheckEffect = "1.0.4" + } + val catsCore = "org.typelevel" %% "cats-core" % Version.cats + val catsEffect = "org.typelevel" %% "cats-effect" % Version.catsEffect + val decline = "com.monovore" %% "decline" % Version.decline + val declineEffect = "com.monovore" %% "decline-effect" % Version.decline + val logback = "ch.qos.logback" % "logback-classic" % Version.logback + val munit = "org.scalameta" %% "munit" % Version.munit + val munitCatsEffect = "org.typelevel" %% "munit-cats-effect" % Version.munitCatsEffect + val munitScalaCheck = "org.scalameta" %% "munit-scalacheck" % Version.munitScalaCheck + val osLib = "com.lihaoyi" %% "os-lib" % Version.osLib + val scalaCheck = "org.scalacheck" %% "scalacheck" % Version.scalaCheck + val scalaCheckEffect = "org.typelevel" %% "scalacheck-effect-munit" % Version.scalaCheckEffect + } diff -rN -u old-cam_archiver/.editorconfig new-cam_archiver/.editorconfig --- old-cam_archiver/.editorconfig 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/.editorconfig 2025-07-04 01:42:09.316332662 +0000 @@ -0,0 +1,25 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true + +# Matches multiple files with brace expansion notation + +# Scala +[*.{scala,sbt,sc}] +charset = utf-8 +indent_style = space +indent_size = 4 +max_line_length = 120 + +# Twirl +[*.scala.{html,txt}] +charset = utf-8 +indent_style = space +indent_size = 2 + diff -rN -u old-cam_archiver/LICENSE new-cam_archiver/LICENSE --- old-cam_archiver/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/LICENSE 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1,287 @@ + EUROPEAN UNION PUBLIC LICENCE v. 1.2 + EUPL © the European Union 2007, 2016 + +This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined +below) which is provided under the terms of this Licence. Any use of the Work, +other than as authorised under this Licence is prohibited (to the extent such +use is covered by a right of the copyright holder of the Work). + +The Work is provided under the terms of this Licence when the Licensor (as +defined below) has placed the following notice immediately following the +copyright notice for the Work: + + Licensed under the EUPL + +or has expressed by any other means his willingness to license under the EUPL. + +1. Definitions + +In this Licence, the following terms have the following meaning: + +- ‘The Licence’: this Licence. + +- ‘The Original Work’: the work or software distributed or communicated by the + Licensor under this Licence, available as Source Code and also as Executable + Code as the case may be. + +- ‘Derivative Works’: the works or software that could be created by the + Licensee, based upon the Original Work or modifications thereof. This Licence + does not define the extent of modification or dependence on the Original Work + required in order to classify a work as a Derivative Work; this extent is + determined by copyright law applicable in the country mentioned in Article 15. + +- ‘The Work’: the Original Work or its Derivative Works. + +- ‘The Source Code’: the human-readable form of the Work which is the most + convenient for people to study and modify. + +- ‘The Executable Code’: any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- ‘The Licensor’: the natural or legal person that distributes or communicates + the Work under the Licence. + +- ‘Contributor(s)’: any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of + the Work under the terms of the Licence. + +- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, online or offline, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + +2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +sublicensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display + the Work or copies thereof to the public and perform publicly, as the case may + be, the Work, +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sublicense rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. + +3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute or communicate the Work. + +4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Work, of the exhaustion of those rights or of other applicable limitations +thereto. + +5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: The Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes or communicates copies of the +Original Works or Derivative Works, this Distribution or Communication will be +done under the terms of this Licence or of a later version of this Licence +unless the Original Work is expressly distributed only under this version of the +Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee +(becoming Licensor) cannot offer or impose any additional terms or conditions on +the Work or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes or Communicates Derivative +Works or copies thereof based upon both the Work and another work licensed under +a Compatible Licence, this Distribution or Communication can be done under the +terms of this Compatible Licence. For the sake of this clause, ‘Compatible +Licence’ refers to the licences listed in the appendix attached to this Licence. +Should the Licensee's obligations under the Compatible Licence conflict with +his/her obligations under this Licence, the obligations of the Compatible +Licence shall prevail. + +Provision of Source Code: When distributing or communicating copies of the Work, +the Licensee will provide a machine-readable copy of the Source Code or indicate +a repository where this Source will be easily and freely available for as long +as the Licensee continues to distribute or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + +6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + +7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +Contributors. It is not a finished work and may therefore contain defects or +‘bugs’ inherent to this type of development. + +For the above reason, the Work is provided under the Licence on an ‘as is’ basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + +8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such damage. +However, the Licensor will be liable under statutory product liability laws as +far such laws apply to the Work. + +9. Additional agreements + +While distributing the Work, You may choose to conclude an additional agreement, +defining obligations or services consistent with this Licence. However, if +accepting obligations, You may act only on your own behalf and on your sole +responsibility, not on behalf of the original Licensor or any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor harmless +for any liability incurred by, or claims asserted against such Contributor by +the fact You have accepted any warranty or additional liability. + +10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution or Communication by You of the Work or copies thereof. + +11. Information to the public + +In case of any Distribution or Communication of the Work by means of electronic +communication by You (for example, by offering to download the Work from a +remote location) the distribution channel or media (for example, a website) must +at least provide to the public the information requested by the applicable law +regarding the Licensor, the Licence and the way it may be accessible, concluded, +stored and reproduced by the Licensee. + +12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed or reformed so as necessary to make it +valid and enforceable. + +The European Commission may publish other linguistic versions or new versions of +this Licence or updated versions of the Appendix, so far this is required and +reasonable, without reducing the scope of the rights granted by the Licence. New +versions of the Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + +14. Jurisdiction + +Without prejudice to specific agreement between parties, + +- any litigation resulting from the interpretation of this License, arising + between the European Union institutions, bodies, offices or agencies, as a + Licensor, and any Licensee, will be subject to the jurisdiction of the Court + of Justice of the European Union, as laid down in article 272 of the Treaty on + the Functioning of the European Union, + +- any litigation arising between other parties and resulting from the + interpretation of this License, will be subject to the exclusive jurisdiction + of the competent court where the Licensor resides or conducts its primary + business. + +15. Applicable Law + +Without prejudice to specific agreement between parties, + +- this Licence shall be governed by the law of the European Union Member State + where the Licensor has his seat, resides or has his registered office, + +- this licence shall be governed by Belgian law if the Licensor has no seat, + residence or registered office inside a European Union Member State. + +Appendix + +‘Compatible Licences’ according to Article 5 EUPL are: + +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for + works other than software +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong + Reciprocity (LiLiQ-R+). + +The European Commission may update this Appendix to later versions of the above +licences without producing a new version of the EUPL, as long as they provide +the rights granted in Article 2 of this Licence and protect the covered Source +Code from exclusive appropriation. + +All other changes or additions to this Appendix require the production of a new +EUPL version. diff -rN -u old-cam_archiver/project/build.properties new-cam_archiver/project/build.properties --- old-cam_archiver/project/build.properties 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/project/build.properties 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1 @@ +sbt.version = 1.11.0 diff -rN -u old-cam_archiver/project/plugins.sbt new-cam_archiver/project/plugins.sbt --- old-cam_archiver/project/plugins.sbt 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/project/plugins.sbt 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1,11 @@ +// Compiler plugins +addCompilerPlugin("org.scalameta" % "semanticdb-scalac" % "4.13.6" cross CrossVersion.full) +// Regular plugins +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.1") +addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0") +addSbtPlugin("com.github.sbt" %% "sbt-sbom" % "0.4.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") +// Needed to build debian packages via java (for sbt-native-packager). +libraryDependencies += "org.vafer" % "jdeb" % "1.12" artifacts (Artifact("jdeb", "jar", "jar")) diff -rN -u old-cam_archiver/README.md new-cam_archiver/README.md --- old-cam_archiver/README.md 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/README.md 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1,12 @@ +# Camera Archiver + +A tool to copy camera files i.e. photos and videos from a source to a target +folder sorting them into sub-folders by year and month. + +## System requirements + +- Java Runtime 17 or higher + +## Usage + + diff -rN -u old-cam_archiver/.scalafix.conf new-cam_archiver/.scalafix.conf --- old-cam_archiver/.scalafix.conf 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/.scalafix.conf 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1,42 @@ +rules = [ + DisableSyntax + LeakingImplicitClassVal + NoValInForComprehension + OrganizeImports +] + +DisableSyntax { + noAsInstanceOf = true + noDefaultArgs = true + noFinalVal = false + noFinalize = true + noIsInstanceOf = true + noNulls = true + noReturns = true + noThrows = true + noUniversalEquality = true + noValPatterns = true + noVars = true + noWhileLoops = true + noXml = false +} + +OrganizeImports { + blankLines = Auto + coalesceToWildcardImportThreshold = null + expandRelative = false + groupExplicitlyImportedImplicitsSeparately = false // No effect for Scala 3 + groupedImports = Explode // Have imports line by line to minimize merge conflicts. + groups = [ + "re:javax?\\." + "*" + "munit." + "org.scalacheck." + "scala." + ] + importSelectorsOrder = Ascii + importsOrder = Ascii + preset = DEFAULT + removeUnused = false // Workaround for Scala 3 + targetDialect = Scala3 +} diff -rN -u old-cam_archiver/.scalafmt.conf new-cam_archiver/.scalafmt.conf --- old-cam_archiver/.scalafmt.conf 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/.scalafmt.conf 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1,36 @@ +version = "3.9.7" +runner.dialect = scala3 +style = "defaultWithAlign" +# Other options... +danglingParentheses.preset = true +indent.main = 4 +indent.significant = 4 +indent.callSite = 4 +indent.ctrlSite = 4 +indent.defnSite = 4 +indent.ctorSite = 4 +indent.matchSite = 4 +indent.caseSite = 4 +indent.extendSite = 4 +indent.withSiteRelativeToExtends = 4 +indent.commaSiteRelativeToExtends = 4 +indent.extraBeforeOpenParenDefnSite = 0 +indent.relativeToLhsLastLine = [match, infix] +indent.fewerBraces = "never" +maxColumn = 120 +newlines.beforeOpenParenDefnSite = null +newlines.forceBeforeMultilineAssign = def +project.excludePaths = [ + "glob:**/build.sbt", + "glob:**/project/plugins.sbt" +] +project.includePaths = [ + "glob:**/project/*.scala", + "glob:**/src/**.scala" +] +rewrite.rules = [RedundantBraces, RedundantParens] +rewriteTokens = { + "⇒" = "=>" + "←" = "<-" + "→" = "->" +} diff -rN -u old-cam_archiver/src/main/scala/de/jan0sch/CameraArchiver.scala new-cam_archiver/src/main/scala/de/jan0sch/CameraArchiver.scala --- old-cam_archiver/src/main/scala/de/jan0sch/CameraArchiver.scala 1970-01-01 00:00:00.000000000 +0000 +++ new-cam_archiver/src/main/scala/de/jan0sch/CameraArchiver.scala 2025-07-04 01:42:09.320332660 +0000 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2025 Contributors as noted in the AUTHORS.md file + * + * Licensed under the EUPL + */ + +package de.jan0sch + +import cats.effect.* +import cats.syntax.all.* +import com.monovore.decline.* +import com.monovore.decline.effect.* + +import scala.util.matching.Regex + +object CameraArchiver + extends CommandIOApp( + name = "camera-archiver", + header = + "Copy camera files i.e. photos and videos from a source to a target folder sorting them into sub-folders by year and month." + ) { + /* The regular expression used for validation of filenames and generation of the target sub-folders. + */ + val CameraFileName: Regex = "(?iu)^(img|vid)?_?(\\d{4})[-_]?(\\d{2})[-_]?(\\d{2})[-_T]?.*$".r + + val sourcePathOption = + Opts.option[java.nio.file.Path]("source", "The source folder path containing the camera files.") + val targetPathOption = Opts.option[java.nio.file.Path]( + "target", + "The target folder path into which subfolders are to be created and populated with images and videos." + ) + val verboseFlag = Opts.flag(long = "verbose", short = "v", help = "Enable more verbose ouput.").orFalse + + override def main: Opts[IO[ExitCode]] = + ( + sourcePathOption.map(path => os.Path(path.toAbsolutePath().toUri())), + targetPathOption.map(path => os.Path(path.toAbsolutePath().toUri())), + verboseFlag + ).mapN { case (sourcePath, targetPath, verbose) => + for { + _ <- IO.whenA(verbose)(IO.println(s"Start archiving files from $sourcePath to $targetPath.")) + files <- IO( + os.walk(sourcePath) + .filter(path => os.isFile(path, followLinks = false) && CameraFileName.matches(path.last)) + ) + groupedByTargetFolder = files.groupBy(path => + CameraFileName + .findFirstMatchIn(path.last) + .map(matcher => targetPath / s"${matcher.group(2)}-${matcher.group(3)}") + .getOrElse(targetPath) // fallback to simple target path if year and month are not found + ) + _ <- IO.whenA(verbose)( + IO.println( + s"Going to copy ${files.size} files into ${groupedByTargetFolder.keySet.size} target folders." + ) + ) + _ <- groupedByTargetFolder.toList.traverse { (targetFolder, files) => + for { + _ <- IO.whenA(verbose)(IO.println(s"Processing ${targetFolder.last}")) + _ <- IO(os.makeDir.all(targetFolder)) + _ <- files.toList.traverse(file => IO(os.copy.into(from = file, to = targetFolder))) + } yield () + } + _ <- IO.whenA(verbose)(IO.println("Done.")) + } yield ExitCode.Success + } +}