From 6f2f44168d28910c212eef72fefbab2c0858a5f9 Mon Sep 17 00:00:00 2001
From: ejurgensen <espenjurgensen@gmail.com>
Date: Mon, 17 Nov 2014 22:53:52 +0100
Subject: [PATCH] Some config file polish (now that it's being updated anyway)

---
 forked-daapd.conf | 22 +++++++++++++++++++---
 src/conffile.c    |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/forked-daapd.conf b/forked-daapd.conf
index 4cd49985..b5133588 100644
--- a/forked-daapd.conf
+++ b/forked-daapd.conf
@@ -9,18 +9,27 @@
 
 general {
 	# Username
+	# Make sure the user has read access to the library directories you set
+ 	# below, and full access to the databases, log and local audio
 	uid = "daapd"
-	logfile = "/var/log/forked-daapd.log"
+
 	# Database location
 #	db_path = "/var/cache/forked-daapd/songs3.db"
+
+	# Log file and level
 	# Available levels: fatal, log, warning, info, debug, spam
+	logfile = "/var/log/forked-daapd.log"
 	loglevel = log
+
 	# Admin password for the non-existent web interface
 	admin_password = "unused"
+
 	# Enable/disable IPv6
 	ipv6 = no
+
 	# Location of cache database
 #	cache_path = "/var/cache/forked-daapd/cache.db"
+
 	# DAAP requests that take longer than this threshold (in msec) get their
 	# replies cached for next time. Set to 0 to disable caching.
 #	cache_daap_threshold = 1000
@@ -31,8 +40,10 @@ library {
 	# Name of the library as displayed by the clients
 	# %h: hostname, %v: version
 	name = "My Music on %h"
+
 	# TCP port to listen on. Default port is 3689 (daap)
 	port = 3689
+
 	# Password for the library. Optional.
 #	password = ""
 
@@ -83,8 +94,8 @@ library {
 	# File types the scanner should ignore
 	# Non-audio files will never be added to the database, but here you
 	# can prevent the scanner from even probing them. This might improve
-	# scan time. By default .db and .ini are ignored.
-#	filetypes_ignore = { ".db", ".ini" }
+	# scan time. By default .db, .ini, .db-journal and .pdf are ignored.
+#	filetypes_ignore = { ".db", ".ini", ".db-journal", ".pdf" }
 
 	# Disable startup file scanning
 	# When forked-daapd starts it will do an initial file scan of your
@@ -110,8 +121,10 @@ library {
 audio {
 	# Name - used in the speaker list in Remote
 	nickname = "Computer"
+
 	# Audio device name for local audio output
 #	card = "default"
+
 	# Mixer channel to use for volume control - ALSA/Linux only
 	# If not set, PCM will be used if available, otherwise Master.
 #	mixer = ""
@@ -123,6 +136,7 @@ audio {
 	# forked-daapd's volume goes to 11! If that's more than you can handle
 	# you can set a lower value here
 #	max_volume = 11
+
 	# AirPlay password
 #	password = "s1kr3t"
 #}
@@ -131,8 +145,10 @@ audio {
 spotify {
 	# Directory where user settings should be stored (credentials)
 #	settings_dir = "/var/cache/forked-daapd/libspotify"
+
 	# Cache directory
 #	cache_dir = "/tmp"
+
 	# Set preferred bitrate for music streaming
 	# 0: No preference (default), 1: 96kbps, 2: 160kbps, 3: 320kbps
 #	bitrate = 0
diff --git a/src/conffile.c b/src/conffile.c
index 60118be3..e55a0b04 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -76,7 +76,7 @@ static cfg_opt_t sec_library[] =
     CFG_STR("name_podcasts", "Podcasts", CFGF_NONE),
     CFG_STR("name_audiobooks", "Audiobooks", CFGF_NONE),
     CFG_STR_LIST("artwork_basenames", "{artwork,cover,Folder}", CFGF_NONE),
-    CFG_STR_LIST("filetypes_ignore", "{.db,.ini}", CFGF_NONE),
+    CFG_STR_LIST("filetypes_ignore", "{.db,.ini,.db-journal,.pdf}", CFGF_NONE),
     CFG_BOOL("filescan_disable", cfg_false, CFGF_NONE),
     CFG_BOOL("itunes_overrides", cfg_false, CFGF_NONE),
     CFG_STR_LIST("no_transcode", NULL, CFGF_NONE),