MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make iTunes playlists work on win32

This commit is contained in:
Ron Pedde 2006-05-09 07:17:46 +00:00
parent 36f35206dc
commit b780bac291
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/scan-xml.c
View File

@ -181,6 +181,7 @@ int scan_xml_translate_path(char *pold, char *pnew) {
char working_path[PATH_MAX]; char working_path[PATH_MAX];
char *current = pold + strlen(pold); char *current = pold + strlen(pold);
char *pbase; char *pbase;
char *ptemp;
if((!pold)||(!strlen(pold))) if((!pold)||(!strlen(pold)))
return FALSE; return FALSE;
@ -202,15 +203,22 @@ int scan_xml_translate_path(char *pold, char *pnew) {
/* not a real file... go ahead and brute force it */ /* not a real file... go ahead and brute force it */
} }
if(!path_found) { ptemp = pold;
strcpy(working_path,pold); while(*ptemp) {
if(*ptemp == '/')
*ptemp = PATHSEP;
ptemp++;
}
strcpy(working_path,pold);
if(!path_found) {
DPRINTF(E_DBG,L_SCAN,"Translating %s, base %s\n",pold,scan_xml_file); DPRINTF(E_DBG,L_SCAN,"Translating %s, base %s\n",pold,scan_xml_file);
/* let's try to find the path by brute force. /* let's try to find the path by brute force.
* We'll assume that it is under the xml file somewhere * We'll assume that it is under the xml file somewhere
*/ */
while(!path_found && ((current = strrchr(working_path,'/')))) { while(!path_found && ((current = strrchr(working_path,'/')) || (current = strrchr(working_path,'\\')))) {
realpath(scan_xml_file,base_path); realpath(scan_xml_file,base_path);
DPRINTF(E_DBG,L_SCAN,"New base: %s\n",base_path); DPRINTF(E_DBG,L_SCAN,"New base: %s\n",base_path);
// strcpy(base_path,scan_xml_file); // strcpy(base_path,scan_xml_file);
@ -738,6 +746,7 @@ int scan_xml_tracks_section(int action, char *info) {
mp3.total_discs = atoi(info); mp3.total_discs = atoi(info);
} else if(current_field == SCAN_XML_T_LOCATION) { } else if(current_field == SCAN_XML_T_LOCATION) {
song_path = scan_xml_urldecode(info,0); song_path = scan_xml_urldecode(info,0);
DPRINTF(E_DBG,L_SCAN,"scan_path: %s\n",song_path);
} else if(current_field == SCAN_XML_T_DATE_ADDED) { } else if(current_field == SCAN_XML_T_DATE_ADDED) {
mp3.time_added = scan_xml_datedecode(info); mp3.time_added = scan_xml_datedecode(info);
} }
@ -808,6 +817,7 @@ int scan_xml_playlists_section(int action, char *info) {
return XML_STATE_ERROR; return XML_STATE_ERROR;
case XML_PL_ST_EXPECTING_PL: case XML_PL_ST_EXPECTING_PL:
/* either a new playlist, or end of playlist list */ /* either a new playlist, or end of playlist list */
dont_scan=0;
MAYBESETSTATE_PL(RXML_EVT_BEGIN,"dict",XML_PL_ST_EXPECTING_PL_DATA); MAYBESETSTATE_PL(RXML_EVT_BEGIN,"dict",XML_PL_ST_EXPECTING_PL_DATA);
if((action == RXML_EVT_END) && (strcasecmp(info,"array") == 0)) if((action == RXML_EVT_END) && (strcasecmp(info,"array") == 0))
return XML_STATE_PREAMBLE; return XML_STATE_PREAMBLE;
@ -852,7 +862,7 @@ int scan_xml_playlists_section(int action, char *info) {
DPRINTF(E_LOG,L_SCAN,"err adding playlist %s\n",current_name); DPRINTF(E_LOG,L_SCAN,"err adding playlist %s\n",current_name);
current_id=0; current_id=0;
} }
} }
dont_scan=0; dont_scan=0;
state=XML_PL_ST_EXPECTING_PL_TRACKLIST; state=XML_PL_ST_EXPECTING_PL_TRACKLIST;
return XML_STATE_PLAYLISTS; return XML_STATE_PLAYLISTS;
@ -869,6 +879,7 @@ int scan_xml_playlists_section(int action, char *info) {
if(current_name) if(current_name)
free(current_name); free(current_name);
current_name = strdup(info); current_name = strdup(info);
DPRINTF(E_DBG,L_SCAN,"Found playlist: %s\n",current_name);
/* disallow specific playlists */ /* disallow specific playlists */
if(strcasecmp(current_name,"Party Shuffle") == 0) { if(strcasecmp(current_name,"Party Shuffle") == 0) {
dont_scan=1; dont_scan=1;