MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 22:46:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[filescanner] Ignore spotify/lastfm/remote during startup, they can give DB deadlocks

Browse Source 
- see https://www.raspberrypi.org/forums/viewtopic.php?p=1087137#p1087137
This commit is contained in:
ejurgensen 2016-12-28 22:53:00 +01:00
parent e4387fe33e
commit 82470b5168
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/filescanner.c
View File

@ -849,22 +849,31 @@ process_file(char *file, time_t mtime, off_t size, int type, int flags, int dir_
break; break;
case FILE_CTRL_REMOTE: case FILE_CTRL_REMOTE:
remote_pairing_read_pin(file); if (flags & F_SCAN_BULK)
DPRINTF(E_LOG, L_SCAN, "Bulk scan will ignore '%s' (to process, add it after startup)\n", file);
else
remote_pairing_read_pin(file);
break; break;
case FILE_CTRL_LASTFM: case FILE_CTRL_LASTFM:
#ifdef LASTFM #ifdef LASTFM
lastfm_login(file); if (flags & F_SCAN_BULK)
DPRINTF(E_LOG, L_SCAN, "Bulk scan will ignore '%s' (to process, add it after startup)\n", file);
else
lastfm_login(file);
#else #else
DPRINTF(E_LOG, L_SCAN, "Detected LastFM file, but this version was built without LastFM support\n"); DPRINTF(E_LOG, L_SCAN, "Found '%s', but this version was built without LastFM support\n", file);
#endif #endif
break; break;
case FILE_CTRL_SPOTIFY: case FILE_CTRL_SPOTIFY:
#ifdef HAVE_SPOTIFY_H #ifdef HAVE_SPOTIFY_H
spotify_login(file); if (flags & F_SCAN_BULK)
DPRINTF(E_LOG, L_SCAN, "Bulk scan will ignore '%s' (to process, add it after startup)\n", file);
else
spotify_login(file);
#else #else
DPRINTF(E_LOG, L_SCAN, "Detected Spotify file, but this version was built without Spotify support\n"); DPRINTF(E_LOG, L_SCAN, "Found '%s', but this version was built without Spotify support\n", file);
#endif #endif
break; break;