bump version (v1.1.0)

add readme
add flac dest format to example config
2021-02-10 23:22:40 +01:00 · 2021-02-10 23:21:57 +01:00 · 2021-02-10 23:18:24 +01:00 · 2021-02-10 22:22:06 +01:00 · 2021-02-10 22:15:31 +01:00 · 2021-02-02 13:27:15 +01:00
7 changed files with 144 additions and 108 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,9 +20,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.36"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68803225a7b13e47191bab76f2687382b60d259e8cf37f6e1893658b84bb9479"
+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"

 [[package]]
 name = "array-init"
@@ -43,7 +43,7 @@ dependencies = [

 [[package]]
 name = "audio-conv"
-version = "1.0.0"
+version = "1.1.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -78,18 +78,18 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

 [[package]]
 name = "bstr"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
 dependencies = [
 "memchr",
 ]

 [[package]]
 name = "bytes"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad1f8e949d755f9d79112b5bb46938e0ef9d3804a0b16dfab13aafcaa5f0fa72"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"

 [[package]]
 name = "cassowary"
@@ -97,12 +97,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"

-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -180,9 +174,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "futures"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0"
+checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -195,9 +189,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64"
+checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -205,15 +199,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748"
+checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"

 [[package]]
 name = "futures-executor"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65"
+checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -222,15 +216,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb"
+checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"

 [[package]]
 name = "futures-macro"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556"
+checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
 dependencies = [
 "proc-macro-hack",
 "proc-macro2",
@@ -240,24 +234,24 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d"
+checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"

 [[package]]
 name = "futures-task"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d"
+checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
 dependencies = [
 "once_cell",
 ]

 [[package]]
 name = "futures-util"
-version = "0.3.8"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2"
+checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -266,7 +260,7 @@ dependencies = [
 "futures-sink",
 "futures-task",
 "memchr",
- "pin-project",
+ "pin-project-lite",
 "pin-utils",
 "proc-macro-hack",
 "proc-macro-nested",
@@ -349,7 +343,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d50f822055923f1cbede233aa5dfd4ee957cf328fb3076e330886094e11d6cf"
 dependencies = [
 "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
 "futures-channel",
 "futures-core",
 "futures-util",
@@ -452,9 +446,9 @@ dependencies = [

 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
 dependencies = [
 "libc",
 ]
@@ -465,7 +459,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]

 [[package]]
@@ -485,15 +479,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.81"
+version = "0.2.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"

 [[package]]
 name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"

 [[package]]
 name = "lock_api"
@@ -506,11 +500,11 @@ dependencies = [

 [[package]]
 name = "log"
-version = "0.4.11"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
 ]

 [[package]]
@@ -521,9 +515,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"

 [[package]]
 name = "mio"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f33bc887064ef1fd66020c9adfc45bb9f33d75a42096c81e7c56c65b75dd1a8b"
+checksum = "e50ae3f04d169fcc9bde0b547d1c205219b7157e07ded9c5aff03e0637cb3ed7"
 dependencies = [
 "libc",
 "log",
@@ -620,7 +614,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "instant",
 "libc",
 "redox_syscall",
@@ -634,31 +628,11 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"

-[[package]]
-name = "pin-project"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "pin-project-lite"
-version = "0.2.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"
+checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"

 [[package]]
 name = "pin-utils"
@@ -719,9 +693,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"

 [[package]]
 name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"

 [[package]]
 name = "proc-macro2"
@@ -749,9 +723,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"

 [[package]]
 name = "regex"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -761,9 +735,9 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.6.21"
+version = "0.6.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"

 [[package]]
 name = "same-file"
@@ -782,18 +756,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "serde"
-version = "1.0.118"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.118"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -802,9 +776,9 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.8.14"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7"
+checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
 dependencies = [
 "dtoa",
 "linked-hash-map",
@@ -840,9 +814,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"

 [[package]]
 name = "smallvec"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"

 [[package]]
 name = "socket2"
@@ -850,7 +824,7 @@ version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 "libc",
 "winapi",
 ]
@@ -881,9 +855,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.56"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9802ddde94170d186eeee5005b798d9c159fa970403f1be19976d0cfb939b72"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -936,18 +910,18 @@ dependencies = [

 [[package]]
 name = "thread_local"
-version = "1.0.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
 dependencies = [
- "lazy_static",
+ "once_cell",
 ]

 [[package]]
 name = "tokio"
-version = "1.0.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d258221f566b6c803c7b4714abadc080172b272090cdc5e244a6d4dd13c3a6bd"
+checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a"
 dependencies = [
 "autocfg",
 "bytes",
@@ -958,9 +932,9 @@ dependencies = [

 [[package]]
 name = "tokio-macros"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42517d2975ca3114b22a16192634e8241dc5cc1f130be194645970cc1c371494"
+checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -978,9 +952,9 @@ dependencies = [

 [[package]]
 name = "tui"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4e6c82bb967df89f20b875fa8835fab5d5622c6a5efa574a1f0b6d0aa6e8f6"
+checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9"
 dependencies = [
 "bitflags",
 "cassowary",
@@ -1069,9 +1043,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "yaml-rust"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d"
+checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
 dependencies = [
 "linked-hash-map",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "audio-conv"
-version = "1.0.0"
+version = "1.1.0"
 edition = "2018"
 description = "Copies directory structure and converts audio files in it"
 authors = ["Thomas Heck <t@b128.net>"]
@@ -13,6 +13,10 @@ categories = [
    "multimedia::encoding",
 ]
 keywords = ["audio", "conversion", "opus", "flac"]
+include = [
+    "/src/**/*",
+    "/example.audio-conv.yaml",
+]

 [dependencies]
 gstreamer-audio = { version = "0.16", features = ["v1_10"] }
@@ -30,7 +34,7 @@ serde_yaml = "0.8"
 regex = "1"
 globset = "0.4"
 derive_more = "0.99"
-tui = { version = "0.13", default-features = false, features = ["crossterm"] }
+tui = { version = "0.14", default-features = false, features = ["crossterm"] }

 [dependencies.tokio]
 version = "1"
--- a/README.md
+++ b/README.md
@@ -0,0 +1,34 @@
+# audio-conv
+
+Takes two paths, all audio files encountered in the first path are transcoded and stored in the
+second path. The directory structure from the first path gets also copied to the second path.
+
+## Dependencies
+
+Requires *gstreamer* version 1.10 or higher with the *base* plugin.
+
+The supported source audio formats (or even other media that is able to contain audio) depend on
+the installed *gstreamer* plugins.
+
+## Installation via nix flakes
+
+*audio-conv* can be easily installed via *nix flakes*:
+
+```bash
+$ nix profile install gitlab:chpio/audio-conv/release
+```
+
+## Generate example config
+
+*audio-conv* is able to write an example config to your current directory:
+
+```bash
+$ audio-conv init
+```
+
+Now you need to edit the generated *audio-conv.yaml* file. And let it convert your audio files
+by running it:
+
+```bash
+$ audio-conv
+```
--- a/example.audio-conv.yaml
+++ b/example.audio-conv.yaml
@@ -19,3 +19,9 @@ matches:
    #   # one of: 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256 or 320
    #   bitrate: 256
    #   bitrate_type: vbr # or cbr
+
+    # for flac:
+    # to:
+    #   codec: flac
+    #   # effort spend for the compression. 0 (fastes compression) to 9 (highest compression)
+    #   compression: 8
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "flake-utils": {
      "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
+        "lastModified": 1610051610,
+        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
+        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
        "type": "github"
      },
      "original": {
@@ -32,11 +32,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1608633860,
-        "narHash": "sha256-AGJfdJCR5jfIt8PqGiENXRqhthrS3Gxy8Wzb3Z2GsS4=",
+        "lastModified": 1612988144,
+        "narHash": "sha256-X1IO9gtzE0dRVpDqknjF39IVDnuKuZsRis38WnLfHLo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "da1b28ab8f361fbe14dc539cd69ce1bfd015fd68",
+        "rev": "26f6af373ec1b867d751b56fb802f14010c8351b",
        "type": "github"
      },
      "original": {
--- a/src/config.rs
+++ b/src/config.rs
@@ -32,6 +32,12 @@ pub enum Transcode {
        bitrate_type: BitrateType,
    },

+    #[serde(rename = "flac")]
+    Flac {
+        #[serde(default = "default_flac_compression")]
+        compression: u8,
+    },
+
    #[serde(rename = "mp3")]
    Mp3 {
        #[serde(default = "default_mp3_bitrate")]
@@ -46,6 +52,7 @@ impl Transcode {
    pub fn extension(&self) -> &'static str {
        match self {
            Transcode::Opus { .. } => "opus",
+            Transcode::Flac { .. } => "flac",
            Transcode::Mp3 { .. } => "mp3",
        }
    }
@@ -55,6 +62,10 @@ fn default_opus_bitrate() -> u16 {
    160
 }

+fn default_flac_compression() -> u8 {
+    5
+}
+
 fn bitrate_type_vbr() -> BitrateType {
    BitrateType::Vbr
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@ mod ui;

 use crate::config::Config;
 use anyhow::{Context, Error, Result};
-use futures::{future, pin_mut, prelude::*};
+use futures::{pin_mut, prelude::*};
 use glib::{subclass::prelude::*, GBoxed, GString};
 use gstreamer::{gst_element_error, prelude::*, Element};
 use gstreamer_base::prelude::*;
@@ -321,7 +321,7 @@ async fn transcode(

            let resample: Element = gmake("audioresample")?;
            // quality from 0 to 10
-            resample.set_property("quality", &7)?;
+            resample.set_property("quality", &10)?;

            let mut dest_elems = vec![
                resample,
@@ -352,6 +352,13 @@ async fn transcode(
                    dest_elems.push(encoder);
                    dest_elems.push(gmake("oggmux")?);
                }
+
+                config::Transcode::Flac { compression } => {
+                    let encoder: Element = gmake("flacenc")?;
+                    encoder.set_property_from_str("quality", &compression.to_string());
+                    dest_elems.push(encoder);
+                }
+
                config::Transcode::Mp3 {
                    bitrate,
                    bitrate_type,
@@ -540,13 +547,13 @@ async fn transcode(
    .await
 }

-async fn rm_file_on_err<F, T>(path: &Path, f: F) -> F::Output
+async fn rm_file_on_err<F, T>(path: &Path, f: F) -> Result<T>
 where
    F: Future<Output = Result<T>>,
 {
    match f.await {
        Err(err) => match fs::remove_file(path).await {
-            Ok(..) => Err(err),
+            Ok(()) => Err(err),
            Err(fs_err) if fs_err.kind() == std::io::ErrorKind::NotFound => Err(err),
            Err(fs_err) => {
                let err = err
Author	SHA1	Message	Date
Thomas Heck	5242aac566	bump version (v1.1.0)	2021-02-10 23:22:40 +01:00
Thomas Heck	49003c9983	add readme	2021-02-10 23:21:57 +01:00
Thomas Heck	530446bcd6	add flac dest format to example config	2021-02-10 23:18:24 +01:00
Thomas Heck	aa65b30873	update cargo deps	2021-02-10 22:22:06 +01:00
Thomas Heck	f1a71189c8	flake.lock: Update Flake input changes: * Updated 'nixpkgs': 'github:NixOS/nixpkgs/b881f100f65eacbbafdf65cff78c8d4104a1d04a' -> 'github:NixOS/nixpkgs/26f6af373ec1b867d751b56fb802f14010c8351b'	2021-02-10 22:15:31 +01:00
Thomas Heck	cc2ac9cb37	update nix deps	2021-02-02 13:27:15 +01:00
Thomas Heck	511f5d1237	update cargo deps	2021-02-02 13:26:33 +01:00
Thomas Heck	ff06358268	set resampling qulity to highest "10"	2021-02-02 13:22:14 +01:00
Thomas Heck	183e34c217	add flac encoding format	2021-01-15 21:18:27 +01:00
Thomas Heck	755f5dbd1d	update nix deps	2020-12-31 01:07:44 +01:00
Thomas Heck	762064efd6	clean up	2020-12-29 21:31:33 +01:00
Thomas Heck	9959a26e48	only include needed src files in cargo pkg/publish	2020-12-28 18:46:47 +01:00