Merge pull request #21 from tsirysndr/radiobrowser-provider

feat(provider): add new radio provider: radio-browser

.github/workflows/ci.yml

···
+# Do not edit this file directly. It is generated by https://deno.land/x/fluent_github_actions
+
+name: ci
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  tests:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install build dependencies
+        run: |
+            sudo apt-get update
+            sudo apt-get install -y build-essential libasound2-dev protobuf-compiler
+      - name: Setup Fluent CI
+        uses: fluentci-io/setup-fluentci@v5
+      - name: Run tests
+        run: |
+            fluentci run --wasm rust test

.github/workflows/release-for-mac.yml

···
 jobs:
   release:
     name: release x86_64-apple-darwin
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       fail-fast: false
       matrix:

.github/workflows/release.yml

···
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target:

Cargo.lock

···
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aead"
···
 ]
 
 [[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
 name = "allocator-api2"
 version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
 name = "anyhow"
 version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
 name = "async-channel"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "blocking",
  "futures-lite",
  "once_cell",
+ "tokio",
 ]
 
 [[package]]
···
  "parking",
  "polling",
  "slab",
- "socket2",
+ "socket2 0.4.7",
  "waker-fn",
  "windows-sys 0.42.0",
 ]
···
 ]
 
 [[package]]
+name = "async-process"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "autocfg",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+ "signal-hook",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
 name = "async-std"
 version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
 dependencies = [
+ "async-attributes",
  "async-channel",
  "async-global-executor",
  "async-io",
  "async-lock",
+ "async-process",
  "crossbeam-utils",
  "futures-channel",
  "futures-core",
···
 ]
 
 [[package]]
+name = "async-std-resolver"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa5ee46ec0c518414838d2fdc7dd18f6ba7d934b6e728005c958621da450682d"
+dependencies = [
+ "async-std",
+ "async-trait",
+ "futures-io",
+ "futures-util",
+ "hickory-resolver",
+ "pin-utils",
+ "socket2 0.5.8",
+]
+
+[[package]]
 name = "async-stream"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "futures-core",
  "futures-io",
  "rustls 0.18.1",
- "webpki 0.21.4",
+ "webpki",
  "webpki-roots 0.20.0",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.64"
+version = "0.1.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2"
+checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.51",
 ]
 
 [[package]]
···
  "matchit",
  "memchr",
  "mime",
- "percent-encoding 2.2.0",
+ "percent-encoding 2.3.1",
  "pin-project-lite",
  "rustversion",
  "serde",
···
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
+name = "chrono"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
 name = "cipher"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "base64 0.13.1",
  "hkdf",
  "hmac",
- "percent-encoding 2.2.0",
+ "percent-encoding 2.3.1",
  "rand 0.8.5",
  "sha2",
  "time",
···
 ]
 
 [[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
 name = "core-foundation-sys"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
 name = "ctr"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "once_cell",
  "parking_lot_core",
 ]
+
+[[package]]
+name = "data-encoding"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
 
 [[package]]
 name = "deadpool"
···
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
 [[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
 name = "either"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "enum-as-inner"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
 name = "event-listener"
 version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "percent-encoding 2.2.0",
+ "percent-encoding 2.3.1",
 ]
 
 [[package]]
···
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
 name = "hermit-abi"
 version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "hickory-proto"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447afdcdb8afb9d0a852af6dc65d9b285ce720ed7a59e42a8bf2e931c67bc1b5"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 1.0.3",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "thiserror",
+ "tinyvec",
+ "tracing",
+ "url 2.5.4",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand 0.8.5",
+ "resolv-conf",
+ "smallvec",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
 name = "hkdf"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 dependencies = [
  "crypto-mac",
  "digest",
+]
+
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi",
 ]
 
 [[package]]
···
  "serde_json",
  "serde_qs",
  "serde_urlencoded",
- "url 2.3.1",
+ "url 2.5.4",
 ]
 
 [[package]]
···
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.7",
  "tokio",
  "tower-service",
  "tracing",
···
 
 [[package]]
 name = "hyper-rustls"
-version = "0.23.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
+ "futures-util",
  "http",
  "hyper",
- "rustls 0.20.9",
+ "rustls 0.21.12",
  "tokio",
  "tokio-rustls",
 ]
