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

Fixup parent playlist

Browse Source
This commit is contained in:
ejurgensen 2015-03-14 23:35:19 +01:00
parent 618e22d57e
commit 8359a9018d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/db.c
View File

@ -158,8 +158,8 @@ static const struct col_type_map pli_cols_map[] =
{ pli_offsetof(path), DB_TYPE_STRING }, { pli_offsetof(path), DB_TYPE_STRING },
{ pli_offsetof(index), DB_TYPE_INT }, { pli_offsetof(index), DB_TYPE_INT },
{ pli_offsetof(special_id), DB_TYPE_INT }, { pli_offsetof(special_id), DB_TYPE_INT },
{ pli_offsetof(parent_id), DB_TYPE_INT },
{ pli_offsetof(virtual_path), DB_TYPE_STRING }, { pli_offsetof(virtual_path), DB_TYPE_STRING },
{ pli_offsetof(parent_id), DB_TYPE_INT },
/* items is computed on the fly */ /* items is computed on the fly */
}; };
@ -245,8 +245,8 @@ static const ssize_t dbpli_cols_map[] =
dbpli_offsetof(path), dbpli_offsetof(path),
dbpli_offsetof(index), dbpli_offsetof(index),
dbpli_offsetof(special_id), dbpli_offsetof(special_id),
dbpli_offsetof(parent_id),
dbpli_offsetof(virtual_path), dbpli_offsetof(virtual_path),
dbpli_offsetof(parent_id),
/* items is computed on the fly */ /* items is computed on the fly */
}; };
@ -4514,8 +4514,8 @@ db_perthread_deinit(void)
" path VARCHAR(4096)," \ " path VARCHAR(4096)," \
" idx INTEGER NOT NULL," \ " idx INTEGER NOT NULL," \
" special_id INTEGER DEFAULT 0," \ " special_id INTEGER DEFAULT 0," \
" parent_id INTEGER DEFAULT 0," \ " virtual_path VARCHAR(4096)," \
" virtual_path VARCHAR(4096)" \ " parent_id INTEGER DEFAULT 0" \
");" ");"
#define T_PLITEMS \ #define T_PLITEMS \
@ -5687,6 +5687,8 @@ static const struct db_init_query db_upgrade_v1501_queries[] =
#define U_V16_ALTER_TBL_PL_ADD_COL \ #define U_V16_ALTER_TBL_PL_ADD_COL \
"ALTER TABLE playlists ADD COLUMN virtual_path VARCHAR(4096) DEFAULT NULL;" "ALTER TABLE playlists ADD COLUMN virtual_path VARCHAR(4096) DEFAULT NULL;"
#define D_V1600_SCVER \
"DELETE FROM admin WHERE key = 'schema_version';"
#define U_V1600_SCVER_MAJOR \ #define U_V1600_SCVER_MAJOR \
"UPDATE admin SET value = '16' WHERE key = 'schema_version_major';" "UPDATE admin SET value = '16' WHERE key = 'schema_version_major';"
#define U_V1600_SCVER_MINOR \ #define U_V1600_SCVER_MINOR \
@ -5698,6 +5700,7 @@ static const struct db_init_query db_upgrade_v16_queries[] =
{ U_V16_ALTER_TBL_PL_ADD_COL, "alter table playlists add column virtual_path" }, { U_V16_ALTER_TBL_PL_ADD_COL, "alter table playlists add column virtual_path" },
{ U_V16_CREATE_VIEW_FILELIST, "create new view filelist" }, { U_V16_CREATE_VIEW_FILELIST, "create new view filelist" },
{ D_V1600_SCVER, "delete schema_version" },
{ U_V1600_SCVER_MAJOR, "set schema_version_major to 16" }, { U_V1600_SCVER_MAJOR, "set schema_version_major to 16" },
{ U_V1600_SCVER_MINOR, "set schema_version_minor to 00" }, { U_V1600_SCVER_MINOR, "set schema_version_minor to 00" },
}; };

4
src/db.h
View File

@ -181,8 +181,8 @@ struct playlist_info {
char *path; /* path of underlying playlist */ char *path; /* path of underlying playlist */
uint32_t index; /* index of playlist for paths with multiple playlists */ uint32_t index; /* index of playlist for paths with multiple playlists */
uint32_t special_id; /* iTunes identifies certain 'special' playlists with special meaning */ uint32_t special_id; /* iTunes identifies certain 'special' playlists with special meaning */
uint32_t parent_id; /* Id of parent playlist if the playlist is nested */
char *virtual_path; /* virtual path of underlying playlist */ char *virtual_path; /* virtual path of underlying playlist */
uint32_t parent_id; /* Id of parent playlist if the playlist is nested */
}; };
#define pli_offsetof(field) offsetof(struct playlist_info, field) #define pli_offsetof(field) offsetof(struct playlist_info, field)
@ -198,8 +198,8 @@ struct db_playlist_info {
char *path; char *path;
char *index; char *index;
char *special_id; char *special_id;
char *parent_id;
char *virtual_path; char *virtual_path;
char *parent_id;
}; };
#define dbpli_offsetof(field) offsetof(struct db_playlist_info, field) #define dbpli_offsetof(field) offsetof(struct db_playlist_info, field)