MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-25 04:19:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

[db/filescanner/spotify] Set directory path

Browse Source
This commit is contained in:
chme 2018-11-24 09:44:18 +01:00
parent 42cbd721fd
commit dc020cc3ac
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/db.c
View File

@ -4054,7 +4054,7 @@ db_directory_update(struct directory_info *di)
} }
int int
db_directory_addorupdate(char *virtual_path, int disabled, int parent_id) db_directory_addorupdate(char *virtual_path, char *path, int disabled, int parent_id)
{ {
struct directory_info di; struct directory_info di;
int id; int id;
@ -4065,6 +4065,7 @@ db_directory_addorupdate(char *virtual_path, int disabled, int parent_id)
di.id = id; di.id = id;
di.parent_id = parent_id; di.parent_id = parent_id;
di.virtual_path = virtual_path; di.virtual_path = virtual_path;
di.path = path;
di.disabled = disabled; di.disabled = disabled;
di.db_timestamp = (uint64_t)time(NULL); di.db_timestamp = (uint64_t)time(NULL);

2
src/db.h
View File

@ -711,7 +711,7 @@ void
db_directory_enum_end(struct directory_enum *de); db_directory_enum_end(struct directory_enum *de);
int int
db_directory_addorupdate(char *virtual_path, int disabled, int parent_id); db_directory_addorupdate(char *virtual_path, char *path, int disabled, int parent_id);
void void
db_directory_ping_bymatch(char *virtual_path); db_directory_ping_bymatch(char *virtual_path);

4
src/library/filescanner.c
View File

@ -749,7 +749,7 @@ process_directory(char *path, int parent_id, int flags)
if (ret < 0) if (ret < 0)
return; return;
dir_id = db_directory_addorupdate(virtual_path, 0, parent_id); dir_id = db_directory_addorupdate(virtual_path, path, 0, parent_id);
if (dir_id <= 0) if (dir_id <= 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '%s'\n", virtual_path); DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '%s'\n", virtual_path);
@ -876,7 +876,7 @@ process_parent_directories(char *path)
if (ret < 0) if (ret < 0)
return 0; return 0;
dir_id = db_directory_addorupdate(virtual_path, 0, dir_id); dir_id = db_directory_addorupdate(virtual_path, buf, 0, dir_id);
if (dir_id <= 0) if (dir_id <= 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '%s'\n", virtual_path); DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '%s'\n", virtual_path);

4
src/spotify_webapi.c
View File

@ -1250,7 +1250,7 @@ prepare_directories(const char *artist, const char *album)
DPRINTF(E_LOG, L_SPOTIFY, "Virtual path exceeds PATH_MAX (/spotify:/%s)\n", artist); DPRINTF(E_LOG, L_SPOTIFY, "Virtual path exceeds PATH_MAX (/spotify:/%s)\n", artist);
return -1; return -1;
} }
dir_id = db_directory_addorupdate(virtual_path, 0, DIR_SPOTIFY); dir_id = db_directory_addorupdate(virtual_path, NULL, 0, DIR_SPOTIFY);
if (dir_id <= 0) if (dir_id <= 0)
{ {
DPRINTF(E_LOG, L_SPOTIFY, "Could not add or update directory '%s'\n", virtual_path); DPRINTF(E_LOG, L_SPOTIFY, "Could not add or update directory '%s'\n", virtual_path);
@ -1262,7 +1262,7 @@ prepare_directories(const char *artist, const char *album)
DPRINTF(E_LOG, L_SPOTIFY, "Virtual path exceeds PATH_MAX (/spotify:/%s/%s)\n", artist, album); DPRINTF(E_LOG, L_SPOTIFY, "Virtual path exceeds PATH_MAX (/spotify:/%s/%s)\n", artist, album);
return -1; return -1;
} }
dir_id = db_directory_addorupdate(virtual_path, 0, dir_id); dir_id = db_directory_addorupdate(virtual_path, NULL, 0, dir_id);
if (dir_id <= 0) if (dir_id <= 0)
{ {
DPRINTF(E_LOG, L_SPOTIFY, "Could not add or update directory '%s'\n", virtual_path); DPRINTF(E_LOG, L_SPOTIFY, "Could not add or update directory '%s'\n", virtual_path);