···
 ]
 
 [[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
 name = "idna"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
···
 ]
 
 [[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "ipconfig"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+dependencies = [
+ "socket2 0.5.8",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg",
+]
+
+[[package]]
 name = "ipnet"
 version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "js-sys"
-version = "0.3.61"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
···
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libloading"
···
 ]
 
 [[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
+[[package]]
 name = "lock_api"
 version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 dependencies = [
- "cfg-if",
  "value-bag",
 ]
 
···
 ]
 
 [[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
 name = "m3u"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
+[[package]]
 name = "matches"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
···
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
···
 checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12"
 dependencies = [
  "bytes",
- "heck",
+ "heck 0.4.1",
  "itertools 0.10.5",
  "lazy_static",
  "log",
···
 ]
 
 [[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
 name = "quote"
 version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "radiobrowser"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "763ad5f847e3d2e3221dac4e87370297a970e3f9eb8f2760b915001b9c79023b"
+dependencies = [
+ "async-std",
+ "async-std-resolver",
+ "chrono",
+ "log",
+ "rand 0.8.5",
+ "reqwest",
+ "serde",
+]
+
+[[package]]
 name = "rand"
 version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "remove_dir_all"
···
 
 [[package]]
 name = "reqwest"
-version = "0.11.14"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.0",
  "bytes",
···
  "log",
  "mime",
  "once_cell",
- "percent-encoding 2.2.0",
+ "percent-encoding 2.3.1",
  "pin-project-lite",
- "rustls 0.20.9",
+ "rustls 0.21.12",
  "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
  "tokio",
  "tokio-rustls",
  "tower-service",
- "url 2.3.1",
+ "url 2.5.4",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.22.6",
+ "webpki-roots 0.25.4",
  "winreg",
+]
+
+[[package]]
+name = "resolv-conf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+dependencies = [
+ "hostname",
+ "quick-error",
 ]
 
 [[package]]
···
 ]
 
 [[package]]
+name = "rustix"
+version = "0.37.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "519165d378b97752ca44bbe15047d5d3409e875f39327546b42ac81d7e18c1b6"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
 name = "rustls"
 version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "log",
  "ring 0.16.20",
  "sct 0.6.1",
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.20.9"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
- "ring 0.16.20",
+ "ring 0.17.3",
+ "rustls-webpki",
  "sct 0.7.1",
- "webpki 0.22.4",
 ]
 
 [[package]]
···
 ]
 
 [[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.3",
+ "untrusted 0.9.0",
+]
+
+[[package]]
 name = "rustversion"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
 dependencies = [
- "percent-encoding 2.2.0",
+ "percent-encoding 2.3.1",
  "serde",
  "thiserror",
 ]
···
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
···
 ]
 
 [[package]]
+name = "socket2"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
 name = "spin"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "quote",
  "syn 1.0.107",
 ]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "standback"
···
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
···
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
 
 [[package]]
 name = "tempfile"
···
 ]
 
 [[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
 name = "tinyvec"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2",
+ "socket2 0.4.7",
  "tokio-macros",
  "windows-sys 0.42.0",
 ]
···
 
 [[package]]
 name = "tokio-rustls"
-version = "0.23.4"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.20.9",
+ "rustls 0.21.12",
  "tokio",
- "webpki 0.22.4",
 ]
 
 [[package]]
···
  "http-body",
  "hyper",
  "hyper-timeout",
- "percent-encoding 2.2.0",
+ "percent-encoding 2.3.1",
  "pin-project",
  "prost",
  "prost-derive",
···
 
 [[package]]
 name = "tunein"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb48ce12eca4db1649e7d311e782e9b8a341c844cec57b5b8d1e332381e323f"
+checksum = "9d33b9d790869737661ff1f34a95da32a1288373c5b78c66d098cff2df045055"
 dependencies = [
  "anyhow",
  "m3u",
···
 version = "0.2.6"
 dependencies = [
  "anyhow",
+ "async-trait",
  "clap",
  "cpal",
  "crossterm",
···
  "owo-colors",
  "pls",
  "prost",
+ "radiobrowser",
  "ratatui",
+ "regex",
  "reqwest",
  "rodio",
  "rustfft",
···
  "tonic-build",
  "tonic-web",
  "tunein",
- "url 2.3.1",
+ "url 2.5.4",
 ]
 
 [[package]]
···
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
- "idna 0.3.0",
- "percent-encoding 2.2.0",
+ "idna 1.0.3",
+ "percent-encoding 2.3.1",
  "serde",
 ]
 
 [[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
 name = "value-bag"
-version = "1.0.0-alpha.9"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55"
-dependencies = [
- "ctor",
- "version_check",
-]
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
 
 [[package]]
 name = "version_check"
···
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
+ "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.51",
  "wasm-bindgen-shared",
 ]
 
···
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
···
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.107",
+ "syn 2.0.51",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.84"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "web-sys"
···
 ]
 
 [[package]]
-name = "webpki"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
-dependencies = [
- "ring 0.17.3",
- "untrusted 0.9.0",
-]
-
-[[package]]
 name = "webpki-roots"
 version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
 dependencies = [
- "webpki 0.21.4",
+ "webpki",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.6"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki 0.22.4",
-]
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "wepoll-ffi"
···
  "libc",
  "once_cell",
 ]
