Merge branch 'master' into stable

Author: sailor

CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.11] 2020-02-17
+### Added
+- API: Added stationuuid to m3u output
+
+### Fixed
+- API: Filter order column for extra tables
+
 ## [0.6.10] 2020-02-01
 ### Fixed
 - API: Wrong links in docs

Cargo.lock

@@ -4,7 +4,7 @@ description = "Radio-Browser Server with REST API"
 license = "agpl-3.0"
 name = "radiobrowser-api-rust"
 readme = "README.md"
-version = "0.6.10"
+version = "0.6.11"
 edition = "2018"
 
 [dependencies]
@@ -25,7 +25,7 @@ reqwest = "0.9.24"
 rouille = "3.0.0"
 serde = "1.0.104"
 serde_derive ="1.0.104"
-serde_json = "1.0.45"
+serde_json = "1.0.48"
 threadpool = "1.7.1"
 toml = "0.5.6"
 url = "2.1.1"

Cargo.toml

@@ -80,7 +80,7 @@ docker stack deploy -c docker-compose-traefik.yml rb
 # download distribution
 mkdir -p radiobrowser
 cd radiobrowser
-wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.10/radiobrowser-dist.tar.gz
+wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.11/radiobrowser-dist.tar.gz
 tar -zxf radiobrowser-dist.tar.gz
 
 # config database
@@ -101,7 +101,7 @@ sudo systemctl start radiobrowser
 * create database and database user
 
 ```bash
-wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.10/radiobrowser-api-rust_0.6.10_amd64.deb
+wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.11/radiobrowser-api-rust_0.6.10_amd64.deb
 sudo apt install default-mysql-server
 sudo dpkg -i radiobrowser-api-rust_0.6.10_amd64.deb
 cat /usr/share/radiobrowser/init.sql | mysql
@@ -193,7 +193,7 @@ cd radiobrowser-api-rust
 # checkout stable
 git checkout stable
 # deploy, change email adress, for ssl with certbot
-ansible-playbook -e "email=test@example.com" -e "version=0.6.10" -e "ansible_python_interpreter=auto" -i "test.example.com,test2.example.com" ansible/playbook.yml
+ansible-playbook -e "email=test@example.com" -e "version=0.6.11" -e "ansible_python_interpreter=auto" -i "test.example.com,test2.example.com" ansible/playbook.yml
 ```
 
 ## Building

README.md

@@ -2,7 +2,7 @@ version: "3.2"
 services:
   api:
     build: ./
-    image: segleralex/radiobrowser-api-rust:0.6.10
+    image: segleralex/radiobrowser-api-rust:0.6.11
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.api.rule=Host(`${SOURCE}`)"

docker-compose-traefik.yml

@@ -2,7 +2,7 @@ version: "3.0"
 services:
   api:
     build: ./
-    image: segleralex/radiobrowser-api-rust:0.6.10
+    image: segleralex/radiobrowser-api-rust:0.6.11
     deploy:
       replicas: 1
     networks:

docker-compose.yml

