Fix critical bug in caching artists with dash symbols in names

diff --git a/awesompd.lua b/awesompd.lua
index 7562873c462208dfec750d2ac801fc5c118fbd6d..cd01c3af970b64cc3e2c75ae269b95c94bcf779d 100644 (file)
--- a/awesompd.lua
+++ b/awesompd.lua
@@ -1,7 +1,7 @@
 ---------------------------------------------------------------------------
 -- @author Alexander Yakushev <yakushev.alex@gmail.com>
 -- @copyright 2010-2011 Alexander Yakushev
--- @release v1.0.6
+-- @release v1.0.7
 ---------------------------------------------------------------------------
 
 require('utf8')

diff --git a/jamendo.lua b/jamendo.lua
index 9104ac3d5387b97303eef9f6d9cd0f8c13a1167a..cc8bc83c59352328b8cff9bb156400cf48179691 100644 (file)
--- a/jamendo.lua
+++ b/jamendo.lua
@@ -1,7 +1,7 @@
 ---------------------------------------------------------------------------
 -- @author Alexander Yakushev <yakushev.alex@gmail.com>
 -- @copyright 2011 Alexander Yakushev
--- @release v1.0.4
+-- @release v1.0.7
 ---------------------------------------------------------------------------
 
 module('jamendo', package.seeall)
@@ -68,7 +68,7 @@ current_request_table = { unit = "track",
 -- Local variables
 local jamendo_list = {}
 local cache_file = awful.util.getdir ("cache").."/jamendo_cache"
-local cache_header = "[version=1.0.6]"
+local cache_header = "[version=1.0.7]"
 local album_covers_folder = awful.util.getdir("cache") .. "/jamendo_covers/"
 local default_mp3_stream = nil
 local search_template = { fields = { "id", "name" },
@@ -341,7 +341,7 @@ function retrieve_cache()
                string.find(l,"(%d+)-([^-]+)-(%d+)-(.+)")
             track = {}
             track.id = id
-            track.artist_link_name = artist_link_name
+            track.artist_link_name = string.gsub(artist_link_name, '\\_', '-')
             track.album_id = album_id
             track.display_name = track_name
             jamendo_list[id] = track
@@ -360,7 +360,8 @@ function save_cache()
    local bus = io.open(cache_file, "w")
    bus:write(cache_header .. "\n")
    for id,track in pairs(jamendo_list) do
-      bus:write(string.format("%s-%s-%s-%s\n", id, track.artist_link_name,
+      bus:write(string.format("%s-%s-%s-%s\n", id, 
+                              string.gsub(track.artist_link_name, '-', '\\_'),
                               track.album_id, track.display_name))
    end
    bus:flush()