+
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
···
 ]
 
 [[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
 name = "windows-sys"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
 name = "windows-targets"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 ]
 
 [[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
 name = "windows_aarch64_msvc"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
 name = "windows_i686_gnu"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
 name = "windows_i686_msvc"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
 name = "windows_x86_64_gnu"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
 name = "windows_x86_64_msvc"
 version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
···
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
 name = "winreg"
-version = "0.10.1"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "winapi",
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+ "synstructure",
 ]
 
 [[package]]
···
  "quote",
  "syn 2.0.51",
 ]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]

Cargo.toml

···
 
 [dependencies]
 anyhow = "1.0.69"
+async-trait = "0.1.85"
 clap = "3.2.20"
 cpal = "0.14.0"
 crossterm = "0.27.0"
···
 owo-colors = "3.5.0"
 pls = "0.2.2"
 prost = "0.11.8"
+radiobrowser = { version = "0.6.1", features = ["default-rustls"], default-features = false }
 ratatui = "0.26.1"
+regex = "1.11.1"
 reqwest = {version = "0.11.14", features = ["blocking", "rustls-tls"], default-features = false}
 rodio = {version = "0.16"}
 rustfft = "6.2.0"
···
 tokio = {version = "1.24.2", features = ["tokio-macros", "macros", "rt", "rt-multi-thread"]}
 tonic = "0.8.3"
 tonic-web = "0.4.0"
-tunein = "0.1.2"
+tunein = "0.1.3"
 url = "2.3.1"
 
 [build-dependencies]

README.md

···
   <a href="LICENSE" target="./LICENSE">
     <img alt="License: MIT" src="https://img.shields.io/badge/License-MIT-blue.svg" />
   </a>
+  <a href="https://github.com/tsirysndr/tunein-cli/actions/workflows/ci.yml">
+    <img src="https://github.com/tsirysndr/tunein-cli/actions/workflows/ci.yml/badge.svg"
+  </a>
 </p>
 
 A command line interface for [TuneIn Radio](https://tunein.com).<br />
···
     tunein <SUBCOMMAND>
 
 OPTIONS:
-    -h, --help       Print help information
-    -V, --version    Print version information
+    -h, --help                   Print help information
+    -p, --provider <provider>    The radio provider to use, can be 'tunein' or 'radiobrowser'.
+                                 Default is 'tunein' [default: tunein]
+    -V, --version                Print version information
 
 SUBCOMMANDS:
     browse    Browse radio stations

src/app.rs

···
         },
         frame,
     );
