Skip to content

Commit

Permalink
Switch to Github Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
obruchez committed Feb 12, 2022
1 parent 00873cb commit e9a3b6a
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 30 deletions.
21 changes: 11 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
logs
project/project
project/target
target
tmp
.history
dist
/.idea
/*.iml
/out
/.idea_modules
/.bsp
/.classpath
/.idea
/.idea_modules
/.project
/RUNNING_PID
/.settings
/RUNNING_PID
/out
dist
logs
project/project
project/target
target
tmp
4 changes: 3 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
maxColumn = 100
version = 3.3.0
runner.dialect = scala213
maxColumn = 100
3 changes: 0 additions & 3 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# kindle-clippings-to-markdown

[![Build Status](https://travis-ci.org/obruchez/kindle-clippings-to-markdown.svg?branch=master)](https://travis-ci.org/obruchez/kindle-clippings-to-markdown)
[![Scala CI](https://github.com/obruchez/kindle-clippings-to-markdown/actions/workflows/scala.yml/badge.svg)](https://github.com/obruchez/kindle-clippings-to-markdown/actions/workflows/scala.yml)

Convert Amazon's My Clippings.txt file (Kindle Highlights) into Markdown files (one for each book).
9 changes: 4 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name := "Kindle clippings to Markdown"
version := "1.3"
scalaVersion := "2.13.3"
scalaVersion := "2.13.8"

mainClass in assembly := Some("org.bruchez.olivier.kindleclippings.KindleClippings")
assembly / mainClass := Some("org.bruchez.olivier.kindleclippings.KindleClippings")
assembly / assemblyJarName := "kindle-clippings.jar"

assemblyJarName in assembly := "kindle-clippings.jar"

scalafmtOnCompile in ThisBuild := true
ThisBuild / scalafmtOnCompile := true
2 changes: 1 addition & 1 deletion project/assembly.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.6.1
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ logLevel := Level.Warn

resolvers += Resolver.sonatypeRepo("releases")

addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.16")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("com.beautiful-scala" % "sbt-scalastyle" % "1.5.1")
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.bruchez.olivier.kindleclippings

import java.io._
import java.text.Normalizer

import scala.io.Source
import scala.util._

Expand All @@ -19,7 +18,7 @@ case class Clipping(contents: String, pageOption: Option[Int], locationOption: O
}

case class KindleClippings(clippingsByBook: Map[Book, Seq[Clipping]]) {
def createMarkdownFiles() {
def createMarkdownFiles(): Unit = {
for {
(book, clippings) <- clippingsByBook
markdown = KindleClippings.markdown(book, clippings)
Expand All @@ -36,7 +35,7 @@ case class KindleClippings(clippingsByBook: Map[Book, Seq[Clipping]]) {
}

object KindleClippings {
def main(args: Array[String]) {
def main(args: Array[String]): Unit = {
lines(args.headOption.getOrElse("My Clippings.txt")) match {
case Success(lines) => KindleClippings(lines).createMarkdownFiles()
case Failure(throwable) => println(s"Error: ${throwable.getMessage}")
Expand All @@ -47,8 +46,10 @@ object KindleClippings {
val MinLinesPerBook = 5

@annotation.tailrec
def clippingsByBook(remainingLines: List[String],
acc: List[(Book, Clipping)] = List()): Seq[(Book, Clipping)] =
def clippingsByBook(
remainingLines: List[String],
acc: List[(Book, Clipping)] = List()
): Seq[(Book, Clipping)] =
if (remainingLines.size < MinLinesPerBook) {
acc.reverse
} else {
Expand Down Expand Up @@ -90,7 +91,8 @@ object KindleClippings {
}

KindleClippings(
clippingsByBook(lines).groupBy(_._1).map(kv => kv._1 -> kv._2.map(_._2).distinct))
clippingsByBook(lines).groupBy(_._1).map(kv => kv._1 -> kv._2.map(_._2).distinct)
)
}

def filenameFromRawString(string: String, replacement: String = "-"): String =
Expand Down

0 comments on commit e9a3b6a

Please sign in to comment.