Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Karasiq committed Aug 4, 2018
1 parent 489f98a commit 4324307
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 21 deletions.
36 changes: 19 additions & 17 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ val packageSettings = Seq(
jdkPackagerProperties := Map(
"app.name" "shadowcloud",
"app.version" version.value.replace("-SNAPSHOT", ""),
"file.encoding" "UTF-8"
"file.encoding" "UTF-8",
"java.net.preferIPv4Stack" "true"
// "jnrfuse.winfsp.path" → "C:\\Program Files (x86)\\WinFsp\\bin\\winfsp-x64.dll"
),
// antPackagerTasks in JDKPackager := Some(file("/usr/lib/jvm/java-8-oracle/lib/ant-javafx.jar")),
Expand Down Expand Up @@ -63,8 +64,7 @@ lazy val modelJVM = model.jvm

lazy val modelJS = model.js

lazy val utils = crossProject
.crossType(CrossType.Pure)
lazy val utils = crossProject.crossType(CrossType.Pure)
.settings(commonSettings, name := "shadowcloud-utils")
.jvmSettings(
libraryDependencies ++=
Expand All @@ -89,7 +89,7 @@ lazy val testUtils = (crossProject.crossType(CrossType.Pure) in file("utils") /

lazy val testUtilsJVM = testUtils.jvm

lazy val testUtilsJS = testUtils.js
lazy val testUtilsJS = testUtils.js

lazy val serialization = crossProject.crossType(CrossType.Pure)
.settings(commonSettings, name := "shadowcloud-serialization")
Expand Down Expand Up @@ -173,7 +173,7 @@ def cryptoPlugin(id: String): Project = {
}

lazy val cryptoParent = Project("crypto-parent", file("crypto") / "parent")
.settings(commonSettings)
.settings(commonSettings, name := "shadowcloud-crypto-parent")
.dependsOn(modelJVM)

lazy val bouncyCastleCrypto = cryptoPlugin("bouncycastle")
Expand All @@ -195,7 +195,7 @@ def storagePlugin(id: String): Project = {
}

lazy val storageParent = Project("storage-parent", file("storage") / "parent")
.settings(commonSettings, libraryDependencies ++= ProjectDeps.akka.streams)
.settings(commonSettings, name := "shadowcloud-storage-parent", libraryDependencies ++= ProjectDeps.akka.streams)
.dependsOn(modelJVM, utilsJVM, testUtilsJVM % "test")

lazy val googleDriveStorage = storagePlugin("gdrive")
Expand All @@ -212,17 +212,17 @@ lazy val webdavStorage = storagePlugin("webdav")

// Metadata plugins
def metadataPlugin(id: String): Project = {
val prefixedId = s"metadata-$id"
Project(prefixedId, file("metadata") / id)
.settings(
commonSettings,
name := s"shadowcloud-$prefixedId"
)
.dependsOn(metadataParent % "provided", testUtilsJVM % "test")
val prefixedId = s"metadata-$id"
Project(prefixedId, file("metadata") / id)
.settings(
commonSettings,
name := s"shadowcloud-$prefixedId"
)
.dependsOn(metadataParent % "provided", testUtilsJVM % "test")
}

lazy val metadataParent = Project("metadata-parent", file("metadata") / "parent")
.settings(commonSettings, libraryDependencies ++= ProjectDeps.akka.streams)
.settings(commonSettings, name := "shadowcloud-metadata-parent", libraryDependencies ++= ProjectDeps.akka.streams)
.dependsOn(modelJVM, utilsJVM)

lazy val tikaMetadata = metadataPlugin("tika")
Expand All @@ -242,7 +242,7 @@ lazy val markdownMetadata = metadataPlugin("markdown")
// HTTP
// -----------------------------------------------------------------------
lazy val autowireApi = (crossProject.crossType(CrossType.Pure) in (file("server") / "autowire-api"))
.settings(commonSettings)
.settings(commonSettings, name := "shadowcloud-autowire-api")
.jvmSettings(libraryDependencies ++= ProjectDeps.autowire ++ ProjectDeps.scalaTest.map(_ % "test"))
.jsSettings(ScalaJSDeps.autowire, ScalaJSDeps.browserDom, ScalaJSDeps.scalaTest)
.dependsOn(model, serialization)
Expand Down Expand Up @@ -291,8 +291,8 @@ lazy val `server-webzinc-routes` = (project in file("server") / "webzinc-routes"
.dependsOn(`server-api-routes`)

lazy val webapp = (project in file("server") / "webapp")
.settings(commonSettings)
.settings(
commonSettings,
name := "shadowcloud-webapp",
scalaJSUseMainModuleInitializer := true,
ScalaJSDeps.bootstrap,
Expand Down Expand Up @@ -336,9 +336,11 @@ lazy val javafx = (project in file("javafx"))
.dependsOn(core)

lazy val desktopApp = (project in file("desktop-app"))
.settings(commonSettings, packageSettings)
.settings(
commonSettings,
packageSettings,
name := "shadowcloud-desktop",
mainClass in Compile := Some("com.karasiq.shadowcloud.desktop.SCDesktopMain"),
libraryDependencies ++= ProjectDeps.akka.slf4j ++ ProjectDeps.logback ++
(if (ProjectDeps.javacv.isFullEnabled) ProjectDeps.javacv.mainPlatforms
else if (ProjectDeps.javacv.isEnabled) ProjectDeps.javacv.currentPlatform
Expand Down
2 changes: 1 addition & 1 deletion cache/larray/src/main/resources/sc-larray-cache.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
shadowcloud.cache {
provider = com.github.karasiq.cache.larray.LArrayCacheProvider
provider = com.karasiq.cache.larray.LArrayCacheProvider
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.karasiq.cache.larray
package com.karasiq.cache.larray

import akka.actor.ActorSystem

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.karasiq.cache.larray
package com.karasiq.cache.larray

import scala.concurrent.{ExecutionContext, Future}

Expand Down
6 changes: 6 additions & 0 deletions desktop-app/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
<layout class="ch.qos.logback.classic.PatternLayout">
<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} %X{akkaSource} - %msg%n</Pattern>
</layout>

<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<charset>UTF-8</charset>
<outputPatternAsHeader>true</outputPatternAsHeader>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} %X{akkaSource} - %msg%n</pattern>
</encoder>
</appender>

<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.karasiq.shadowcloud.metadata

trait MetadataProvider {
import com.karasiq.shadowcloud.providers.ModuleProvider

trait MetadataProvider extends ModuleProvider {
def detectors: Seq[MimeDetector]
def parsers: Seq[MetadataParser]
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ trait BlockingMetadataParser extends MetadataParser {
})

blockingFlow
.log("blocking-metadata-parse")
.named("blockingParseMetadata")
.mapMaterializedValue(_ NotUsed)
}
Expand Down

0 comments on commit 4324307

Please sign in to comment.