@datatruck/cli 0.12.1 → 0.14.0

package/Command/BackupCommand.js

@@ -67,6 +67,8 @@ class BackupCommand extends CommandAbstract_1.CommandAbstract {
             altDrivers: [
                 new ConsoleSessionDriver_1.ConsoleSessionDriver({
                     verbose: verbose > 0,
+                    progress: this.globalOptions.progress,
+                    progressInterval: this.globalOptions.progressInterval,
                 }),
             ],
         });

package/Command/CommandAbstract.d.ts

@@ -6,6 +6,8 @@ export declare type GlobalOptionsType<TResolved = false> = {
     config: string | ConfigType;
     outputFormat?: FormatType;
     verbose?: number;
+    progress?: "auto" | "plain" | "tty";
+    progressInterval?: number;
 };
 export declare type CommandConstructorType<TUnresolvedOptions, TOptions extends SimilarObject<TUnresolvedOptions>> = {
     new (globalOptions: GlobalOptionsType<true>, options: TOptions): CommandAbstract<TUnresolvedOptions, TOptions>;

package/Command/RestoreCommand.js

@@ -67,6 +67,8 @@ class RestoreCommand extends CommandAbstract_1.CommandAbstract {
             altDrivers: [
                 new ConsoleSessionDriver_1.ConsoleSessionDriver({
                     verbose: verbose > 0,
+                    progress: this.globalOptions.progress,
+                    progressInterval: this.globalOptions.progressInterval,
                 }),
             ],
             verbose: verbose > 1,

package/Command/SnapshotsCommand.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SnapshotsCommand = void 0;
 const ConfigAction_1 = require("../Action/ConfigAction");
@@ -6,6 +9,7 @@ const SnapshotsAction_1 = require("../Action/SnapshotsAction");
 const DataFormat_1 = require("../util/DataFormat");
 const string_util_1 = require("../util/string-util");
 const CommandAbstract_1 = require("./CommandAbstract");
+const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
 class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
     onOptions() {
         const groupByValues = ["packageName", "repositoryName", "repositoryType"];
@@ -120,6 +124,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                     "Date",
                     "Package",
                     "Task",
+                    "Size",
                     "Repository",
                     "Repository type",
                 ],
@@ -128,6 +133,7 @@ class SnapshotsCommand extends CommandAbstract_1.CommandAbstract {
                     item.date.replace("T", " ").replace("Z", ""),
                     item.packageName,
                     item.packageTaskName || "",
+                    (0, pretty_bytes_1.default)(item.size),
                     item.repositoryName,
                     item.repositoryType,
                 ],

package/Config/PackageRepositoryConfig.d.ts

@@ -1,5 +1,5 @@
+import { DatatruckPackageRepositoryConfigType, datatruckRepositoryName } from "../Repository/DatatruckRepository";
 import { GitPackageRepositoryConfigType, gitRepositoryName } from "../Repository/GitRepository";
-import { LocalPackageRepositoryConfigType, localRepositoryName } from "../Repository/LocalRepository";
 import { ResticPackageRepositoryConfigType, resticRepositoryName } from "../Repository/ResticRepository";
 import type { JSONSchema7 } from "json-schema";
 export declare const packageRepositoryConfigDefinition: JSONSchema7;
@@ -9,8 +9,8 @@ export declare type PackageRepositoryConfigType = {
     type: typeof resticRepositoryName;
     config: ResticPackageRepositoryConfigType;
 } | {
-    type: typeof localRepositoryName;
-    config: LocalPackageRepositoryConfigType;
+    type: typeof datatruckRepositoryName;
+    config: DatatruckPackageRepositoryConfigType;
 } | {
     type: typeof gitRepositoryName;
     config: GitPackageRepositoryConfigType;

package/Config/PackageRepositoryConfig.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageRepositoryConfigDefinition = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 const types = {
     [ResticRepository_1.resticRepositoryName]: DefinitionEnum_1.DefinitionEnum.resticPackageRepository,
-    [LocalRepository_1.localRepositoryName]: DefinitionEnum_1.DefinitionEnum.localPackageRepository,
+    [DatatruckRepository_1.datatruckRepositoryName]: DefinitionEnum_1.DefinitionEnum.datatruckPackageRepository,
     [GitRepository_1.gitRepositoryName]: DefinitionEnum_1.DefinitionEnum.gitPackageRepository,
 };
 exports.packageRepositoryConfigDefinition = {

package/Config/RepositoryConfig.d.ts

@@ -1,5 +1,5 @@
+import { DatatruckRepositoryConfigType, datatruckRepositoryName } from "../Repository/DatatruckRepository";
 import { GitRepositoryConfigType, gitRepositoryName } from "../Repository/GitRepository";
-import { LocalRepositoryConfigType, localRepositoryName } from "../Repository/LocalRepository";
 import { ResticRepositoryConfigType, resticRepositoryName } from "../Repository/ResticRepository";
 import type { JSONSchema7 } from "json-schema";
 export declare const repositoryConfigDefinition: JSONSchema7;
@@ -15,8 +15,8 @@ export declare type RepositoryConfigType = {
     type: typeof resticRepositoryName;
     config: ResticRepositoryConfigType;
 } | {
-    type: typeof localRepositoryName;
-    config: LocalRepositoryConfigType;
+    type: typeof datatruckRepositoryName;
+    config: DatatruckRepositoryConfigType;
 } | {
     type: typeof gitRepositoryName;
     config: GitRepositoryConfigType;

package/Config/RepositoryConfig.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repositoryConfigDefinition = void 0;
 const DefinitionEnum_1 = require("../JsonSchema/DefinitionEnum");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 const types = {
     [ResticRepository_1.resticRepositoryName]: DefinitionEnum_1.DefinitionEnum.resticRepository,
-    [LocalRepository_1.localRepositoryName]: DefinitionEnum_1.DefinitionEnum.localRepository,
+    [DatatruckRepository_1.datatruckRepositoryName]: DefinitionEnum_1.DefinitionEnum.datatruckRepository,
     [GitRepository_1.gitRepositoryName]: DefinitionEnum_1.DefinitionEnum.gitRepository,
 };
 exports.repositoryConfigDefinition = {

package/Factory/RepositoryFactory.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RepositoryFactory = void 0;
 const AppError_1 = require("../Error/AppError");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 function RepositoryFactory(repository) {
     const type = repository.type;
@@ -13,8 +13,8 @@ function RepositoryFactory(repository) {
     else if (type === ResticRepository_1.resticRepositoryName) {
         return new ResticRepository_1.ResticRepository(repository);
     }
-    else if (type === LocalRepository_1.localRepositoryName) {
-        return new LocalRepository_1.LocalRepository(repository);
+    else if (type === DatatruckRepository_1.datatruckRepositoryName) {
+        return new DatatruckRepository_1.DatatruckRepository(repository);
     }
     else {
         throw new AppError_1.AppError(`Invalid repository type: ${type}`);

package/JsonSchema/DefinitionEnum.d.ts

@@ -6,8 +6,8 @@ export declare enum DefinitionEnum {
     task = "task",
     resticRepository = "restic-repository",
     resticPackageRepository = "restic-package-repository",
-    localRepository = "local-repository",
-    localPackageRepository = "local-package-repository",
+    datatruckRepository = "datatruck-repository",
+    datatruckPackageRepository = "datatruck-package-repository",
     gitRepository = "git-repository",
     gitPackageRepository = "git-package-repository",
     gitTask = "git-task",

package/JsonSchema/DefinitionEnum.js

@@ -10,8 +10,8 @@ var DefinitionEnum;
     DefinitionEnum["task"] = "task";
     DefinitionEnum["resticRepository"] = "restic-repository";
     DefinitionEnum["resticPackageRepository"] = "restic-package-repository";
-    DefinitionEnum["localRepository"] = "local-repository";
-    DefinitionEnum["localPackageRepository"] = "local-package-repository";
+    DefinitionEnum["datatruckRepository"] = "datatruck-repository";
+    DefinitionEnum["datatruckPackageRepository"] = "datatruck-package-repository";
     DefinitionEnum["gitRepository"] = "git-repository";
     DefinitionEnum["gitPackageRepository"] = "git-package-repository";
     DefinitionEnum["gitTask"] = "git-task";

package/JsonSchema/JsonSchema.js

@@ -7,8 +7,8 @@ const PackageRepositoryConfig_1 = require("../Config/PackageRepositoryConfig");
 const PrunePolicyConfig_1 = require("../Config/PrunePolicyConfig");
 const RepositoryConfig_1 = require("../Config/RepositoryConfig");
 const TaskConfig_1 = require("../Config/TaskConfig");
+const DatatruckRepository_1 = require("../Repository/DatatruckRepository");
 const GitRepository_1 = require("../Repository/GitRepository");
-const LocalRepository_1 = require("../Repository/LocalRepository");
 const ResticRepository_1 = require("../Repository/ResticRepository");
 const GitTask_1 = require("../Task/GitTask");
 const MariadbTask_1 = require("../Task/MariadbTask");
@@ -31,8 +31,8 @@ exports.definitions = {
     [DefinitionEnum_1.DefinitionEnum.task]: TaskConfig_1.taskConfigDefinition,
     [DefinitionEnum_1.DefinitionEnum.gitRepository]: GitRepository_1.gitRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.gitPackageRepository]: GitRepository_1.gitPackageRepositoryDefinition,
-    [DefinitionEnum_1.DefinitionEnum.localRepository]: LocalRepository_1.localRepositoryDefinition,
-    [DefinitionEnum_1.DefinitionEnum.localPackageRepository]: LocalRepository_1.localPackageRepositoryDefinition,
+    [DefinitionEnum_1.DefinitionEnum.datatruckRepository]: DatatruckRepository_1.datatruckRepositoryDefinition,
+    [DefinitionEnum_1.DefinitionEnum.datatruckPackageRepository]: DatatruckRepository_1.datatruckPackageRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.resticRepository]: ResticRepository_1.resticRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.resticPackageRepository]: ResticRepository_1.resticPackageRepositoryDefinition,
     [DefinitionEnum_1.DefinitionEnum.gitTask]: GitTask_1.gitTaskDefinition,

package/Repository/{LocalRepository.d.ts → DatatruckRepository.d.ts}

@@ -7,8 +7,9 @@ export declare type MetaDataType = {
     task: string | undefined;
     tags: string[];
     version: string;
+    size: number;
 };
-export declare type LocalRepositoryConfigType = {
+export declare type DatatruckRepositoryConfigType = {
     outPath: string;
     compress?: boolean;
     /**
@@ -18,18 +19,19 @@ export declare type LocalRepositoryConfigType = {
 };
 declare type CompressObjectType = {
     packs?: {
+        name?: string;
         include: string[];
         exclude?: string[];
         onePackByResult?: boolean;
     }[];
 };
-export declare type LocalPackageRepositoryConfigType = {
+export declare type DatatruckPackageRepositoryConfigType = {
     compress?: CompressObjectType | boolean;
 };
-export declare const localRepositoryName = "local";
-export declare const localRepositoryDefinition: JSONSchema7;
-export declare const localPackageRepositoryDefinition: JSONSchema7;
-export declare class LocalRepository extends RepositoryAbstract<LocalRepositoryConfigType> {
+export declare const datatruckRepositoryName = "datatruck";
+export declare const datatruckRepositoryDefinition: JSONSchema7;
+export declare const datatruckPackageRepositoryDefinition: JSONSchema7;
+export declare class DatatruckRepository extends RepositoryAbstract<DatatruckRepositoryConfigType> {
     static zipBasenameTpl: string;
     static buildSnapshotName(data: {
         snapshotId: string;
@@ -50,8 +52,8 @@ export declare class LocalRepository extends RepositoryAbstract<LocalRepositoryC
     onPrune(data: PruneDataType): Promise<void>;
     onSnapshots(data: SnapshotsDataType): Promise<SnapshotResultType[]>;
     private normalizeCompressConfig;
-    onBackup(data: BackupDataType<LocalPackageRepositoryConfigType>): Promise<void>;
-    onCopyBackup(data: CopyBackupType<LocalRepositoryConfigType>): Promise<void>;
-    onRestore(data: RestoreDataType<LocalPackageRepositoryConfigType>): Promise<void>;
+    onBackup(data: BackupDataType<DatatruckPackageRepositoryConfigType>): Promise<void>;
+    onCopyBackup(data: CopyBackupType<DatatruckRepositoryConfigType>): Promise<void>;
+    onRestore(data: RestoreDataType<DatatruckPackageRepositoryConfigType>): Promise<void>;
 }
 export {};