@@ -145,6 +145,10 @@ impl Station {
         let mut j = String::with_capacity(200 * list.len());
         j.push_str("#EXTM3U\r\n");
         for item in list {
+            j.push_str("#RADIOBROWSERUUID:");
+            j.push_str(&item.stationuuid);
+            j.push_str("\r\n");
+            
             j.push_str("#EXTINF:1,");
             j.push_str(&item.name);
             j.push_str("\r\n");

src/api/data/station.rs

@@ -8,14 +8,16 @@ pub enum DbError {
     ConnectionError(String),
     VoteError(String),
     AddStationError(String),
+    IllegalOrderError(String),
 }
 
 impl Display for DbError {
     fn fmt(&self, f: &mut Formatter) -> Result {
         match *self {
-            DbError::ConnectionError(ref v) => write!(f, "{}", v),
-            DbError::VoteError(ref v) => write!(f, "{}", v),
-            DbError::AddStationError(ref v) => write!(f, "{}", v),
+            DbError::ConnectionError(ref v) => write!(f, "ConnectionError '{}'", v),
+            DbError::VoteError(ref v) => write!(f, "VoteError '{}'", v),
+            DbError::AddStationError(ref v) => write!(f, "AddStationError '{}'", v),
+            DbError::IllegalOrderError(ref v) => write!(f, "IllegalOrderError '{}'", v),
         }
     }
 }

src/db/db_error.rs

@@ -1148,6 +1148,7 @@ impl DbConnection for MysqlConnection {
         reverse: bool,
         hidebroken: bool,
     ) -> Result<Vec<ExtraInfo>, Box<dyn Error>> {
+        let order = filter_order_1_n(&order)?;
         let mut params: Vec<Value> = Vec::with_capacity(1);
         let mut items = vec![];
         let reverse_string = if reverse { "DESC" } else { "ASC" };
@@ -1183,6 +1184,7 @@ impl DbConnection for MysqlConnection {
         reverse: bool,
         hidebroken: bool,
     ) -> Result<Vec<ExtraInfo>, Box<dyn Error>> {
+        let order = filter_order_1_n(&order)?;
         let query: String;
         let reverse_string = if reverse { "DESC" } else { "ASC" };
         let hidebroken_string = if hidebroken {
@@ -1475,4 +1477,12 @@ fn filter_order(order: &str) -> &str {
         "random" => "RAND()",
         _ => "Name",
     }
+}
+
+fn filter_order_1_n(order: &str) -> Result<&str, Box<dyn Error>> {
+    match order {
+        "name" => Ok("name"),
+        "stationcount" => Ok("stationcount"),
+        _ => Err(Box::new(DbError::IllegalOrderError(String::from(order)))),
+    }
 }

src/db/db_mysql/mod.rs

@@ -1,4 +1,4 @@
-mod api_error;
+mod pull_error;
 
 use std::error::Error;
 use std::thread;
@@ -79,7 +79,7 @@ fn pull_history(server: &str, api_version: u32, lastid: Option<String>) -> Resul
             Ok(list)
         },
         _ => {
-            Err(Box::new(api_error::ApiError::UnknownApiVersion(api_version)))
+            Err(Box::new(pull_error::PullError::UnknownApiVersion(api_version)))
         }
     }
 }
@@ -103,7 +103,7 @@ fn pull_checks(server: &str, api_version: u32, lastid: Option<String>) -> Result
             Ok(list)
         },
         _ => {
-            Err(Box::new(api_error::ApiError::UnknownApiVersion(api_version)))
+            Err(Box::new(pull_error::PullError::UnknownApiVersion(api_version)))
         }
     }
 }
@@ -127,7 +127,7 @@ fn pull_clicks(server: &str, api_version: u32, lastid: Option<String>) -> Result
             Ok(list)
         },
         _ => {
-            Err(Box::new(api_error::ApiError::UnknownApiVersion(api_version)))
+            Err(Box::new(pull_error::PullError::UnknownApiVersion(api_version)))
         }
     }
 }
@@ -147,7 +147,7 @@ fn pull_stations(server: &str, api_version: u32) -> Result<Vec<Station>, Box<dyn
             Ok(list)
         },
         _ => {
-            Err(Box::new(api_error::ApiError::UnknownApiVersion(api_version)))
+            Err(Box::new(pull_error::PullError::UnknownApiVersion(api_version)))
         }
     }
 }
@@ -241,7 +241,7 @@ fn pull_server(connection_new: &Box<dyn DbConnection>, server: &str) -> Result<(
         connection_new.sync_votes(list_stations)?;
     }
 
-    info!("Pull from '{}' OK (Added station changes: {}, Added station checks: {}, Added station clicks: {})", server, station_change_count, station_check_count, station_click_count);
+    debug!("Pull from '{}' OK (Added station changes: {}, Added station checks: {}, Added station clicks: {})", server, station_change_count, station_check_count, station_click_count);
     Ok(())
 }