Escape single quotes in folder names (thanks, Blackmore's Night)

diff --git a/awesompd.lua b/awesompd.lua
index f59d77d14dcd137512ce7e08813c2fb9b447b3b9..447a7cd1651d13bde89a7a230b8510f9a0523a1e 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.8
+-- @release v1.0.9
 ---------------------------------------------------------------------------
 
 awesompd = {}
@@ -991,8 +991,12 @@ function awesompd:try_get_local_cover()
 
       local folder = music_folder .. current_file_folder
       
-      -- Get all images in the folder
-      local covers = self.pread("ls '" .. folder .. "' | grep -P '\.jpg\|\.png\|\.gif|\.jpeg'", "*all")
+      -- Get all images in the folder. Also escape occasional single
+      -- quotes in folder name.
+      local request = format("ls '%s' | grep -P '\.jpg\|\.png\|\.gif|\.jpeg'",
+                             string.gsub(folder, "'", "'\\''"))
+
+      local covers = self.pread(request, "*all")
       local covers_table = self.split(covers)
       
       if covers_table.n > 0 then

diff --git a/jamendo.lua b/jamendo.lua
index 750aa5d4f7bf7dd759b4526b74c51f0636024b8e..d6cc50a1d80a8817d8a440d58e2dc0a114a4b9bb 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.8
+-- @release v1.0.9
 ---------------------------------------------------------------------------
 
 module('jamendo', package.seeall)