diff --git a/src/cli/actions.scala b/src/cli/actions.scala index beb54e4..a1c2de2 100644 --- a/src/cli/actions.scala +++ b/src/cli/actions.scala @@ -17,35 +17,35 @@ package fury import ambience.* -import aviation.*, calendars.gregorian +import anthology.* import anticipation.*, filesystemInterfaces.galileiApi +import aviation.*, calendars.gregorian +import cellulose.*, codlPrinters.standard import contingency.* -import anthology.* import escapade.* import escritoire.*, insufficientSpaceHandling.ignore, tableStyles.default import ethereal.* import eucalyptus.* import exoskeleton.* import fulminate.* -import gastronomy.*, alphabets.base32.zBase32Unpadded import galilei.*, filesystemOptions.dereferenceSymlinks +import gastronomy.*, alphabets.base32.zBase32Unpadded import gossamer.* import guillotine.* import hieroglyph.*, textMetrics.eastAsianScripts, charEncoders.utf8 import iridescence.*, colors.* import nettlesome.* -import zeppelin.* import octogenarian.* -import surveillance.* import parasite.* import profanity.* import quantitative.* -import cellulose.*, codlPrinters.standard import rudiments.* import serpentine.*, pathHierarchies.unixOrWindows import spectacular.* +import surveillance.* import turbulence.* import vacuous.* +import zeppelin.* def accede(error: Error): UserError = UserError(error.message) @@ -82,9 +82,9 @@ object actions: Exit.Ok - .remedy: - case InstallError(message) => abort(UserError(message.communicate)) - case DismissError() => Exit.Fail(1) + . remedy: + case InstallError(message) => abort(UserError(message.communicate)) + case DismissError() => Exit.Fail(1) def batch(force: Boolean, noTabCompletions: Boolean) (using DaemonService[?], @@ -101,8 +101,9 @@ object actions: log(Installer.install(force).communicate) if !noTabCompletions then info(TabCompletions.install(force = true).communicate) Exit.Ok - .remedy: - case InstallError(message) => abort(UserError(message.communicate)) + + . remedy: + case InstallError(message) => abort(UserError(message.communicate)) def clean(all: Boolean)(using FrontEnd, Installation): Exit raises UserError = import filesystemOptions. diff --git a/src/cli/clifrontend.scala b/src/cli/clifrontend.scala index 75038bf..b6b4190 100644 --- a/src/cli/clifrontend.scala +++ b/src/cli/clifrontend.scala @@ -16,23 +16,23 @@ package fury -import profanity.*, terminalOptions.terminalSizeDetection -import turbulence.* -import exoskeleton.* import acyclicity.* +import anticipation.* import contingency.* -import parasite.*, orphanDisposal.cancel import dendrology.*, dagStyles.default -import vacuous.* -import hieroglyph.*, textMetrics.uniform import escapade.* -import anticipation.* -import iridescence.* +import eucalyptus.* +import exoskeleton.* import gossamer.* +import hieroglyph.*, textMetrics.uniform +import iridescence.* +import parasite.*, orphanDisposal.cancel +import profanity.*, terminalOptions.terminalSizeDetection +import quantitative.* import rudiments.* import spectacular.* -import quantitative.* -import eucalyptus.* +import turbulence.* +import vacuous.* import scala.collection.concurrent as scc diff --git a/src/engine/build.scala b/src/engine/build.scala index f521a09..5509db7 100644 --- a/src/engine/build.scala +++ b/src/engine/build.scala @@ -16,14 +16,14 @@ package fury -import anticipation.* -import anthology.* import ambience.* +import anthology.* +import anticipation.* import aviation.*, calendars.gregorian +import digression.* import escapade.* -import eucalyptus.* import ethereal.* -import digression.* +import eucalyptus.* import fulminate.* import gastronomy.* diff --git a/src/engine/cache.scala b/src/engine/cache.scala index fa46e6a..f47486c 100644 --- a/src/engine/cache.scala +++ b/src/engine/cache.scala @@ -52,7 +52,7 @@ given Timezone = tz"Etc/UTC" case class CachedFile(lastModified: Instant, text: Task[Text], hash: Task[Hash]) case class CacheInfo - (ecosystems: Int, snapshots: Int, workspaces: Int, files: Int, dataSize: ByteSize) + (ecosystems: Int, snapshots: Int, workspaces: Int, files: Int, dataSize: Memory) object Cache: private val ecosystems: scc.TrieMap[Ecosystem, Task[Vault]] = scc.TrieMap() @@ -85,7 +85,7 @@ object Cache: files.clear() def about: CacheInfo = - val dataSize = ByteSize(files.values.map { file => safely(file.text.await().length).or(0) }.sum) + val dataSize = Memory(files.values.map { file => safely(file.text.await().length).or(0) }.sum) CacheInfo(ecosystems.size, snapshots.size, workspaces.size, files.size, dataSize) def gitProgress(stream: LazyList[Progress]): LazyList[Double] = stream.collect: diff --git a/src/engine/flow.scala b/src/engine/flow.scala index f5223ad..a168773 100644 --- a/src/engine/flow.scala +++ b/src/engine/flow.scala @@ -16,12 +16,11 @@ package fury +import anticipation.* import feudalism.* import galilei.* -import anticipation.* import rudiments.* - class Workflow(): val classes: Mutex[List[Directory]] = Mutex(Nil) val files: Mutex[Map[WorkPath, Bytes]] = Mutex(Map()) diff --git a/src/engine/frontend.scala b/src/engine/frontend.scala index 00abc3f..e9340c1 100644 --- a/src/engine/frontend.scala +++ b/src/engine/frontend.scala @@ -16,11 +16,11 @@ package fury +import acyclicity.* import anticipation.* import parasite.* -import vacuous.* import rudiments.* -import acyclicity.* +import vacuous.* import scala.collection.concurrent as scc import scala.collection.mutable as scm diff --git a/src/engine/install.scala b/src/engine/install.scala index d34797a..a3d4f94 100644 --- a/src/engine/install.scala +++ b/src/engine/install.scala @@ -67,7 +67,7 @@ object Installation: val buildId: Int = safely((Classpath / p"build.id")().read[Text].trim.decode[Int]).or: - throw Panic(m"The build.id file was missing or corrupt") + panic(m"The build.id file was missing or corrupt") Installation(buildId, config, cache, vault, tmp, snapshots) diff --git a/src/model/ids.scala b/src/model/ids.scala index bfe314e..1f46fbd 100644 --- a/src/model/ids.scala +++ b/src/model/ids.scala @@ -16,18 +16,18 @@ package fury -import rudiments.* -import vacuous.* -import fulminate.* -import prepositional.* -import gossamer.* import anticipation.* -import gastronomy.* -import galilei.* import contingency.* -import spectacular.* -import kaleidoscope.* +import fulminate.* +import galilei.* +import gastronomy.* +import gossamer.* import hieroglyph.*, charEncoders.utf8 +import kaleidoscope.* +import prepositional.* +import rudiments.* +import spectacular.* +import vacuous.* import errorDiagnostics.stackTraces diff --git a/src/model/licenses.scala b/src/model/licenses.scala index 1543ac2..0f957b4 100644 --- a/src/model/licenses.scala +++ b/src/model/licenses.scala @@ -17,8 +17,8 @@ package fury import anticipation.* -import punctuation.* import gossamer.* +import punctuation.* enum LicenseGroup: case Afl, Apache, Artistic, Bsl, Bsd, Cc, Wtfpl, Ecl, Epl, Eupl, Agpl, Gpl, Lgpl, Isc, Lppl, Ms, diff --git a/src/model/model.scala b/src/model/model.scala index 99717ed..564c2cf 100644 --- a/src/model/model.scala +++ b/src/model/model.scala @@ -19,27 +19,27 @@ package fury import anticipation.* import aviation.*, calendars.gregorian import cellulose.* +import contingency.* +import digression.* import escapade.* import exoskeleton.* +import filesystemApi.galileiPath +import filesystemOptions.createNonexistent.disabled +import filesystemOptions.dereferenceSymlinks.enabled import fulminate.* import galilei.* -import filesystemOptions.dereferenceSymlinks.enabled -import filesystemOptions.createNonexistent.disabled -import filesystemApi.galileiPath import gastronomy.* import gossamer.* import hieroglyph.*, charEncoders.utf8, charDecoders.utf8, textSanitizers.strict -import digression.* import kaleidoscope.* import monotonous.* import nettlesome.* import octogenarian.* -import contingency.* +import prepositional.* import punctuation.* import rudiments.* import serpentine.*, pathHierarchies.unixOrWindows import spectacular.* -import prepositional.* import symbolism.* import turbulence.* import vacuous.* diff --git a/src/test/test.scala b/src/test/test.scala index ae1d0dd..e7c6f8d 100644 --- a/src/test/test.scala +++ b/src/test/test.scala @@ -16,15 +16,15 @@ package fury -import probably.* -import gossamer.* -import spectacular.* -import rudiments.* import anticipation.* +import cellulose.* +import contingency.*, strategies.throwUnsafely import galilei.* +import gossamer.* +import probably.* +import rudiments.* import serpentine.* -import contingency.*, strategies.throwUnsafely -import cellulose.* +import spectacular.* import unsafeExceptions.canThrowAny