From a517b1cf3c14ac1b24bd5d73b8ca744199c9b594 Mon Sep 17 00:00:00 2001 From: Kirill Taran Date: Mon, 24 Jul 2023 09:20:50 +0300 Subject: [PATCH] Renaming module "domain" into "data" --- .../space/taran/arklib/{domain => data}/Message.kt | 2 +- .../{domain => data}/index/IndexAggregation.kt | 2 +- .../arklib/{domain => data}/index/IndexProjection.kt | 2 +- .../taran/arklib/{domain => data}/index/Resource.kt | 2 +- .../arklib/{domain => data}/index/ResourceIndex.kt | 2 +- .../{domain => data}/index/ResourceIndexRepo.kt | 2 +- .../taran/arklib/{domain => data}/index/RootIndex.kt | 2 +- .../taran/arklib/{domain => data}/meta/Metadata.kt | 6 +++--- .../{domain => data}/meta/MetadataGenerator.kt | 6 +++--- .../{domain => data}/meta/MetadataProcessorRepo.kt | 6 +++--- .../arklib/{domain => data}/meta/MetadataStorage.kt | 6 +++--- .../{domain => data}/meta/RootMetadataProcessor.kt | 8 ++++---- .../meta/generator/ArchiveMetadataGenerator.kt | 8 ++++---- .../meta/generator/DocumentMetadataGenerator.kt | 8 ++++---- .../meta/generator/ImageMetadataGenerator.kt | 8 ++++---- .../meta/generator/LinkMetadataGenerator.kt | 8 ++++---- .../meta/generator/PlainTextMetadataGenerator.kt | 8 ++++---- .../meta/generator/VideoMetadataGenerator.kt | 8 ++++---- .../taran/arklib/{domain => data}/preview/Preview.kt | 6 +++--- .../{domain => data}/preview/PreviewGenerator.kt | 12 ++++++------ .../{domain => data}/preview/PreviewProcessorRepo.kt | 10 +++++----- .../{domain => data}/preview/RootPreviewProcessor.kt | 10 +++++----- .../preview/generator/ImagePreviewGenerator.kt | 10 +++++----- .../preview/generator/PdfPreviewGenerator.kt | 10 +++++----- .../preview/generator/TxtPreviewGenerator.kt | 10 +++++----- .../preview/generator/VideoPreviewGenerator.kt | 10 +++++----- .../{domain => data}/processor/AggregateProcessor.kt | 4 ++-- .../arklib/{domain => data}/processor/Processor.kt | 2 +- .../{domain => data}/processor/RootProcessor.kt | 2 +- .../arklib/{domain => data}/stats/StatsEvent.kt | 4 ++-- .../{domain => data}/storage/AggregateStorage.kt | 5 ++--- .../arklib/{domain => data}/storage/BaseStorage.kt | 2 +- .../arklib/{domain => data}/storage/BitmapStorage.kt | 4 ++-- .../arklib/{domain => data}/storage/FileStorage.kt | 2 +- .../arklib/{domain => data}/storage/FolderStorage.kt | 2 +- .../taran/arklib/{domain => data}/storage/Monoid.kt | 2 +- .../{domain => data}/storage/MonoidIsNotUsed.kt | 2 +- .../taran/arklib/{domain => data}/storage/Storage.kt | 2 +- .../space/taran/arklib/user/properties/Properties.kt | 2 +- .../arklib/user/properties/PropertiesStorage.kt | 6 +++--- .../arklib/user/properties/PropertiesStorageRepo.kt | 4 ++-- .../arklib/user/properties/RootPropertiesStorage.kt | 2 +- .../taran/arklib/user/score/RootScoreStorage.kt | 2 +- .../main/java/space/taran/arklib/user/score/Score.kt | 2 +- .../space/taran/arklib/user/score/ScoreStorage.kt | 10 +++++----- .../taran/arklib/user/score/ScoreStorageRepo.kt | 4 ++-- .../space/taran/arklib/user/tags/RootTagsStorage.kt | 5 ++--- .../java/space/taran/arklib/user/tags/TagStorage.kt | 10 +++++----- .../space/taran/arklib/user/tags/TagStorageRepo.kt | 6 +++--- .../main/java/space/taran/arklib/user/tags/Tags.kt | 2 +- 50 files changed, 129 insertions(+), 131 deletions(-) rename lib/src/main/java/space/taran/arklib/{domain => data}/Message.kt (75%) rename lib/src/main/java/space/taran/arklib/{domain => data}/index/IndexAggregation.kt (97%) rename lib/src/main/java/space/taran/arklib/{domain => data}/index/IndexProjection.kt (98%) rename lib/src/main/java/space/taran/arklib/{domain => data}/index/Resource.kt (96%) rename lib/src/main/java/space/taran/arklib/{domain => data}/index/ResourceIndex.kt (95%) rename lib/src/main/java/space/taran/arklib/{domain => data}/index/ResourceIndexRepo.kt (97%) rename lib/src/main/java/space/taran/arklib/{domain => data}/index/RootIndex.kt (99%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/Metadata.kt (88%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/MetadataGenerator.kt (92%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/MetadataProcessorRepo.kt (85%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/MetadataStorage.kt (94%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/RootMetadataProcessor.kt (95%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/generator/ArchiveMetadataGenerator.kt (78%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/generator/DocumentMetadataGenerator.kt (92%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/generator/ImageMetadataGenerator.kt (78%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/generator/LinkMetadataGenerator.kt (63%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/generator/PlainTextMetadataGenerator.kt (67%) rename lib/src/main/java/space/taran/arklib/{domain => data}/meta/generator/VideoMetadataGenerator.kt (88%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/Preview.kt (95%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/PreviewGenerator.kt (76%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/PreviewProcessorRepo.kt (81%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/RootPreviewProcessor.kt (95%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/generator/ImagePreviewGenerator.kt (67%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/generator/PdfPreviewGenerator.kt (78%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/generator/TxtPreviewGenerator.kt (88%) rename lib/src/main/java/space/taran/arklib/{domain => data}/preview/generator/VideoPreviewGenerator.kt (92%) rename lib/src/main/java/space/taran/arklib/{domain => data}/processor/AggregateProcessor.kt (94%) rename lib/src/main/java/space/taran/arklib/{domain => data}/processor/Processor.kt (92%) rename lib/src/main/java/space/taran/arklib/{domain => data}/processor/RootProcessor.kt (87%) rename lib/src/main/java/space/taran/arklib/{domain => data}/stats/StatsEvent.kt (83%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/AggregateStorage.kt (84%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/BaseStorage.kt (99%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/BitmapStorage.kt (91%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/FileStorage.kt (99%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/FolderStorage.kt (99%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/Monoid.kt (93%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/MonoidIsNotUsed.kt (96%) rename lib/src/main/java/space/taran/arklib/{domain => data}/storage/Storage.kt (88%) diff --git a/lib/src/main/java/space/taran/arklib/domain/Message.kt b/lib/src/main/java/space/taran/arklib/data/Message.kt similarity index 75% rename from lib/src/main/java/space/taran/arklib/domain/Message.kt rename to lib/src/main/java/space/taran/arklib/data/Message.kt index d05d30fc..b798bfb2 100644 --- a/lib/src/main/java/space/taran/arklib/domain/Message.kt +++ b/lib/src/main/java/space/taran/arklib/data/Message.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain +package space.taran.arklib.data import java.nio.file.Path diff --git a/lib/src/main/java/space/taran/arklib/domain/index/IndexAggregation.kt b/lib/src/main/java/space/taran/arklib/data/index/IndexAggregation.kt similarity index 97% rename from lib/src/main/java/space/taran/arklib/domain/index/IndexAggregation.kt rename to lib/src/main/java/space/taran/arklib/data/index/IndexAggregation.kt index ca46fd61..e988d340 100644 --- a/lib/src/main/java/space/taran/arklib/domain/index/IndexAggregation.kt +++ b/lib/src/main/java/space/taran/arklib/data/index/IndexAggregation.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.index +package space.taran.arklib.data.index import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.merge diff --git a/lib/src/main/java/space/taran/arklib/domain/index/IndexProjection.kt b/lib/src/main/java/space/taran/arklib/data/index/IndexProjection.kt similarity index 98% rename from lib/src/main/java/space/taran/arklib/domain/index/IndexProjection.kt rename to lib/src/main/java/space/taran/arklib/data/index/IndexProjection.kt index ba179103..02bc2d26 100644 --- a/lib/src/main/java/space/taran/arklib/domain/index/IndexProjection.kt +++ b/lib/src/main/java/space/taran/arklib/data/index/IndexProjection.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.index +package space.taran.arklib.data.index import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapNotNull diff --git a/lib/src/main/java/space/taran/arklib/domain/index/Resource.kt b/lib/src/main/java/space/taran/arklib/data/index/Resource.kt similarity index 96% rename from lib/src/main/java/space/taran/arklib/domain/index/Resource.kt rename to lib/src/main/java/space/taran/arklib/data/index/Resource.kt index 55f13e26..433f7c73 100644 --- a/lib/src/main/java/space/taran/arklib/domain/index/Resource.kt +++ b/lib/src/main/java/space/taran/arklib/data/index/Resource.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.index +package space.taran.arklib.data.index import space.taran.arklib.ResourceId import space.taran.arklib.utils.extension diff --git a/lib/src/main/java/space/taran/arklib/domain/index/ResourceIndex.kt b/lib/src/main/java/space/taran/arklib/data/index/ResourceIndex.kt similarity index 95% rename from lib/src/main/java/space/taran/arklib/domain/index/ResourceIndex.kt rename to lib/src/main/java/space/taran/arklib/data/index/ResourceIndex.kt index 46469b54..296a4c0c 100644 --- a/lib/src/main/java/space/taran/arklib/domain/index/ResourceIndex.kt +++ b/lib/src/main/java/space/taran/arklib/data/index/ResourceIndex.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.index +package space.taran.arklib.data.index import space.taran.arklib.ResourceId diff --git a/lib/src/main/java/space/taran/arklib/domain/index/ResourceIndexRepo.kt b/lib/src/main/java/space/taran/arklib/data/index/ResourceIndexRepo.kt similarity index 97% rename from lib/src/main/java/space/taran/arklib/domain/index/ResourceIndexRepo.kt rename to lib/src/main/java/space/taran/arklib/data/index/ResourceIndexRepo.kt index 82424d79..26953358 100644 --- a/lib/src/main/java/space/taran/arklib/domain/index/ResourceIndexRepo.kt +++ b/lib/src/main/java/space/taran/arklib/data/index/ResourceIndexRepo.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.index +package space.taran.arklib.data.index import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/lib/src/main/java/space/taran/arklib/domain/index/RootIndex.kt b/lib/src/main/java/space/taran/arklib/data/index/RootIndex.kt similarity index 99% rename from lib/src/main/java/space/taran/arklib/domain/index/RootIndex.kt rename to lib/src/main/java/space/taran/arklib/data/index/RootIndex.kt index e5d2abc2..1b499ed4 100644 --- a/lib/src/main/java/space/taran/arklib/domain/index/RootIndex.kt +++ b/lib/src/main/java/space/taran/arklib/data/index/RootIndex.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.index +package space.taran.arklib.data.index import android.util.Log import kotlinx.coroutines.Dispatchers diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/Metadata.kt b/lib/src/main/java/space/taran/arklib/data/meta/Metadata.kt similarity index 88% rename from lib/src/main/java/space/taran/arklib/domain/meta/Metadata.kt rename to lib/src/main/java/space/taran/arklib/data/meta/Metadata.kt index 76ea9a3a..56d4b16e 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/Metadata.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/Metadata.kt @@ -1,8 +1,8 @@ -package space.taran.arklib.domain.meta +package space.taran.arklib.data.meta import kotlinx.serialization.Serializable -import space.taran.arklib.domain.processor.AggregateProcessor -import space.taran.arklib.domain.processor.Processor +import space.taran.arklib.data.processor.AggregateProcessor +import space.taran.arklib.data.processor.Processor enum class Kind { IMAGE, VIDEO, DOCUMENT, LINK, PLAINTEXT, ARCHIVE, UNKNOWN diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/MetadataGenerator.kt b/lib/src/main/java/space/taran/arklib/data/meta/MetadataGenerator.kt similarity index 92% rename from lib/src/main/java/space/taran/arklib/domain/meta/MetadataGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/meta/MetadataGenerator.kt index cecc9003..4ebecc66 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/MetadataGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/MetadataGenerator.kt @@ -1,8 +1,8 @@ -package space.taran.arklib.domain.meta +package space.taran.arklib.data.meta import android.util.Log -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.generator.* +import space.taran.arklib.data.index.Resource +import space.taran.arklib.data.meta.generator.* import space.taran.arklib.utils.detectMimeType import space.taran.arklib.utils.extension import java.nio.file.Path diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/MetadataProcessorRepo.kt b/lib/src/main/java/space/taran/arklib/data/meta/MetadataProcessorRepo.kt similarity index 85% rename from lib/src/main/java/space/taran/arklib/domain/meta/MetadataProcessorRepo.kt rename to lib/src/main/java/space/taran/arklib/data/meta/MetadataProcessorRepo.kt index fb95a548..3a3a8931 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/MetadataProcessorRepo.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/MetadataProcessorRepo.kt @@ -1,8 +1,8 @@ -package space.taran.arklib.domain.meta +package space.taran.arklib.data.meta import kotlinx.coroutines.CoroutineScope -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex +import space.taran.arklib.data.index.ResourceIndex +import space.taran.arklib.data.index.RootIndex import java.nio.file.Path class MetadataProcessorRepo(private val scope: CoroutineScope) { diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/MetadataStorage.kt b/lib/src/main/java/space/taran/arklib/data/meta/MetadataStorage.kt similarity index 94% rename from lib/src/main/java/space/taran/arklib/domain/meta/MetadataStorage.kt rename to lib/src/main/java/space/taran/arklib/data/meta/MetadataStorage.kt index 0597ec9b..c4aa428b 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/MetadataStorage.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/MetadataStorage.kt @@ -1,12 +1,12 @@ -package space.taran.arklib.domain.meta +package space.taran.arklib.data.meta import kotlinx.coroutines.CoroutineScope import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive -import space.taran.arklib.domain.storage.FolderStorage -import space.taran.arklib.domain.storage.MonoidIsNotUsed +import space.taran.arklib.data.storage.FolderStorage +import space.taran.arklib.data.storage.MonoidIsNotUsed import java.nio.file.Path internal class MetadataStorage( diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/RootMetadataProcessor.kt b/lib/src/main/java/space/taran/arklib/data/meta/RootMetadataProcessor.kt similarity index 95% rename from lib/src/main/java/space/taran/arklib/domain/meta/RootMetadataProcessor.kt rename to lib/src/main/java/space/taran/arklib/data/meta/RootMetadataProcessor.kt index 3d4e96cf..0a25af3d 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/RootMetadataProcessor.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/RootMetadataProcessor.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.meta +package space.taran.arklib.data.meta import android.util.Log import kotlinx.coroutines.* @@ -6,9 +6,9 @@ import kotlinx.coroutines.flow.* import space.taran.arklib.ResourceId import space.taran.arklib.arkFolder import space.taran.arklib.arkMetadata -import space.taran.arklib.domain.index.NewResource -import space.taran.arklib.domain.index.RootIndex -import space.taran.arklib.domain.processor.RootProcessor +import space.taran.arklib.data.index.NewResource +import space.taran.arklib.data.index.RootIndex +import space.taran.arklib.data.processor.RootProcessor import java.nio.file.Path class MetadataUpdate( diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/generator/ArchiveMetadataGenerator.kt b/lib/src/main/java/space/taran/arklib/data/meta/generator/ArchiveMetadataGenerator.kt similarity index 78% rename from lib/src/main/java/space/taran/arklib/domain/meta/generator/ArchiveMetadataGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/meta/generator/ArchiveMetadataGenerator.kt index 48d8a932..cf1e3a07 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/generator/ArchiveMetadataGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/generator/ArchiveMetadataGenerator.kt @@ -1,8 +1,8 @@ -package space.taran.arklib.domain.meta.generator +package space.taran.arklib.data.meta.generator -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataGenerator +import space.taran.arklib.data.index.Resource +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.meta.MetadataGenerator import java.nio.file.Path object ArchiveMetadataGenerator: MetadataGenerator { diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/generator/DocumentMetadataGenerator.kt b/lib/src/main/java/space/taran/arklib/data/meta/generator/DocumentMetadataGenerator.kt similarity index 92% rename from lib/src/main/java/space/taran/arklib/domain/meta/generator/DocumentMetadataGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/meta/generator/DocumentMetadataGenerator.kt index 6b07570b..ca9a4222 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/generator/DocumentMetadataGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/generator/DocumentMetadataGenerator.kt @@ -1,10 +1,10 @@ -package space.taran.arklib.domain.meta.generator +package space.taran.arklib.data.meta.generator import android.graphics.pdf.PdfRenderer import android.os.ParcelFileDescriptor -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataGenerator +import space.taran.arklib.data.index.Resource +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.meta.MetadataGenerator import space.taran.arklib.utils.detectMimeType import space.taran.arklib.utils.extension import java.io.FileNotFoundException diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/generator/ImageMetadataGenerator.kt b/lib/src/main/java/space/taran/arklib/data/meta/generator/ImageMetadataGenerator.kt similarity index 78% rename from lib/src/main/java/space/taran/arklib/domain/meta/generator/ImageMetadataGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/meta/generator/ImageMetadataGenerator.kt index cf1077b8..97fee8f7 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/generator/ImageMetadataGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/generator/ImageMetadataGenerator.kt @@ -1,8 +1,8 @@ -package space.taran.arklib.domain.meta.generator +package space.taran.arklib.data.meta.generator -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataGenerator +import space.taran.arklib.data.index.Resource +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.meta.MetadataGenerator import java.nio.file.Path object ImageMetadataGenerator: MetadataGenerator { diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/generator/LinkMetadataGenerator.kt b/lib/src/main/java/space/taran/arklib/data/meta/generator/LinkMetadataGenerator.kt similarity index 63% rename from lib/src/main/java/space/taran/arklib/domain/meta/generator/LinkMetadataGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/meta/generator/LinkMetadataGenerator.kt index 00f48eb6..c4205ef9 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/generator/LinkMetadataGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/generator/LinkMetadataGenerator.kt @@ -1,8 +1,8 @@ -package space.taran.arklib.domain.meta.generator +package space.taran.arklib.data.meta.generator -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataGenerator +import space.taran.arklib.data.index.Resource +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.meta.MetadataGenerator import java.nio.file.Path object LinkMetadataGenerator: MetadataGenerator { diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/generator/PlainTextMetadataGenerator.kt b/lib/src/main/java/space/taran/arklib/data/meta/generator/PlainTextMetadataGenerator.kt similarity index 67% rename from lib/src/main/java/space/taran/arklib/domain/meta/generator/PlainTextMetadataGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/meta/generator/PlainTextMetadataGenerator.kt index 393f6543..f6b976ba 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/generator/PlainTextMetadataGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/generator/PlainTextMetadataGenerator.kt @@ -1,8 +1,8 @@ -package space.taran.arklib.domain.meta.generator +package space.taran.arklib.data.meta.generator -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataGenerator +import space.taran.arklib.data.index.Resource +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.meta.MetadataGenerator import java.nio.file.Path object PlainTextMetadataGenerator: MetadataGenerator { diff --git a/lib/src/main/java/space/taran/arklib/domain/meta/generator/VideoMetadataGenerator.kt b/lib/src/main/java/space/taran/arklib/data/meta/generator/VideoMetadataGenerator.kt similarity index 88% rename from lib/src/main/java/space/taran/arklib/domain/meta/generator/VideoMetadataGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/meta/generator/VideoMetadataGenerator.kt index 3dd3c439..f2dc4bf8 100644 --- a/lib/src/main/java/space/taran/arklib/domain/meta/generator/VideoMetadataGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/meta/generator/VideoMetadataGenerator.kt @@ -1,10 +1,10 @@ -package space.taran.arklib.domain.meta.generator +package space.taran.arklib.data.meta.generator import android.net.Uri import space.taran.arklib.app -import space.taran.arklib.domain.index.Resource -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.meta.MetadataGenerator +import space.taran.arklib.data.index.Resource +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.meta.MetadataGenerator import wseemann.media.FFmpegMediaMetadataRetriever import java.nio.file.Path diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/Preview.kt b/lib/src/main/java/space/taran/arklib/data/preview/Preview.kt similarity index 95% rename from lib/src/main/java/space/taran/arklib/domain/preview/Preview.kt rename to lib/src/main/java/space/taran/arklib/data/preview/Preview.kt index 1f2547a1..150320c1 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/Preview.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/Preview.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.preview +package space.taran.arklib.data.preview import android.graphics.Bitmap import com.bumptech.glide.Glide @@ -9,8 +9,8 @@ import com.bumptech.glide.request.RequestOptions import kotlinx.coroutines.Job import space.taran.arklib.* import space.taran.arklib.app -import space.taran.arklib.domain.processor.AggregateProcessor -import space.taran.arklib.domain.processor.Processor +import space.taran.arklib.data.processor.AggregateProcessor +import space.taran.arklib.data.processor.Processor import space.taran.arklib.utils.ImageUtils import java.nio.file.Path import kotlin.io.path.deleteIfExists diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/PreviewGenerator.kt b/lib/src/main/java/space/taran/arklib/data/preview/PreviewGenerator.kt similarity index 76% rename from lib/src/main/java/space/taran/arklib/domain/preview/PreviewGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/preview/PreviewGenerator.kt index ff972fad..d9f54991 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/PreviewGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/PreviewGenerator.kt @@ -1,11 +1,11 @@ -package space.taran.arklib.domain.preview +package space.taran.arklib.data.preview import android.util.Log -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.preview.generator.ImagePreviewGenerator -import space.taran.arklib.domain.preview.generator.PdfPreviewGenerator -import space.taran.arklib.domain.preview.generator.TxtPreviewGenerator -import space.taran.arklib.domain.preview.generator.VideoPreviewGenerator +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.preview.generator.ImagePreviewGenerator +import space.taran.arklib.data.preview.generator.PdfPreviewGenerator +import space.taran.arklib.data.preview.generator.TxtPreviewGenerator +import space.taran.arklib.data.preview.generator.VideoPreviewGenerator import java.nio.file.Path import kotlin.system.measureTimeMillis diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/PreviewProcessorRepo.kt b/lib/src/main/java/space/taran/arklib/data/preview/PreviewProcessorRepo.kt similarity index 81% rename from lib/src/main/java/space/taran/arklib/domain/preview/PreviewProcessorRepo.kt rename to lib/src/main/java/space/taran/arklib/data/preview/PreviewProcessorRepo.kt index 184c9989..5ad18a3a 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/PreviewProcessorRepo.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/PreviewProcessorRepo.kt @@ -1,10 +1,10 @@ -package space.taran.arklib.domain.preview +package space.taran.arklib.data.preview import kotlinx.coroutines.CoroutineScope -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex -import space.taran.arklib.domain.meta.MetadataProcessorRepo -import space.taran.arklib.domain.meta.RootMetadataProcessor +import space.taran.arklib.data.index.ResourceIndex +import space.taran.arklib.data.index.RootIndex +import space.taran.arklib.data.meta.MetadataProcessorRepo +import space.taran.arklib.data.meta.RootMetadataProcessor import java.nio.file.Path class PreviewProcessorRepo( diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/RootPreviewProcessor.kt b/lib/src/main/java/space/taran/arklib/data/preview/RootPreviewProcessor.kt similarity index 95% rename from lib/src/main/java/space/taran/arklib/domain/preview/RootPreviewProcessor.kt rename to lib/src/main/java/space/taran/arklib/data/preview/RootPreviewProcessor.kt index 6df4b1e5..0221e3f0 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/RootPreviewProcessor.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/RootPreviewProcessor.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.preview +package space.taran.arklib.data.preview import android.util.Log import kotlinx.coroutines.CoroutineScope @@ -9,10 +9,10 @@ import kotlinx.coroutines.joinAll import kotlinx.coroutines.launch import kotlinx.coroutines.plus import space.taran.arklib.* -import space.taran.arklib.domain.index.RootIndex -import space.taran.arklib.domain.meta.* -import space.taran.arklib.domain.processor.RootProcessor -import space.taran.arklib.domain.storage.BitmapStorage +import space.taran.arklib.data.index.RootIndex +import space.taran.arklib.data.meta.* +import space.taran.arklib.data.processor.RootProcessor +import space.taran.arklib.data.storage.BitmapStorage import java.nio.file.Path import java.util.concurrent.ConcurrentHashMap diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/generator/ImagePreviewGenerator.kt b/lib/src/main/java/space/taran/arklib/data/preview/generator/ImagePreviewGenerator.kt similarity index 67% rename from lib/src/main/java/space/taran/arklib/domain/preview/generator/ImagePreviewGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/preview/generator/ImagePreviewGenerator.kt index 423adbb0..74c148f1 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/generator/ImagePreviewGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/generator/ImagePreviewGenerator.kt @@ -1,11 +1,11 @@ -package space.taran.arklib.domain.preview.generator +package space.taran.arklib.data.preview.generator import com.bumptech.glide.Glide import space.taran.arklib.app -import space.taran.arklib.domain.meta.Kind -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.preview.Preview -import space.taran.arklib.domain.preview.PreviewGenerator +import space.taran.arklib.data.meta.Kind +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.preview.Preview +import space.taran.arklib.data.preview.PreviewGenerator import java.nio.file.Path object ImagePreviewGenerator: PreviewGenerator { diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/generator/PdfPreviewGenerator.kt b/lib/src/main/java/space/taran/arklib/data/preview/generator/PdfPreviewGenerator.kt similarity index 78% rename from lib/src/main/java/space/taran/arklib/domain/preview/generator/PdfPreviewGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/preview/generator/PdfPreviewGenerator.kt index 328052d6..5f38753e 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/generator/PdfPreviewGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/generator/PdfPreviewGenerator.kt @@ -1,12 +1,12 @@ -package space.taran.arklib.domain.preview.generator +package space.taran.arklib.data.preview.generator import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import space.taran.arklib.PreviewQuality -import space.taran.arklib.domain.meta.Kind -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.preview.Preview -import space.taran.arklib.domain.preview.PreviewGenerator +import space.taran.arklib.data.meta.Kind +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.preview.Preview +import space.taran.arklib.data.preview.PreviewGenerator import space.taran.arklib.pdfPreviewGenerate import java.nio.file.Path diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/generator/TxtPreviewGenerator.kt b/lib/src/main/java/space/taran/arklib/data/preview/generator/TxtPreviewGenerator.kt similarity index 88% rename from lib/src/main/java/space/taran/arklib/domain/preview/generator/TxtPreviewGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/preview/generator/TxtPreviewGenerator.kt index f6bdbe8a..c995cc0b 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/generator/TxtPreviewGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/generator/TxtPreviewGenerator.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.preview.generator +package space.taran.arklib.data.preview.generator import android.graphics.Bitmap import android.graphics.Canvas @@ -8,10 +8,10 @@ import android.text.Layout import android.text.StaticLayout import android.text.TextPaint import space.taran.arklib.app -import space.taran.arklib.domain.meta.Kind -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.preview.Preview -import space.taran.arklib.domain.preview.PreviewGenerator +import space.taran.arklib.data.meta.Kind +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.preview.Preview +import space.taran.arklib.data.preview.PreviewGenerator import java.nio.file.Path import kotlin.io.path.readLines diff --git a/lib/src/main/java/space/taran/arklib/domain/preview/generator/VideoPreviewGenerator.kt b/lib/src/main/java/space/taran/arklib/data/preview/generator/VideoPreviewGenerator.kt similarity index 92% rename from lib/src/main/java/space/taran/arklib/domain/preview/generator/VideoPreviewGenerator.kt rename to lib/src/main/java/space/taran/arklib/data/preview/generator/VideoPreviewGenerator.kt index c3311778..6e81315d 100644 --- a/lib/src/main/java/space/taran/arklib/domain/preview/generator/VideoPreviewGenerator.kt +++ b/lib/src/main/java/space/taran/arklib/data/preview/generator/VideoPreviewGenerator.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.preview.generator +package space.taran.arklib.data.preview.generator import android.graphics.Bitmap import android.media.MediaMetadataRetriever @@ -7,10 +7,10 @@ import android.util.Log import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy import space.taran.arklib.app -import space.taran.arklib.domain.meta.Kind -import space.taran.arklib.domain.meta.Metadata -import space.taran.arklib.domain.preview.Preview -import space.taran.arklib.domain.preview.PreviewGenerator +import space.taran.arklib.data.meta.Kind +import space.taran.arklib.data.meta.Metadata +import space.taran.arklib.data.preview.Preview +import space.taran.arklib.data.preview.PreviewGenerator import java.nio.file.Path import kotlin.io.path.name import wseemann.media.FFmpegMediaMetadataRetriever diff --git a/lib/src/main/java/space/taran/arklib/domain/processor/AggregateProcessor.kt b/lib/src/main/java/space/taran/arklib/data/processor/AggregateProcessor.kt similarity index 94% rename from lib/src/main/java/space/taran/arklib/domain/processor/AggregateProcessor.kt rename to lib/src/main/java/space/taran/arklib/data/processor/AggregateProcessor.kt index c34fc898..f1482c91 100644 --- a/lib/src/main/java/space/taran/arklib/domain/processor/AggregateProcessor.kt +++ b/lib/src/main/java/space/taran/arklib/data/processor/AggregateProcessor.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.processor +package space.taran.arklib.data.processor import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow @@ -6,7 +6,7 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.RootIndex +import space.taran.arklib.data.index.RootIndex class AggregateProcessor private constructor( private val scope: CoroutineScope, diff --git a/lib/src/main/java/space/taran/arklib/domain/processor/Processor.kt b/lib/src/main/java/space/taran/arklib/data/processor/Processor.kt similarity index 92% rename from lib/src/main/java/space/taran/arklib/domain/processor/Processor.kt rename to lib/src/main/java/space/taran/arklib/data/processor/Processor.kt index bb94d5e2..43fb1fe2 100644 --- a/lib/src/main/java/space/taran/arklib/domain/processor/Processor.kt +++ b/lib/src/main/java/space/taran/arklib/data/processor/Processor.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.processor +package space.taran.arklib.data.processor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/lib/src/main/java/space/taran/arklib/domain/processor/RootProcessor.kt b/lib/src/main/java/space/taran/arklib/data/processor/RootProcessor.kt similarity index 87% rename from lib/src/main/java/space/taran/arklib/domain/processor/RootProcessor.kt rename to lib/src/main/java/space/taran/arklib/data/processor/RootProcessor.kt index dae070bd..186c3eb3 100644 --- a/lib/src/main/java/space/taran/arklib/domain/processor/RootProcessor.kt +++ b/lib/src/main/java/space/taran/arklib/data/processor/RootProcessor.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.processor +package space.taran.arklib.data.processor import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/lib/src/main/java/space/taran/arklib/domain/stats/StatsEvent.kt b/lib/src/main/java/space/taran/arklib/data/stats/StatsEvent.kt similarity index 83% rename from lib/src/main/java/space/taran/arklib/domain/stats/StatsEvent.kt rename to lib/src/main/java/space/taran/arklib/data/stats/StatsEvent.kt index f41fa8f3..d1fb5d4c 100644 --- a/lib/src/main/java/space/taran/arklib/domain/stats/StatsEvent.kt +++ b/lib/src/main/java/space/taran/arklib/data/stats/StatsEvent.kt @@ -1,7 +1,7 @@ -package space.taran.arklib.domain.stats +package space.taran.arklib.data.stats import space.taran.arklib.ResourceId -import space.taran.arklib.domain.meta.Kind +import space.taran.arklib.data.meta.Kind import space.taran.arklib.user.tags.Tag import space.taran.arklib.user.tags.Tags diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/AggregateStorage.kt b/lib/src/main/java/space/taran/arklib/data/storage/AggregateStorage.kt similarity index 84% rename from lib/src/main/java/space/taran/arklib/domain/storage/AggregateStorage.kt rename to lib/src/main/java/space/taran/arklib/data/storage/AggregateStorage.kt index 8c5ca26d..cefd1a0d 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/AggregateStorage.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/AggregateStorage.kt @@ -1,8 +1,7 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex +import space.taran.arklib.data.index.RootIndex open class AggregateStorage( private val monoid: Monoid, diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/BaseStorage.kt b/lib/src/main/java/space/taran/arklib/data/storage/BaseStorage.kt similarity index 99% rename from lib/src/main/java/space/taran/arklib/domain/storage/BaseStorage.kt rename to lib/src/main/java/space/taran/arklib/data/storage/BaseStorage.kt index 0cc83c04..4fd5cae9 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/BaseStorage.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/BaseStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage import android.util.Log import kotlinx.coroutines.CoroutineScope diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/BitmapStorage.kt b/lib/src/main/java/space/taran/arklib/data/storage/BitmapStorage.kt similarity index 91% rename from lib/src/main/java/space/taran/arklib/domain/storage/BitmapStorage.kt rename to lib/src/main/java/space/taran/arklib/data/storage/BitmapStorage.kt index a5149c62..401b0226 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/BitmapStorage.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/BitmapStorage.kt @@ -1,11 +1,11 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage import android.graphics.Bitmap import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import space.taran.arklib.ResourceId -import space.taran.arklib.domain.preview.Preview +import space.taran.arklib.data.preview.Preview import java.io.ByteArrayOutputStream import java.nio.file.Files import java.nio.file.Path diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/FileStorage.kt b/lib/src/main/java/space/taran/arklib/data/storage/FileStorage.kt similarity index 99% rename from lib/src/main/java/space/taran/arklib/domain/storage/FileStorage.kt rename to lib/src/main/java/space/taran/arklib/data/storage/FileStorage.kt index 60a56d6a..c69f2758 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/FileStorage.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/FileStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage import android.util.Log import kotlinx.coroutines.CoroutineScope diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/FolderStorage.kt b/lib/src/main/java/space/taran/arklib/data/storage/FolderStorage.kt similarity index 99% rename from lib/src/main/java/space/taran/arklib/domain/storage/FolderStorage.kt rename to lib/src/main/java/space/taran/arklib/data/storage/FolderStorage.kt index d03a63e3..b95d752c 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/FolderStorage.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/FolderStorage.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage import android.util.Log import kotlinx.coroutines.CoroutineScope diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/Monoid.kt b/lib/src/main/java/space/taran/arklib/data/storage/Monoid.kt similarity index 93% rename from lib/src/main/java/space/taran/arklib/domain/storage/Monoid.kt rename to lib/src/main/java/space/taran/arklib/data/storage/Monoid.kt index 11898dc6..640a82af 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/Monoid.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/Monoid.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage interface Monoid { /* Default value, e.g. empty set or 0, must not be diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/MonoidIsNotUsed.kt b/lib/src/main/java/space/taran/arklib/data/storage/MonoidIsNotUsed.kt similarity index 96% rename from lib/src/main/java/space/taran/arklib/domain/storage/MonoidIsNotUsed.kt rename to lib/src/main/java/space/taran/arklib/data/storage/MonoidIsNotUsed.kt index 5da47232..7e9f77c5 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/MonoidIsNotUsed.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/MonoidIsNotUsed.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage /* * Bogus instance of Monoid, used as a stub for diff --git a/lib/src/main/java/space/taran/arklib/domain/storage/Storage.kt b/lib/src/main/java/space/taran/arklib/data/storage/Storage.kt similarity index 88% rename from lib/src/main/java/space/taran/arklib/domain/storage/Storage.kt rename to lib/src/main/java/space/taran/arklib/data/storage/Storage.kt index af431dd3..8fdf161d 100644 --- a/lib/src/main/java/space/taran/arklib/domain/storage/Storage.kt +++ b/lib/src/main/java/space/taran/arklib/data/storage/Storage.kt @@ -1,4 +1,4 @@ -package space.taran.arklib.domain.storage +package space.taran.arklib.data.storage import space.taran.arklib.ResourceId diff --git a/lib/src/main/java/space/taran/arklib/user/properties/Properties.kt b/lib/src/main/java/space/taran/arklib/user/properties/Properties.kt index 9f348ad0..04461301 100644 --- a/lib/src/main/java/space/taran/arklib/user/properties/Properties.kt +++ b/lib/src/main/java/space/taran/arklib/user/properties/Properties.kt @@ -2,7 +2,7 @@ package space.taran.arklib.user.properties import android.util.Log import kotlinx.serialization.Serializable -import space.taran.arklib.domain.storage.Monoid +import space.taran.arklib.data.storage.Monoid @Serializable class Properties( diff --git a/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorage.kt b/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorage.kt index d6ce71c6..f8a0fd66 100644 --- a/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorage.kt +++ b/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorage.kt @@ -1,9 +1,9 @@ package space.taran.arklib.user.properties import space.taran.arklib.ResourceId -import space.taran.arklib.domain.storage.AggregateStorage -import space.taran.arklib.domain.storage.Storage -import space.taran.arklib.domain.index.RootIndex +import space.taran.arklib.data.index.RootIndex +import space.taran.arklib.data.storage.AggregateStorage +import space.taran.arklib.data.storage.Storage interface PropertiesStorage: Storage { diff --git a/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorageRepo.kt b/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorageRepo.kt index ed4f21f9..d73ba64e 100644 --- a/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorageRepo.kt +++ b/lib/src/main/java/space/taran/arklib/user/properties/PropertiesStorageRepo.kt @@ -1,8 +1,8 @@ package space.taran.arklib.user.properties import kotlinx.coroutines.CoroutineScope -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex +import space.taran.arklib.data.index.ResourceIndex +import space.taran.arklib.data.index.RootIndex import java.nio.file.Path class PropertiesStorageRepo(private val scope: CoroutineScope) { diff --git a/lib/src/main/java/space/taran/arklib/user/properties/RootPropertiesStorage.kt b/lib/src/main/java/space/taran/arklib/user/properties/RootPropertiesStorage.kt index 70574807..36082d3a 100644 --- a/lib/src/main/java/space/taran/arklib/user/properties/RootPropertiesStorage.kt +++ b/lib/src/main/java/space/taran/arklib/user/properties/RootPropertiesStorage.kt @@ -5,7 +5,7 @@ import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import space.taran.arklib.arkFolder import space.taran.arklib.arkProperties -import space.taran.arklib.domain.storage.FolderStorage +import space.taran.arklib.data.storage.FolderStorage import java.nio.file.Path class RootPropertiesStorage( diff --git a/lib/src/main/java/space/taran/arklib/user/score/RootScoreStorage.kt b/lib/src/main/java/space/taran/arklib/user/score/RootScoreStorage.kt index 67d094f1..bb8b0188 100644 --- a/lib/src/main/java/space/taran/arklib/user/score/RootScoreStorage.kt +++ b/lib/src/main/java/space/taran/arklib/user/score/RootScoreStorage.kt @@ -3,7 +3,7 @@ package space.taran.arklib.user.score import kotlinx.coroutines.CoroutineScope import space.taran.arklib.arkFolder import space.taran.arklib.arkScores -import space.taran.arklib.domain.storage.FileStorage +import space.taran.arklib.data.storage.FileStorage import java.nio.file.Path class RootScoreStorage( diff --git a/lib/src/main/java/space/taran/arklib/user/score/Score.kt b/lib/src/main/java/space/taran/arklib/user/score/Score.kt index 02f6a13a..106a2f9c 100644 --- a/lib/src/main/java/space/taran/arklib/user/score/Score.kt +++ b/lib/src/main/java/space/taran/arklib/user/score/Score.kt @@ -1,7 +1,7 @@ package space.taran.arklib.user.score import android.util.Log -import space.taran.arklib.domain.storage.Monoid +import space.taran.arklib.data.storage.Monoid import java.lang.Math.abs typealias Score = Int diff --git a/lib/src/main/java/space/taran/arklib/user/score/ScoreStorage.kt b/lib/src/main/java/space/taran/arklib/user/score/ScoreStorage.kt index f7f80396..daa2fc7f 100644 --- a/lib/src/main/java/space/taran/arklib/user/score/ScoreStorage.kt +++ b/lib/src/main/java/space/taran/arklib/user/score/ScoreStorage.kt @@ -1,10 +1,10 @@ package space.taran.arklib.user.score import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex -import space.taran.arklib.domain.storage.AggregateStorage -import space.taran.arklib.domain.storage.Storage +import space.taran.arklib.data.index.ResourceIndex +import space.taran.arklib.data.index.RootIndex +import space.taran.arklib.data.storage.AggregateStorage +import space.taran.arklib.data.storage.Storage interface ScoreStorage: Storage { @@ -20,4 +20,4 @@ interface ScoreStorage: Storage { class AggregateScoreStorage( shards: Collection> -): AggregateStorage(ScoreMonoid, shards), ScoreStorage \ No newline at end of file +): AggregateStorage(ScoreMonoid, shards), ScoreStorage diff --git a/lib/src/main/java/space/taran/arklib/user/score/ScoreStorageRepo.kt b/lib/src/main/java/space/taran/arklib/user/score/ScoreStorageRepo.kt index 46ddaf8b..407b397b 100644 --- a/lib/src/main/java/space/taran/arklib/user/score/ScoreStorageRepo.kt +++ b/lib/src/main/java/space/taran/arklib/user/score/ScoreStorageRepo.kt @@ -1,8 +1,8 @@ package space.taran.arklib.user.score import kotlinx.coroutines.CoroutineScope -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex +import space.taran.arklib.data.index.ResourceIndex +import space.taran.arklib.data.index.RootIndex import java.nio.file.Path class ScoreStorageRepo(private val scope: CoroutineScope) { diff --git a/lib/src/main/java/space/taran/arklib/user/tags/RootTagsStorage.kt b/lib/src/main/java/space/taran/arklib/user/tags/RootTagsStorage.kt index 9127c28f..e530db99 100644 --- a/lib/src/main/java/space/taran/arklib/user/tags/RootTagsStorage.kt +++ b/lib/src/main/java/space/taran/arklib/user/tags/RootTagsStorage.kt @@ -1,14 +1,13 @@ package space.taran.arklib.user.tags import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch import space.taran.arklib.ResourceId import space.taran.arklib.arkFolder import space.taran.arklib.arkTags -import space.taran.arklib.domain.stats.StatsEvent -import space.taran.arklib.domain.storage.FileStorage +import space.taran.arklib.data.stats.StatsEvent +import space.taran.arklib.data.storage.FileStorage import java.nio.file.Path class RootTagsStorage( diff --git a/lib/src/main/java/space/taran/arklib/user/tags/TagStorage.kt b/lib/src/main/java/space/taran/arklib/user/tags/TagStorage.kt index d36cd007..b55e7a62 100644 --- a/lib/src/main/java/space/taran/arklib/user/tags/TagStorage.kt +++ b/lib/src/main/java/space/taran/arklib/user/tags/TagStorage.kt @@ -1,10 +1,10 @@ package space.taran.arklib.user.tags import space.taran.arklib.ResourceId -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex -import space.taran.arklib.domain.storage.AggregateStorage -import space.taran.arklib.domain.storage.Storage +import space.taran.arklib.data.index.ResourceIndex +import space.taran.arklib.data.index.RootIndex +import space.taran.arklib.data.storage.AggregateStorage +import space.taran.arklib.data.storage.Storage interface TagStorage: Storage { @@ -23,4 +23,4 @@ interface TagStorage: Storage { class AggregateTagStorage( shards: Collection> -): AggregateStorage(TagsMonoid, shards), TagStorage \ No newline at end of file +): AggregateStorage(TagsMonoid, shards), TagStorage diff --git a/lib/src/main/java/space/taran/arklib/user/tags/TagStorageRepo.kt b/lib/src/main/java/space/taran/arklib/user/tags/TagStorageRepo.kt index 2e535574..aaa7fb2d 100644 --- a/lib/src/main/java/space/taran/arklib/user/tags/TagStorageRepo.kt +++ b/lib/src/main/java/space/taran/arklib/user/tags/TagStorageRepo.kt @@ -2,9 +2,9 @@ package space.taran.arklib.user.tags import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableSharedFlow -import space.taran.arklib.domain.index.ResourceIndex -import space.taran.arklib.domain.index.RootIndex -import space.taran.arklib.domain.stats.StatsEvent +import space.taran.arklib.data.index.ResourceIndex +import space.taran.arklib.data.index.RootIndex +import space.taran.arklib.data.stats.StatsEvent import java.nio.file.Path class TagsStorageRepo( diff --git a/lib/src/main/java/space/taran/arklib/user/tags/Tags.kt b/lib/src/main/java/space/taran/arklib/user/tags/Tags.kt index a65190d4..dc64da14 100644 --- a/lib/src/main/java/space/taran/arklib/user/tags/Tags.kt +++ b/lib/src/main/java/space/taran/arklib/user/tags/Tags.kt @@ -1,7 +1,7 @@ package space.taran.arklib.user.tags import android.util.Log -import space.taran.arklib.domain.storage.Monoid +import space.taran.arklib.data.storage.Monoid typealias Tag = String