Merge pull request #24 from Trivernis/develop

Develop

Containerfile

@@ -36,6 +36,9 @@ RUN python3 scripts/check.py --install
 FROM sources AS build_daemon
 WORKDIR /usr/src
 RUN python3 scripts/build.py daemon --verbose
+RUN mkdir ./test-repo
+RUN ./out/mediarepo-daemon --repo ./test-repo init
+
 
 FROM sources AS build_ui
 WORKDIR /usr/src

mediarepo-daemon/Cargo.toml

@@ -4,7 +4,7 @@ default-members = ["mediarepo-core", "mediarepo-database", "mediarepo-logic", "m
 
 [package]
 name = "mediarepo-daemon"
-version = "1.0.2"
+version = "1.0.3"
 edition = "2018"
 license = "gpl-3"
 repository = "https://github.com/Trivernis/mediarepo-daemon"
@@ -16,7 +16,7 @@ name = "mediarepo-daemon"
 path = "src/main.rs"
 
 [dependencies]
-tracing = "0.1.32"
+tracing = "0.1.33"
 toml = "0.5.8"
 structopt = "0.3.26"
 glob = "0.3.0"
@@ -25,7 +25,7 @@ tracing-appender = "0.2.2"
 tracing-log = "0.1.2"
 rolling-file = "0.1.0"
 num-integer = "0.1.44"
-console-subscriber = "0.1.3"
+console-subscriber = "0.1.4"
 log = "0.4.16"
 opentelemetry = { version = "0.17.0", features = ["rt-tokio"] }
 opentelemetry-jaeger = { version = "0.16.0", features = ["rt-tokio"] }
@@ -48,5 +48,5 @@ version = "1.17.0"
 features = ["macros", "rt-multi-thread", "io-std", "io-util"]
 
 [dependencies.tracing-subscriber]
-version = "0.3.9"
+version = "0.3.11"
 features = ["env-filter", "ansi", "json"]

mediarepo-daemon/mediarepo-core/Cargo.toml

@@ -8,7 +8,7 @@ workspace = ".."
 
 [dependencies]
 thiserror = "1.0.30"
-multihash = "0.16.1"
+multihash = "0.16.2"
 multibase = "0.9.1"
 base64 = "0.13.0"
 toml = "0.5.8"
@@ -16,12 +16,12 @@ serde = "1.0.136"
 futures = "0.3.21"
 itertools = "0.10.3"
 glob = "0.3.0"
-tracing = "0.1.32"
+tracing = "0.1.33"
 data-encoding = "2.3.2"
 tokio-graceful-shutdown = "0.5.0"
 thumbnailer = "0.4.0"
 bincode = "1.3.3"
-tracing-subscriber = "0.3.9"
+tracing-subscriber = "0.3.11"
 trait-bound-typemap = "0.3.3"
 
 [dependencies.sea-orm]
@@ -38,7 +38,7 @@ version = "1.17.0"
 features = ["fs", "io-util", "io-std"]
 
 [dependencies.config]
-version = "0.12.0"
+version = "0.13.1"
 features = ["toml"]
 
 [dependencies.mediarepo-api]

mediarepo-daemon/mediarepo-database/Cargo.toml

@@ -8,7 +8,7 @@ workspace = ".."
 
 [dependencies]
 chrono = "0.4.19"
-tracing = "0.1.32"
+tracing = "0.1.33"
 
 [dependencies.mediarepo-core]
 path = "../mediarepo-core"

mediarepo-daemon/mediarepo-logic/Cargo.toml

@@ -11,7 +11,7 @@ chrono = "0.4.19"
 serde = "1.0.136"
 mime_guess = "2.0.4"
 mime = "0.3.16"
-tracing = "0.1.32"
+tracing = "0.1.33"
 async-trait = "0.1.53"
 
 [dependencies.mediarepo-core]

mediarepo-daemon/mediarepo-socket/Cargo.toml

@@ -8,10 +8,10 @@ workspace = ".."
 
 [dependencies]
 serde = "1.0.136"
-tracing = "0.1.32"
+tracing = "0.1.33"
 compare = "0.1.0"
 port_check = "0.1.5"
-rayon = "1.5.1"
+rayon = "1.5.2"
 
 [dependencies.mediarepo-core]
 path = "../mediarepo-core"

mediarepo-daemon/mediarepo-worker/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1.53"
-tracing = "0.1.32"
+tracing = "0.1.33"
 
 [dependencies.mediarepo-core]
 path = "../mediarepo-core"

mediarepo-ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mediarepo-ui",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "scripts": {
         "ng": "ng",
         "start": "ng serve",

mediarepo-ui/src-tauri/Cargo.lock

@@ -64,7 +64,7 @@ checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27"
 
 [[package]]
 name = "app"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "mediarepo-api",
  "serde",

mediarepo-ui/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "1.0.2"
+version = "1.0.3"
 description = "The UI for the mediarepo media management tool"
 authors = ["you"]
 license = ""

mediarepo-ui/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
     "package": {
         "productName": "mediarepo-ui",
-        "version": "1.0.2"
+        "version": "1.0.3"
     },
     "build": {
         "distDir": "../dist/mediarepo-ui",

mediarepo-ui/src/app/components/core/core.module.ts

@@ -17,7 +17,7 @@ import {MatSelectModule} from "@angular/material/select";
 import {MatCheckboxModule} from "@angular/material/checkbox";
 import {MatDividerModule} from "@angular/material/divider";
 import {NgIconsModule} from "@ng-icons/core";
-import * as materialIcons from "@ng-icons/material-icons";
+import {MatPlus} from "@ng-icons/material-icons/baseline";
 import {MatMenuModule} from "@angular/material/menu";
 import {InputModule} from "../shared/input/input.module";
 import {SidebarModule} from "../shared/sidebar/sidebar.module";
@@ -72,7 +72,7 @@ import {AboutDialogComponent} from "./repositories-tab/repository-overview/about
         MatProgressBarModule,
         MatCheckboxModule,
         ScrollingModule,
-        NgIconsModule.withIcons({ ...materialIcons }),
+        NgIconsModule.withIcons({ MatPlus }),
         FlexModule,
         MatButtonModule,
         MatMenuModule,

mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts

@@ -7,6 +7,7 @@ import {
     MatAddCircle,
     MatChangeCircle,
     MatDeleteSweep,
+    MatEdit,
     MatExpandLess,
     MatExpandMore,
     MatFilterAlt,
@@ -91,6 +92,7 @@ import {SortPresetItemComponent} from "./file-search/sort-preset-item/sort-prese
             MatFilterAlt,
             MatExpandMore,
             MatExpandLess,
+            MatEdit
         }),
         MatRippleModule,
         MatButtonModule,