* Forgot to add some new files...
This commit is contained in:
Justin Maggard
parent
8cab1a2800
commit
8c3ebe1259
241
albumart.c
Normal file
241
albumart.c
Normal file
@ -0,0 +1,241 @@
|
||||
/* MiniDLNA media server
|
||||
* Copyright (C) 2008 Justin Maggard
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#undef HAVE_LIBID3TAG
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <libgen.h>
|
||||
#include <setjmp.h>
|
||||
|
||||
#include <jpeglib.h>
|
||||
|
||||
#include "upnpglobalvars.h"
|
||||
#include "sql.h"
|
||||
|
||||
/* For libjpeg error handling */
|
||||
jmp_buf setjmp_buffer;
|
||||
static void libjpeg_error_handler(j_common_ptr cinfo)
|
||||
{
|
||||
cinfo->err->output_message (cinfo);
|
||||
longjmp(setjmp_buffer, 1);
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef HAVE_LIBID3TAG
|
||||
#include <id3tag.h>
|
||||
|
||||
/* These next few functions are to allow loading JPEG data directly from memory for libjpeg.
|
||||
* The standard functions only allow you to read from a file.
|
||||
* This code comes from the JpgAlleg library, at http://wiki.allegro.cc/index.php?title=Libjpeg */
|
||||
struct
|
||||
my_src_mgr
|
||||
{
|
||||
struct jpeg_source_mgr pub;
|
||||
JOCTET eoi_buffer[2];
|
||||
};
|
||||
|
||||
static void
|
||||
init_source(j_decompress_ptr cinfo)
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
fill_input_buffer(j_decompress_ptr cinfo)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
skip_input_data(j_decompress_ptr cinfo, long num_bytes)
|
||||
{
|
||||
struct my_src_mgr *src = (void *)cinfo->src;
|
||||
if (num_bytes > 0)
|
||||
{
|
||||
while (num_bytes > (long)src->pub.bytes_in_buffer)
|
||||
{
|
||||
num_bytes -= (long)src->pub.bytes_in_buffer;
|
||||
fill_input_buffer(cinfo);
|
||||
}
|
||||
}
|
||||
src->pub.next_input_byte += num_bytes;
|
||||
src->pub.bytes_in_buffer -= num_bytes;
|
||||
}
|
||||
|
||||
static void
|
||||
term_source(j_decompress_ptr cinfo)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
jpeg_memory_src(j_decompress_ptr cinfo, unsigned char const *buffer, size_t bufsize)
|
||||
{
|
||||
struct my_src_mgr *src;
|
||||
if (! cinfo->src)
|
||||
{
|
||||
cinfo->src = (*cinfo->mem->alloc_small)((void *)cinfo, JPOOL_PERMANENT, sizeof(struct my_src_mgr));;
|
||||
}
|
||||
src = (void *)cinfo->src;
|
||||
src->pub.init_source = init_source;
|
||||
src->pub.fill_input_buffer = fill_input_buffer;
|
||||
src->pub.skip_input_data = skip_input_data;
|
||||
src->pub.resync_to_restart = jpeg_resync_to_restart;
|
||||
src->pub.term_source = term_source;
|
||||
src->pub.next_input_byte = buffer;
|
||||
src->pub.bytes_in_buffer = bufsize;
|
||||
}
|
||||
|
||||
/* And our main album art function */
|
||||
int
|
||||
check_embedded_art(const char * path)
|
||||
{
|
||||
struct id3_file *file;
|
||||
struct id3_tag *pid3tag;
|
||||
struct id3_frame *pid3frame;
|
||||
id3_byte_t const *image;
|
||||
id3_latin1_t const *mime;
|
||||
id3_length_t length;
|
||||
int index;
|
||||
struct jpeg_decompress_struct cinfo;
|
||||
struct jpeg_error_mgr jerr;
|
||||
int width = 0, height = 0;
|
||||
|
||||
file = id3_file_open(path, ID3_FILE_MODE_READONLY);
|
||||
if( !file )
|
||||
return 0;
|
||||
|
||||
pid3tag = id3_file_tag(file);
|
||||
|
||||
for( index=0; (pid3frame = id3_tag_findframe(pid3tag, "", index)); index++ )
|
||||
{
|
||||
if( strcmp(pid3frame->id, "APIC") == 0 )
|
||||
{
|
||||
mime = id3_field_getlatin1(&pid3frame->fields[1]);
|
||||
if( strcmp((char*)mime, "image/jpeg") && strcmp((char*)mime, "jpeg") )
|
||||
continue;
|
||||
image = id3_field_getbinarydata(&pid3frame->fields[4], &length);
|
||||
|
||||
cinfo.err = jpeg_std_error(&jerr);
|
||||
jerr.error_exit = libjpeg_error_handler;
|
||||
jpeg_create_decompress(&cinfo);
|
||||
if( setjmp(setjmp_buffer) )
|
||||
goto error;
|
||||
jpeg_memory_src(&cinfo, image, length);
|
||||
jpeg_read_header(&cinfo, TRUE);
|
||||
jpeg_start_decompress(&cinfo);
|
||||
width = cinfo.output_width;
|
||||
height = cinfo.output_height;
|
||||
error:
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
break;
|
||||
}
|
||||
}
|
||||
id3_file_close(file);
|
||||
|
||||
/* It's not a valid DLNA_PN JPEG_TN unless it's JPEG <= 160x160 */
|
||||
return( (width > 0 && width <= 160) && (height > 0 && height <= 160) );
|
||||
}
|
||||
#endif // HAVE_LIBID3TAG
|
||||
|
||||
char *
|
||||
check_for_album_file(char * dir)
|
||||
{
|
||||
char * file = malloc(PATH_MAX);
|
||||
char * album_art_names[] =
|
||||
{
|
||||
"Cover.jpg", "cover.jpg",
|
||||
"Album.jpg", "album.jpg",
|
||||
"Folder.jpg", "folder.jpg",
|
||||
"Thumb.jpg", "thumb.jpg",
|
||||
0
|
||||
};
|
||||
struct jpeg_decompress_struct cinfo;
|
||||
struct jpeg_error_mgr jerr;
|
||||
FILE *infile;
|
||||
int width=0, height=0;
|
||||
int i;
|
||||
|
||||
for( i=0; album_art_names[i]; i++ )
|
||||
{
|
||||
sprintf(file, "%s/%s", dir, album_art_names[i]);
|
||||
if( access(file, R_OK) == 0 )
|
||||
{
|
||||
infile = fopen(file, "r");
|
||||
cinfo.err = jpeg_std_error(&jerr);
|
||||
jerr.error_exit = libjpeg_error_handler;
|
||||
jpeg_create_decompress(&cinfo);
|
||||
if( setjmp(setjmp_buffer) )
|
||||
goto error;
|
||||
jpeg_stdio_src(&cinfo, infile);
|
||||
jpeg_read_header(&cinfo, TRUE);
|
||||
jpeg_start_decompress(&cinfo);
|
||||
width = cinfo.output_width;
|
||||
height = cinfo.output_height;
|
||||
error:
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
fclose(infile);
|
||||
|
||||
if( (width > 0 && width <= 160) && (height > 0 && height <= 160) )
|
||||
return(file);
|
||||
}
|
||||
}
|
||||
free(file);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
sqlite_int64
|
||||
find_album_art(const char * path)
|
||||
{
|
||||
char * album_art = NULL;
|
||||
char * sql;
|
||||
char ** result;
|
||||
int cols, rows;
|
||||
sqlite_int64 ret = 0;
|
||||
char * mypath = strdup(path);
|
||||
|
||||
#ifdef HAVE_LIBID3TAG
|
||||
if( check_embedded_art(path) || (album_art = check_for_album_file(dirname(mypath))) )
|
||||
#else
|
||||
if( (album_art = check_for_album_file(dirname(mypath))) )
|
||||
#endif
|
||||
{
|
||||
sql = sqlite3_mprintf("SELECT ID from ALBUM_ART where PATH = '%q'", album_art ? album_art : path);
|
||||
if( (sql_get_table(db, sql, &result, &rows, &cols) == SQLITE_OK) && rows )
|
||||
{
|
||||
ret = strtoll(result[1], NULL, 10);
|
||||
}
|
||||
else
|
||||
{
|
||||
sql = sqlite3_mprintf( "INSERT into ALBUM_ART"
|
||||
" (PATH, EMBEDDED) "
|
||||
"VALUES"
|
||||
" ('%s', %d);",
|
||||
(album_art ? album_art : path),
|
||||
(album_art ? 0 : 1) );
|
||||
if( sql_exec(db, sql) == SQLITE_OK )
|
||||
ret = sqlite3_last_insert_rowid(db);
|
||||
}
|
||||
sqlite3_free(sql);
|
||||
}
|
||||
if( album_art )
|
||||
free(album_art);
|
||||
free(mypath);
|
||||
|
||||
return ret;
|
||||
}
|
||||
16
albumart.h
Normal file
16
albumart.h
Normal file
@ -0,0 +1,16 @@
|
||||
/* Utility functions
|
||||
*
|
||||
* Project : minidlna
|
||||
* Website : http://sourceforge.net/projects/minidlna/
|
||||
* Author : Justin Maggard
|
||||
* Copyright (c) 2008 Justin Maggard
|
||||
* This software is subject to the conditions detailed in the
|
||||
* LICENCE file provided in this distribution.
|
||||
* */
|
||||
#ifndef __ALBUMART_H__
|
||||
#define __ALBUMART_H__
|
||||
|
||||
sqlite_int64
|
||||
find_album_art(const char * path);
|
||||
|
||||
#endif
|
||||
104
utils.c
Normal file
104
utils.c
Normal file
@ -0,0 +1,104 @@
|
||||
/* MiniDLNA media server
|
||||
* Copyright (C) 2008 Justin Maggard
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
int
|
||||
ends_with(const char * haystack, const char * needle)
|
||||
{
|
||||
const char *found = strcasestr(haystack, needle);
|
||||
return (found && found[strlen(needle)] == '\0');
|
||||
}
|
||||
|
||||
char *
|
||||
trim(char *str)
|
||||
{
|
||||
if (!str)
|
||||
return(NULL);
|
||||
int i;
|
||||
for (i=0; i <= strlen(str) && (isspace(str[i]) || str[i] == '"'); i++) {
|
||||
str++;
|
||||
}
|
||||
for (i=(strlen(str)-1); i >= 0 && (isspace(str[i]) || str[i] == '"'); i--) {
|
||||
str[i] = '\0';
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
char *
|
||||
modifyString(char * string, const char * before, const char * after, short like)
|
||||
{
|
||||
int oldlen, newlen, chgcnt = 0;
|
||||
char *s, *p, *t;
|
||||
|
||||
oldlen = strlen(before);
|
||||
newlen = strlen(after);
|
||||
if( newlen > oldlen )
|
||||
{
|
||||
s = string;
|
||||
while( (p = strstr(s, before)) )
|
||||
{
|
||||
chgcnt++;
|
||||
s = p+oldlen;
|
||||
}
|
||||
string = realloc(string, strlen(string)+((newlen-oldlen)*chgcnt)+1);
|
||||
}
|
||||
|
||||
s = string;
|
||||
while( s )
|
||||
{
|
||||
p = strcasestr(s, before);
|
||||
if( !p )
|
||||
return string;
|
||||
if( like )
|
||||
{
|
||||
t = p+oldlen;
|
||||
while( isspace(*t) )
|
||||
t++;
|
||||
if( *t == '"' )
|
||||
while( *++t != '"' )
|
||||
continue;
|
||||
memmove(t+1, t, strlen(t)+1);
|
||||
*t = '%';
|
||||
}
|
||||
memmove(p + newlen, p + oldlen, strlen(p + oldlen) + 1);
|
||||
memcpy(p, after, newlen);
|
||||
s = p + newlen;
|
||||
}
|
||||
if( newlen < oldlen )
|
||||
string = realloc(string, strlen(string)+1);
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
void
|
||||
strip_ext(char * name)
|
||||
{
|
||||
char * period;
|
||||
|
||||
period = rindex(name, '.');
|
||||
if( period )
|
||||
*period = '\0';
|
||||
}
|
||||
25
utils.h
Normal file
25
utils.h
Normal file
@ -0,0 +1,25 @@
|
||||
/* Utility functions
|
||||
*
|
||||
* Project : minidlna
|
||||
* Website : http://sourceforge.net/projects/minidlna/
|
||||
* Author : Justin Maggard
|
||||
* Copyright (c) 2008 Justin Maggard
|
||||
* This software is subject to the conditions detailed in the
|
||||
* LICENCE file provided in this distribution.
|
||||
* */
|
||||
#ifndef __UTILS_H__
|
||||
#define __UTILS_H__
|
||||
|
||||
int
|
||||
ends_with(const char * haystack, const char * needle);
|
||||
|
||||
char *
|
||||
trim(char *str);
|
||||
|
||||
char *
|
||||
modifyString(char * string, const char * before, const char * after, short like);
|
||||
|
||||
void
|
||||
strip_ext(char * name);
|
||||
|
||||
#endif
|
||||
Loading…
x
Reference in New Issue
Block a user