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

[scan] Consistent HTTP virtual paths (#449)

Browse Source
This commit is contained in:
Wolfgang Scherer 2017-12-02 16:44:01 +01:00 committed by ejurgensen
parent 617a0992d0
commit 0d006904da
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/library/filescanner.c
View File

@ -1640,13 +1640,21 @@ filescanner_fullrescan()
static int static int
scan_metadata(const char *path, struct media_file_info *mfi) scan_metadata(const char *path, struct media_file_info *mfi)
{ {
char *pos;
int ret; int ret;
if (strncasecmp(path, "http://", strlen("http://")) == 0) if (strncasecmp(path, "http://", strlen("http://")) == 0)
{ {
memset(mfi, 0, sizeof(struct media_file_info)); memset(mfi, 0, sizeof(struct media_file_info));
mfi->path = strdup(path); mfi->path = strdup(path);
mfi->virtual_path = safe_asprintf("/%s", mfi->path);
pos = strchr(path, '#');
if (pos)
mfi->fname = strdup(pos+1);
else
mfi->fname = strdup(filename_from_path(mfi->path)); mfi->fname = strdup(filename_from_path(mfi->path));
mfi->data_kind = DATA_KIND_HTTP; mfi->data_kind = DATA_KIND_HTTP;
mfi->directory_id = DIR_HTTP; mfi->directory_id = DIR_HTTP;
@ -1659,6 +1667,9 @@ scan_metadata(const char *path, struct media_file_info *mfi)
mfi->description = strdup("MPEG audio file"); mfi->description = strdup("MPEG audio file");
} }
if (!mfi->title)
mfi->title = strdup(mfi->fname);
return LIBRARY_OK; return LIBRARY_OK;
} }

11
src/library/filescanner_playlist.c
View File

@ -76,6 +76,7 @@ static int
process_url(int pl_id, const char *path, time_t mtime, int extinf, struct media_file_info *mfi) process_url(int pl_id, const char *path, time_t mtime, int extinf, struct media_file_info *mfi)
{ {
char virtual_path[PATH_MAX]; char virtual_path[PATH_MAX];
char *pos;
int ret; int ret;
if (extinf) if (extinf)
@ -83,7 +84,13 @@ process_url(int pl_id, const char *path, time_t mtime, int extinf, struct media_
mfi->id = db_file_id_bypath(path); mfi->id = db_file_id_bypath(path);
mfi->path = strdup(path); mfi->path = strdup(path);
mfi->fname = strdup(filename_from_path(path));
pos = strchr(path, '#');
if (pos)
mfi->fname = strdup(pos+1);
else
mfi->fname = strdup(filename_from_path(mfi->path));
mfi->data_kind = DATA_KIND_HTTP; mfi->data_kind = DATA_KIND_HTTP;
mfi->time_modified = mtime; mfi->time_modified = mtime;
mfi->directory_id = DIR_HTTP; mfi->directory_id = DIR_HTTP;
@ -100,7 +107,7 @@ process_url(int pl_id, const char *path, time_t mtime, int extinf, struct media_
if (!mfi->title) if (!mfi->title)
mfi->title = strdup(mfi->fname); mfi->title = strdup(mfi->fname);
snprintf(virtual_path, sizeof(virtual_path), "/http:/%s", mfi->title); snprintf(virtual_path, sizeof(virtual_path), "/%s", mfi->path);
mfi->virtual_path = strdup(virtual_path); mfi->virtual_path = strdup(virtual_path);
library_add_media(mfi); library_add_media(mfi);