madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#300 cal: revert highlight command; #308 mpd: escape quotes in cover path; weather...
authorcopycat-killer <dada@archlinux.info>
Fri, 3 Feb 2017 20:00:00 +0000 (21:00 +0100)
committercopycat-killer <dada@archlinux.info>
Fri, 3 Feb 2017 20:00:00 +0000 (21:00 +0100)
widgets/calendar.lua
widgets/mpd.lua
widgets/weather.lua
wiki

index b8aeabd600c0980382285de433c4ffab392a1546..f351356f7527fee968d41669a7e7f41077514860 100644 (file)
@@ -68,7 +68,7 @@ function calendar.show(t_out, inc_offset, scr)
 
     helpers.async(f, function(ws)
         fg, bg = calendar.notification_preset.fg, calendar.notification_preset.bg
-        ws = ws:gsub("%c%[%d+[m]?" .. today .. "%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
+        ws = ws:gsub("%c%[%d+[m]?%s?%d+%c%[%d+[m]?", markup.bold(markup.color(bg, fg, today)))
         calendar.hide()
         calendar.notification = naughty.notify({
             preset      = calendar.notification_preset,
index c4c4691850c061f6e9684ea0ba279c5b85dd733b..58e8303e5b1577684f3395a79e4103143e2c6952 100644 (file)
@@ -112,7 +112,7 @@ local function worker(args)
 
                     if not string.match(mpd_now.file, "http.*://") then -- local file instead of http stream
                         local path   = string.format("%s/%s", music_dir, string.match(mpd_now.file, ".*/"))
-                        local cover  = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path, cover_pattern)
+                        local cover  = string.format("find '%s' -maxdepth 1 -type f | egrep -i -m1 '%s'", path:gsub("'", "\'"):gsub('"', '\"'), cover_pattern)
                         helpers.async({ shell, "-c", cover }, function(current_icon)
                             common.icon = current_icon:gsub("\n", "")
                             if #common.icon == 0 then common.icon = nil end
index febd73b37b8ac0caa37e48bbcff1e082414fa0f0..1e398cc065f8acaaeb51545a429bd2a9c301056e 100644 (file)
@@ -68,6 +68,7 @@ local function worker(args)
         end
 
         if not weather.notification_text then
+            weather.update()
             weather.forecast_update()
         end
 
diff --git a/wiki b/wiki
index 0868101cb7cd8d8947e6b36cd9a7e36c91cc3a99..e2ce961ae4ba86f373d26b79b7e7b4891e1a9aa9 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 0868101cb7cd8d8947e6b36cd9a7e36c91cc3a99
+Subproject commit e2ce961ae4ba86f373d26b79b7e7b4891e1a9aa9