Merge branch 'master' into stable

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.14] 2020-04-13
+### Fixed
+- PLS files had title and file content reversed
+
 ## [0.6.13] 2020-04-13
 ### Fixed
 - Always add CORS header, even on errors

Cargo.toml

@@ -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.13"
+version = "0.6.14"
 edition = "2018"
 
 [dependencies]

README.md

@@ -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.13/radiobrowser-dist.tar.gz
+wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.14/radiobrowser-dist.tar.gz
 tar -zxf radiobrowser-dist.tar.gz
 
 # config database
@@ -101,9 +101,9 @@ sudo systemctl start radiobrowser
 * create database and database user
 
 ```bash
-wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.13/radiobrowser-api-rust_0.6.13_amd64.deb
+wget https://github.com/segler-alex/radiobrowser-api-rust/releases/download/0.6.14/radiobrowser-api-rust_0.6.14_amd64.deb
 sudo apt install default-mysql-server
-sudo dpkg -i radiobrowser-api-rust_0.6.13_amd64.deb
+sudo dpkg -i radiobrowser-api-rust_0.6.14_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 protected]" -e "version=0.6.13" -e "ansible_python_interpreter=auto" -i "test.example.com,test2.example.com" ansible/playbook.yml
+ansible-playbook -e "[email protected]" -e "version=0.6.14" -e "ansible_python_interpreter=auto" -i "test.example.com,test2.example.com" ansible/playbook.yml
 ```
 
 ## Building

docker-compose-traefik.yml

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

docker-compose.yml

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

src/api/data/station.rs

@@ -169,12 +169,12 @@ impl Station {
         j.push_str(&format!("NumberOfEntries={}\r\n", list.len()));
         for item in list {
             let i_str = i.to_string();
-            j.push_str("File");
+            j.push_str("Title");
             j.push_str(&i_str);
             j.push_str("=");
             j.push_str(&item.name);
             j.push_str("\r\n");
-            j.push_str("Title");
+            j.push_str("File");
             j.push_str(&i_str);
             j.push_str("=");
             if use_cached_url {