Revert to default sql-lite config values until rudimeier/bash_ini_par…

…ser#2 is fixed.
jcass77 · Mar 10, 2015 · 52c0070 · 52c0070
1 parent bb7032b
commit 52c0070
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/filechanges/boot/config/settings.ini b/filechanges/boot/config/settings.ini
@@ -341,18 +341,22 @@ excluded_file_extensions = .html, .jpeg, .jpg, .log, .nfo, .png, .txt, .mkv, .av
 [local-sqlite]
 enabled = true
 
+# NOTE: Handling of complex paramters (e.g. that contain spaces and do not contain '=') are not
+#       currently handled properly by read_ini.sh. Commented out this section in order to revert
+#       to using default values instead.
+#       (see https://github.com/rudimeier/bash_ini_parser/issues/2 for details
 # top-level directories for browsing, as <name> <uri>
-directories =
-    Albums                  local:directory?type=album
-    Artists                 local:directory?type=artist
-    Composers               local:directory?type=artist&role=composer
-    Folders                 local:directory:
-    Genres                  local:directory?type=genre
-    Performers              local:directory?type=artist&role=performer
-    Release Years           local:directory?type=date&format=%25Y
-    Tracks                  local:directory?type=track
-    Last Week's Updates     local:directory?max-age=604800
-    Last Month's Updates    local:directory?max-age=2592000
+#directories =
+#    Albums                  local:directory?type=album
+#    Artists                 local:directory?type=artist
+#    Composers               local:directory?type=artist&role=composer
+#    Folders                 local:directory:
+#    Genres                  local:directory?type=genre
+#    Performers              local:directory?type=artist&role=performer
+#    Release Years           local:directory?type=date&format=%25Y
+#    Tracks                  local:directory?type=track
+#    Last Week's Updates     local:directory?max-age=604800
+#    Last Month's Updates    local:directory?max-age=2592000
 
 # database connection timeout in seconds
 timeout = 10

diff --git a/filechanges/opt/musicbox/read_ini.sh b/filechanges/opt/musicbox/read_ini.sh
@@ -210,9 +210,7 @@ function read_ini()
 		fi
 
 		# Valid var/value line? (check for variable name and then '=')
-		# HACK: Handling of local-sqlite's 'directories' variables. Bypass lines ending in 'directory:'
-		#       as if they are valid.
-		if ! [[ "${line}" =~ ^[[:print:]]+[[:space:]]*directory:|= ]]
+		if ! [[ "${line}" =~ ^[[:print:]]+[[:space:]]*= ]]
 		then
 			echo "Error: Invalid line:" >&2
 			echo " ${LINE_NUM}: '$line'" >&2