-    render_line(
-        "Now Playing ",
-        &state.now_playing,
-        Rect {
-            x: size.x,
-            y: size.y + 2,
-            width: size.width,
-            height: 1,
-        },
-        frame,
-    );
+
+    if !state.now_playing.is_empty() {
+        render_line(
+            "Now Playing ",
+            &state.now_playing,
+            Rect {
+                x: size.x,
+                y: size.y + 2,
+                width: size.width,
+                height: 1,
+            },
+            frame,
+        );
+    }
+
     render_line(
         "Genre ",
         &state.genre,
         Rect {
             x: size.x,
-            y: size.y + 3,
+            y: match state.now_playing.is_empty() {
+                true => size.y + 2,
+                false => size.y + 3,
+            },
             width: size.width,
             height: 1,
         },
···
         &state.description,
         Rect {
             x: size.x,
-            y: size.y + 4,
+            y: match state.now_playing.is_empty() {
+                true => size.y + 3,
+                false => size.y + 4,
+            },
             width: size.width,
             height: 1,
         },
···
         &format!("{} kbps", &state.br),
         Rect {
             x: size.x,
-            y: size.y + 5,
+            y: match state.now_playing.is_empty() {
+                true => size.y + 4,
+                false => size.y + 5,
+            },
             width: size.width,
             height: 1,
         },

src/browse.rs

···
-use std::str::FromStr;
-
 use anyhow::Error;
 use owo_colors::OwoColorize;
-use tunein::{types::Category, TuneInClient};
+
+use crate::provider::radiobrowser::Radiobrowser;
+use crate::provider::tunein::Tunein;
+use crate::provider::Provider;
 
-pub async fn exec(category: Option<&str>) -> Result<(), Error> {
-    let client = TuneInClient::new();
+pub async fn exec(
+    category: Option<&str>,
+    offset: u32,
+    limit: u32,
+    provider: &str,
+) -> Result<(), Error> {
+    let provider: Box<dyn Provider> = match provider {
+        "tunein" => Box::new(Tunein::new()),
+        "radiobrowser" => Box::new(Radiobrowser::new().await),
+        _ => {
+            return Err(anyhow::anyhow!(format!(
+                "Unsupported provider '{}'",
+                provider
+            )))
+        }
+    };
 
-    if category.is_some() && Category::from_str(category.unwrap_or_default()).is_err() {
-        let id = category.unwrap_or_default();
-        let results = client
-            .browse_by_id(id)
-            .await
-            .map_err(|e| Error::msg(e.to_string()))?;
-        for result in results {
-            println!("{}", result.text);
-            if let Some(children) = result.children {
-                for child in children {
-                    match child.playing {
+    match category {
+        Some(category) => {
+            let results = provider.browse(category.to_string(), offset, limit).await?;
+            for result in results {
+                match result.id.is_empty() {
+                    false => match result.playing {
                         Some(playing) => println!(
                             "  {} | {} | id: {}",
-                            child.text.magenta(),
+                            result.name.magenta(),
                             playing,
-                            child.guide_id.unwrap()
+                            result.id
                         ),
-                        None => {
-                            if let Some(guide_id) = child.guide_id {
-                                println!("  {} | {}", child.text.magenta(), guide_id);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return Ok(());
-    }
+                        None => println!("  {} | id: {}", result.name.magenta(), result.id),
+                    },
 
-    let results = match category {
-        Some(category) => match Category::from_str(category) {
-            Ok(category) => client
-                .browse(Some(category))
-                .await
-                .map_err(|e| Error::msg(e.to_string()))?,
-            Err(_) => {
-                println!("Invalid category");
-                return Ok(());
+                    true => println!("{}", result.name),
+                }
             }
-        },
-        None => client
-            .browse(None)
-            .await
-            .map_err(|e| Error::msg(e.to_string()))?,
-    };
-
-    for result in results {
-        match result.guide_id {
-            Some(_) => println!(
-                "{} | id: {}",
-                result.text.magenta(),
-                result.guide_id.unwrap()
-            ),
-            None => println!("{}", result.text),
         }
-        if let Some(children) = result.children {
-            for child in children {
-                match child.playing {
-                    Some(playing) => println!(
-                        "  {} | {} | id: {}",
-                        child.text.magenta(),
-                        playing,
-                        child.guide_id.unwrap()
-                    ),
-                    None => println!(
-                        "  {} | id: {}",
-                        child.text.magenta(),
-                        child.guide_id.unwrap()
-                    ),
-                }
+        None => {
+            let results = provider.categories(offset, limit).await?;
+            for result in results {
+                println!("{}", result.magenta());
             }
         }
-    }
+    };
     Ok(())
 }

src/main.rs

···
 mod music;
 mod play;
 mod player;
+mod provider;
 mod search;
 mod server;
+mod tags;
 mod tui;
+mod types;
 mod visualization;
 
 fn cli() -> Command<'static> {
···
                                                               
 A simple CLI to listen to radio stations"#,
         )
+        .arg(
+            arg!(-p --provider "The radio provider to use, can be 'tunein' or 'radiobrowser'. Default is 'tunein'").default_value("tunein")
+        )
         .subcommand_required(true)
         .subcommand(
             Command::new("search")
···
         .subcommand(
             Command::new("browse")
                 .about("Browse radio stations")
-                .arg(arg!([category] "The category (category name or id) to browse")),
+                .arg(arg!([category] "The category (category name or id) to browse"))
+                .arg(arg!(--offset "The offset to start from").default_value("0"))
+                .arg(arg!(--limit "The number of results to show").default_value("100")),
         )
         .subcommand(
             Command::new("server")
···
     match matches.subcommand() {
         Some(("search", args)) => {
             let query = args.value_of("query").unwrap();
-            search::exec(query).await?;
+            let provider = matches.value_of("provider").unwrap();
+            search::exec(query, provider).await?;
         }
         Some(("play", args)) => {
             let station = args.value_of("station").unwrap();
-            play::exec(station).await?;
+            let provider = matches.value_of("provider").unwrap();
+            play::exec(station, provider).await?;
         }
         Some(("browse", args)) => {
             let category = args.value_of("category");
-            browse::exec(category).await?;
+            let offset = args.value_of("offset").unwrap();
+            let limit = args.value_of("limit").unwrap();
+            let provider = matches.value_of("provider").unwrap();
+            browse::exec(
+                category,
+                offset.parse::<u32>()?,
+                limit.parse::<u32>()?,
+                provider,
+            )
+            .await?;
         }
         Some(("server", args)) => {
             let port = args.value_of("port").unwrap();

src/play.rs

···
 
 use anyhow::Error;
 use hyper::header::HeaderValue;
-use tunein::TuneInClient;
 
 use crate::{
     app::{App, State},
     cfg::{SourceOptions, UiOptions},
     decoder::Mp3Decoder,
-    extract::{extract_stream_url, get_currently_playing},
+    provider::{radiobrowser::Radiobrowser, tunein::Tunein, Provider},
     tui,
 };
 
-pub async fn exec(name_or_id: &str) -> Result<(), Error> {
-    let client = TuneInClient::new();
-    let results = client
-        .get_station(name_or_id)
-        .await
-        .map_err(|e| Error::msg(e.to_string()))?;
-    let (url, playlist_type, _, id) = match results.is_empty() {
-        true => {
-            let results = client
-                .search(name_or_id)
-                .await
-                .map_err(|e| Error::msg(e.to_string()))?;
-            match results.first() {
-                Some(result) => {
-                    if result.r#type != Some("audio".to_string()) {
-                        return Err(Error::msg("No station found"));
-                    }
-                    let id = result.guide_id.as_ref().unwrap();
-                    let station = client
-                        .get_station(id)
-                        .await
-                        .map_err(|e| Error::msg(e.to_string()))?;
-                    let station = station.first().unwrap();
-                    (
-                        station.url.clone(),
-                        station.playlist_type.clone(),
-                        station.media_type.clone(),
-                        id.clone(),
-                    )
-                }
-                None => ("".to_string(), None, "".to_string(), "".to_string()),
-            }
-        }
-        false => {
-            let result = results.first().unwrap();
-            (
-                result.url.clone(),
-                result.playlist_type.clone(),
-                result.media_type.clone(),
-                name_or_id.to_string(),
-            )
+pub async fn exec(name_or_id: &str, provider: &str) -> Result<(), Error> {
+    let _provider = provider;
+    let provider: Box<dyn Provider> = match provider {
+        "tunein" => Box::new(Tunein::new()),
+        "radiobrowser" => Box::new(Radiobrowser::new().await),
+        _ => {
+            return Err(anyhow::anyhow!(format!(
+                "Unsupported provider '{}'",
+                provider
+            )))
         }
     };
-    let now_playing = get_currently_playing(&id).await?;
-    let stream_url = extract_stream_url(&url, playlist_type).await?;
-    println!("{}", stream_url);
+    let station = provider.get_station(name_or_id.to_string()).await?;
+    if station.is_none() {
+        return Err(Error::msg("No station found"));
+    }
+
+    let station = station.unwrap();
+    let stream_url = station.stream_url.clone();
+    let id = station.id.clone();
+    let now_playing = station.playing.clone().unwrap_or_default();
 
     let (cmd_tx, cmd_rx) = tokio::sync::mpsc::unbounded_channel::<State>();
     let (frame_tx, frame_rx) = std::sync::mpsc::channel::<minimp3::Frame>();

src/provider/mod.rs

···
+pub mod radiobrowser;
+pub mod tunein;
+
+use crate::types::Station;
+use anyhow::Error;
+use async_trait::async_trait;
+use regex::Regex;
+
+#[async_trait]
+pub trait Provider {
+    async fn search(&self, name: String) -> Result<Vec<Station>, Error>;
+    async fn get_station(&self, id: String) -> Result<Option<Station>, Error>;
+    async fn browse(
+        &self,
+        category: String,
+        offset: u32,
+        limit: u32,
+    ) -> Result<Vec<Station>, Error>;
+    async fn categories(&self, offset: u32, limit: u32) -> Result<Vec<String>, Error>;
+}
+
+pub fn is_valid_uuid(uuid: &str) -> bool {
+    let uuid_pattern = Regex::new(
+        r"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+    ).unwrap();
+
+    uuid_pattern.is_match(uuid)
+}

src/provider/radiobrowser.rs

···
+use crate::types::Station;
+
+use super::{is_valid_uuid, Provider};
+use anyhow::Error;
+use async_trait::async_trait;
+use radiobrowser::{ApiStation, RadioBrowserAPI};
+use std::process::exit;
+
+pub struct Radiobrowser {
+    client: RadioBrowserAPI,
+}
+
+impl Radiobrowser {
+    pub async fn new() -> Self {
+        let client = RadioBrowserAPI::new().await;
+
+        if client.is_err() {
+            eprintln!("Failed to create a RadioBrowserAPI client");
+            exit(1);
+        }
+
+        let client = client.unwrap();
+        Self { client }
+    }
+}
+
+#[async_trait]
+impl Provider for Radiobrowser {
+    async fn search(&self, name: String) -> Result<Vec<Station>, Error> {
+        let stations = self
+            .client
+            .get_stations()
+            .name(&name)
+            .send()
+            .await
+            .map_err(|e| anyhow::anyhow!(format!("{}", e)))?;
+        let stations = stations.into_iter().map(|x| Station::from(x)).collect();
+        Ok(stations)
+    }
+
+    async fn get_station(&self, name_or_uuid: String) -> Result<Option<Station>, Error> {
+        match is_valid_uuid(&name_or_uuid) {
+            true => {
+                let servers = RadioBrowserAPI::get_default_servers()
+                    .await
+                    .map_err(|e| anyhow::anyhow!(format!("{}", e)))?;
+
+                if servers.is_empty() {
+                    return Ok(None);
+                }
+
+                let client = reqwest::Client::new();
+                let url = format!(
+                    "https://{}/json/stations/byuuid/{}",
+                    servers[0], name_or_uuid
+                );
+                let results = client
+                    .get(&url)
+                    .send()
+                    .await?
+                    .json::<Vec<ApiStation>>()
+                    .await?;
+
+                Ok(results.into_iter().next().map(|x| Station::from(x)))
+            }
+            false => {
+                let stations = self
+                    .client
+                    .get_stations()
+                    .name(&name_or_uuid)
+                    .name_exact(true)
+                    .send()
+                    .await
+                    .map_err(|e| anyhow::anyhow!(format!("{}", e)))?;
+                match stations.len() {
+                    0 => Ok(None),
+                    _ => Ok(Some(Station::from(stations[0].clone()))),
+                }
+            }
+        }
+    }
+
+    async fn browse(
+        &self,
+        category: String,
+        offset: u32,
+        limit: u32,
+    ) -> Result<Vec<Station>, Error> {
+        let stations = self
+            .client
+            .get_stations()
+            .tag(&category)
+            .offset(&format!("{}", offset))
+            .limit(&format!("{}", limit))
+            .send()
+            .await
+            .map_err(|e| anyhow::anyhow!(format!("{}", e)))?;
+        let stations = stations.into_iter().map(|x| Station::from(x)).collect();
+        Ok(stations)
+    }
+
+    async fn categories(&self, offset: u32, limit: u32) -> Result<Vec<String>, Error> {
+        let categories = self
+            .client
+            .get_tags()
+            .offset(&format!("{}", offset))
+            .limit(&format!("{}", limit))
+            .send()
+            .await
+            .map_err(|e| anyhow::anyhow!(format!("{}", e)))?;
+        let categories = categories.into_iter().map(|x| x.name).collect();
+        Ok(categories)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    pub async fn test_search() {
+        let provider = Radiobrowser::new().await;
+        let name = "alternativeradio";
+        let stations = provider.search(name.to_string()).await.unwrap();
+        assert!(stations.len() == 1)
+    }
+
+    #[tokio::test]
+    pub async fn test_get_station() {
+        let provider = Radiobrowser::new().await;
+        let name = "AlternativeRadio.us".to_string();
+        let station = provider.get_station(name).await.unwrap();
+        assert!(station.is_some())
+    }
+
+    #[tokio::test]
+    pub async fn test_get_station_by_uuid() {
+        let provider = Radiobrowser::new().await;
+        let name = "964da563-0601-11e8-ae97-52543be04c81".to_string();
+        let station = provider.get_station(name).await.unwrap();
+        assert!(station.is_some())
+    }
+
+    #[tokio::test]
+    pub async fn test_browse() {
+        let provider = Radiobrowser::new().await;
+        let stations = provider.browse("music".to_string(), 0, 100).await.unwrap();
+        let stations = stations
+            .into_iter()
+            .map(|x| Station::from(x))
+            .collect::<Vec<Station>>();
+        assert!(stations.len() == 100)
+    }
+
+    #[tokio::test]
+    pub async fn test_categories() {
+        let provider = Radiobrowser::new().await;
+        let categories = provider.categories(0, 100).await.unwrap();
+        assert!(categories.len() > 0)
+    }
+}

src/provider/tunein.rs

···
+use crate::types::Station;
+
+use super::Provider;
+use anyhow::Error;
+use async_trait::async_trait;
+use tunein::TuneInClient;
+
+pub struct Tunein {
+    client: TuneInClient,
+}
+
+impl Tunein {
+    pub fn new() -> Self {
+        Self {
+            client: TuneInClient::new(),
+        }
+    }
+}
+
+#[async_trait]
+impl Provider for Tunein {
+    async fn search(&self, name: String) -> Result<Vec<Station>, Error> {
+        let results = self
+            .client
+            .search(&name)
+            .await
+            .map_err(|e| Error::msg(e.to_string()))?;
+        let stations = results.into_iter().map(|x| Station::from(x)).collect();
+        Ok(stations)
+    }
+
+    async fn get_station(&self, id: String) -> Result<Option<Station>, Error> {
+        let stations = self
+            .client
+            .get_station(&id)
+            .await
+            .map_err(|e| Error::msg(e.to_string()))?;
+        match stations.len() {
+            0 => {
+                let results = self.search(id.clone()).await?;
+                let station = results.first().cloned();
+                match station {
+                    Some(st) => {
+                        let stations = self
+                            .client
+                            .get_station(&st.id)
+                            .await
+                            .map_err(|e| Error::msg(e.to_string()))?;
+                        let mut station = Station::from(stations[0].clone());
+                        station.id = st.id.clone();
+                        station.name = st.name.clone();
+                        station.playing = st.playing.clone();
+                        return Ok(Some(station));
+                    }
+                    None => Ok(None),
+                }
+            }
+            _ => Ok(Some(Station::from(stations[0].clone()))),
+        }
+    }
+
+    async fn browse(
+        &self,
+        category: String,
+        _offset: u32,
+        _limit: u32,
+    ) -> Result<Vec<Station>, Error> {
+        let guide_id = category.clone();
+        let category = match category.to_lowercase().as_str() {
+            "by location" => Some(tunein::types::Category::ByLocation),
+            "by language" => Some(tunein::types::Category::ByLanguage),
+            "sports" => Some(tunein::types::Category::Sports),
+            "talk" => Some(tunein::types::Category::Talk),
+            "music" => Some(tunein::types::Category::Music),
+            "local radio" => Some(tunein::types::Category::LocalRadio),
+            "podcasts" => Some(tunein::types::Category::Podcasts),
+            _ => None,
+        };
+
+        if category.is_none() {
+            let category_stations = self
+                .client
+                .browse_by_id(&guide_id)
+                .await
+                .map_err(|e| Error::msg(e.to_string()))?;
+
+            let mut stations = vec![];
+
+            for st in category_stations {
+                if let Some(children) = st.clone().children {
+                    stations = [stations, vec![Box::new(st.clone())], children].concat();
+                }
+            }
+
+            let stations = stations.into_iter().map(|x| Station::from(x)).collect();
+            return Ok(stations);
+        }
+
+        let category_stations = self
+            .client
+            .browse(category)
+            .await
+            .map_err(|e| Error::msg(e.to_string()))?;
+
+        let stations = category_stations
+            .clone()
+            .into_iter()
+            .map(|x| Station::from(x))
+            .collect::<Vec<Station>>();
+
+        let mut _stations = vec![];
+        for st in category_stations {
+            if let Some(children) = st.children {
+                _stations = [_stations, children].concat();
+            }
+        }
+        let _stations = _stations
+            .into_iter()
+            .map(|x| Station::from(x))
+            .collect::<Vec<Station>>();
+
+        Ok([stations, _stations].concat())
+    }
+
+    async fn categories(&self, _offset: u32, _limit: u32) -> Result<Vec<String>, Error> {
+        let categories = self
+            .client
+            .browse(None)
+            .await
+            .map_err(|e| Error::msg(e.to_string()))?;
+        let categories = categories.into_iter().map(|x| x.text).collect();
+        Ok(categories)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    pub async fn test_search() {
+        let provider = Tunein::new();
+        let name = "alternativeradio";
+        let stations = provider.search(name.to_string()).await.unwrap();
+        println!("Search: {:#?}", stations);
+        assert!(stations.len() > 0)
+    }
+
+    #[tokio::test]
+    pub async fn test_get_station() {
+        let provider = Tunein::new();
+        let name = "s288303".to_string();
+        let station = provider.get_station(name).await.unwrap();
+        println!("Station: {:#?}", station);
+        assert!(station.is_some())
+    }
+
+    #[tokio::test]
+    pub async fn test_browse() {
+        let provider = Tunein::new();
+        let stations = provider.browse("music".to_string(), 0, 100).await.unwrap();
+        println!("Browse: {:#?}", stations);
+        assert!(stations.len() > 0)
+    }
+
+    #[tokio::test]
+    pub async fn test_browse_by_id() {
+        let provider = Tunein::new();
+        let stations = provider.browse("c57942".to_string(), 0, 100).await.unwrap();
+        println!("Browse by category id: {:#?}", stations);
+        assert!(stations.len() > 0)
+    }
+
+    #[tokio::test]
+    pub async fn test_categories() {
+        let provider = Tunein::new();
+        let categories = provider.categories(0, 100).await.unwrap();
+        println!("Categories: {:#?}", categories);
+        assert!(categories.len() > 0)
+    }
+}

src/search.rs

···
 use anyhow::Error;
 use owo_colors::OwoColorize;
-use tunein::TuneInClient;
 
-pub async fn exec(query: &str) -> Result<(), Error> {
-    let client = TuneInClient::new();
-    let results = client
-        .search(query)
-        .await
-        .map_err(|e| Error::msg(e.to_string()))?;
+use crate::provider::{radiobrowser::Radiobrowser, tunein::Tunein, Provider};
+
+pub async fn exec(query: &str, provider: &str) -> Result<(), Error> {
+    let provider: Box<dyn Provider> = match provider {
+        "tunein" => Box::new(Tunein::new()),
+        "radiobrowser" => Box::new(Radiobrowser::new().await),
+        _ => {
+            return Err(anyhow::anyhow!(format!(
+                "Unsupported provider '{}'",
+                provider
+            )))
+        }
+    };
+    let results = provider.search(query.to_string()).await?;
     let query = format!("\"{}\"", query);
     println!("Results for {}:", query.bright_green());
 
-    let results = results
-        .into_iter()
-        .filter(|r| Some("audio".to_string()) == r.r#type)
-        .collect::<Vec<_>>();
-
     if results.is_empty() {
         println!("No results found");
         return Ok(());
     }
 
     for result in results {
-        if Some("audio".to_string()) == result.r#type {
-            println!(
+        match result.playing {
+            Some(playing) => println!(
                 "{} | {} | id: {}",
-                result.text.magenta(),
-                result.subtext.unwrap_or_default(),
-                result.guide_id.unwrap()
-            );
+                result.name.magenta(),
+                playing,
+                result.id
+            ),
+            None => println!("{} | id: {}", result.name.magenta(), result.id),
         }
     }
     Ok(())

src/tags.rs

···
+pub const TAGS: &[&str] = &[
+    "pop",
+    "music",
+    "news",
+    "rock",
+    "classical",
+    "talk",
+    "hits",
+    "radio",
+    "entretenimiento",
+    "dance",
+    "oldies",
+    "estación",
+    "80s",
+    "méxico",
+    "fm",
+    "christian",
+    "public radio",
+    "jazz",
+    "música",
+    "top 40",
+    "classic hits",
+    "90s",
+    "community radio",
+    "norteamérica",
+    "electronic",
+    "pop music",
+    "adult contemporary",
+    "moi merino",
+    "classic rock",
+    "latinoamérica",
+    "español",
+    "country",
+    "local news",
+    "alternative",
+];

src/types.rs

···
+use std::thread;
+
+use radiobrowser::ApiStation;
+use tunein::types::{SearchResult, StationLinkDetails};
+
+use crate::extract::extract_stream_url;
+
+#[derive(Debug, Clone)]
+pub struct Station {
+    pub id: String,
+    pub name: String,
+    pub codec: String,
+    pub bitrate: u32,
+    pub stream_url: String,
+    pub playing: Option<String>,
+}
+
+impl From<ApiStation> for Station {
+    fn from(station: ApiStation) -> Station {
+        Station {
+            id: station.stationuuid,
+            name: station.name,
+            codec: station.codec,
+            bitrate: station.bitrate,
+            stream_url: station.url_resolved,
+            playing: None,
+        }
+    }
+}
+
+impl From<SearchResult> for Station {
+    fn from(result: SearchResult) -> Station {
+        Station {
+            id: result.guide_id.unwrap_or_default(),
+            name: result.text,
+            bitrate: result
+                .bitrate
+                .unwrap_or("0".to_string())
+                .parse()
+                .unwrap_or_default(),
+            codec: Default::default(),
+            stream_url: Default::default(),
+            playing: result.subtext,
+        }
+    }
+}
+
+impl From<Box<SearchResult>> for Station {
+    fn from(result: Box<SearchResult>) -> Station {
+        Station {
+            id: result.guide_id.unwrap_or_default(),
+            name: result.text,
+            bitrate: result
+                .bitrate
+                .unwrap_or("0".to_string())
+                .parse()
+                .unwrap_or_default(),
+            codec: Default::default(),
+            stream_url: Default::default(),
+            playing: None,
+        }
+    }
+}
+
+impl From<StationLinkDetails> for Station {
+    fn from(details: StationLinkDetails) -> Station {
+        let handle = thread::spawn(move || {
+            let rt = tokio::runtime::Runtime::new().unwrap();
+            rt.block_on(extract_stream_url(&details.url, details.playlist_type))
+        });
+        let stream_url = handle.join().unwrap().unwrap();
+        Station {
+            id: Default::default(),
+            name: Default::default(),
+            bitrate: details.bitrate,
+            stream_url,
+            codec: details.media_type.to_uppercase(),
+            playing: None,
+        }
+    }
+}
+
+impl From<tunein::types::Station> for Station {
+    fn from(st: tunein::types::Station) -> Station {
+        Station {
+            id: st.guide_id.unwrap_or_default(),
+            name: st.text,
+            bitrate: st
+                .bitrate
+                .unwrap_or("0".to_string())
+                .parse()
+                .unwrap_or_default(),
+            stream_url: Default::default(),
+            codec: st.formats.unwrap_or_default().to_uppercase(),
+            playing: st.playing,
+        }
+    }
+}
+
+impl From<Box<tunein::types::Station>> for Station {
+    fn from(st: Box<tunein::types::Station>) -> Station {
+        Station {
+            id: st.guide_id.unwrap_or_default(),
+            name: st.text,
+            bitrate: st
+                .bitrate
+                .unwrap_or("0".to_string())
+                .parse()
+                .unwrap_or_default(),
+            stream_url: Default::default(),
+            codec: st.formats.unwrap_or_default().to_uppercase(),
+            playing: st.playing,
+        }
+    }
+}
+
+impl From<tunein::types::CategoryDetails> for Station {
+    fn from(ct: tunein::types::CategoryDetails) -> Station {
+        Station {
+            id: ct.guide_id.unwrap_or_default(),
+            name: ct.text,
+            bitrate: 0,
+            stream_url: Default::default(),
+            codec: Default::default(),
+            playing: None,
+        }
+    }
+}