Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
11613347
Commit
11613347
authored
Nov 18, 2010
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tag_ape: move code to ape.c
Generic library for scanning APE tags. Eliminated one "goto"!
parent
8f46f152
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
176 additions
and
93 deletions
+176
-93
Makefile.am
Makefile.am
+2
-0
ape.c
src/ape.c
+113
-0
ape.h
src/ape.h
+42
-0
tag_ape.c
src/tag_ape.c
+19
-93
No files found.
Makefile.am
View file @
11613347
...
@@ -34,6 +34,7 @@ mpd_headers = \
...
@@ -34,6 +34,7 @@ mpd_headers = \
src/check.h
\
src/check.h
\
src/notify.h
\
src/notify.h
\
src/ack.h
\
src/ack.h
\
src/ape.h
\
src/audio.h
\
src/audio.h
\
src/audio_format.h
\
src/audio_format.h
\
src/audio_check.h
\
src/audio_check.h
\
...
@@ -412,6 +413,7 @@ TAG_LIBS = \
...
@@ -412,6 +413,7 @@ TAG_LIBS = \
$(ID3TAG_LIBS)
$(ID3TAG_LIBS)
TAG_SRC
=
\
TAG_SRC
=
\
src/ape.c
\
src/tag_ape.c
src/tag_ape.c
if
HAVE_ID3TAG
if
HAVE_ID3TAG
...
...
src/ape.c
0 → 100644
View file @
11613347
/*
* Copyright (C) 2003-2010 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#include "ape.h"
#include <glib.h>
#include <stdint.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
struct
ape_footer
{
unsigned
char
id
[
8
];
uint32_t
version
;
uint32_t
length
;
uint32_t
count
;
unsigned
char
flags
[
4
];
unsigned
char
reserved
[
8
];
};
static
bool
ape_scan_internal
(
FILE
*
fp
,
tag_ape_callback_t
callback
,
void
*
ctx
)
{
/* determine if file has an apeV2 tag */
struct
ape_footer
footer
;
if
(
fseek
(
fp
,
-
(
long
)
sizeof
(
footer
),
SEEK_END
)
||
fread
(
&
footer
,
1
,
sizeof
(
footer
),
fp
)
!=
sizeof
(
footer
)
||
memcmp
(
footer
.
id
,
"APETAGEX"
,
sizeof
(
footer
.
id
))
!=
0
||
GUINT32_FROM_LE
(
footer
.
version
)
!=
2000
)
return
false
;
/* find beginning of ape tag */
size_t
remaining
=
GUINT32_FROM_LE
(
footer
.
length
);
if
(
remaining
<=
sizeof
(
footer
)
+
10
||
/* refuse to load more than one megabyte of tag data */
remaining
>
1024
*
1024
||
fseek
(
fp
,
-
(
long
)
remaining
,
SEEK_END
))
return
false
;
/* read tag into buffer */
remaining
-=
sizeof
(
footer
);
assert
(
remaining
>
10
);
char
*
buffer
=
g_malloc
(
remaining
);
if
(
fread
(
buffer
,
1
,
remaining
,
fp
)
!=
remaining
)
return
false
;
/* read tags */
unsigned
n
=
GUINT32_FROM_LE
(
footer
.
count
);
const
char
*
p
=
buffer
;
while
(
n
--
&&
remaining
>
10
)
{
size_t
size
=
GUINT32_FROM_LE
(
*
(
const
uint32_t
*
)
p
);
p
+=
4
;
remaining
-=
4
;
unsigned
long
flags
=
GUINT32_FROM_LE
(
*
(
const
uint32_t
*
)
p
);
p
+=
4
;
remaining
-=
4
;
/* get the key */
const
char
*
key
=
p
;
while
(
remaining
>
size
&&
*
p
!=
'\0'
)
{
p
++
;
remaining
--
;
}
p
++
;
remaining
--
;
/* get the value */
if
(
remaining
<
size
)
break
;
if
(
!
callback
(
flags
,
key
,
p
,
size
,
ctx
))
break
;
p
+=
size
;
remaining
-=
size
;
}
g_free
(
buffer
);
return
true
;
}
bool
tag_ape_scan
(
const
char
*
path_fs
,
tag_ape_callback_t
callback
,
void
*
ctx
)
{
FILE
*
fp
;
fp
=
fopen
(
path_fs
,
"rb"
);
if
(
fp
==
NULL
)
return
false
;
bool
success
=
ape_scan_internal
(
fp
,
callback
,
ctx
);
fclose
(
fp
);
return
success
;
}
src/ape.h
0 → 100644
View file @
11613347
/*
* Copyright (C) 2003-2010 The Music Player Daemon Project
* http://www.musicpd.org
*
* 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.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_APE_H
#define MPD_APE_H
#include "check.h"
#include <stdbool.h>
#include <stddef.h>
typedef
bool
(
*
tag_ape_callback_t
)(
unsigned
long
flags
,
const
char
*
key
,
const
char
*
value
,
size_t
value_length
,
void
*
ctx
);
/**
* Scans the APE tag values from a file.
*
* @param path_fs the path of the file in filesystem encoding
* @return false if the file could not be opened or if no APE tag is
* present
*/
bool
tag_ape_scan
(
const
char
*
path_fs
,
tag_ape_callback_t
callback
,
void
*
ctx
);
#endif
src/tag_ape.c
View file @
11613347
...
@@ -21,11 +21,7 @@
...
@@ -21,11 +21,7 @@
#include "tag_ape.h"
#include "tag_ape.h"
#include "tag.h"
#include "tag.h"
#include "tag_table.h"
#include "tag_table.h"
#include "ape.h"
#include <glib.h>
#include <assert.h>
#include <stdio.h>
static
const
char
*
const
ape_tag_names
[
TAG_NUM_OF_ITEM_TYPES
]
=
{
static
const
char
*
const
ape_tag_names
[
TAG_NUM_OF_ITEM_TYPES
]
=
{
[
TAG_ALBUM_ARTIST
]
=
"album artist"
,
[
TAG_ALBUM_ARTIST
]
=
"album artist"
,
...
@@ -61,96 +57,26 @@ tag_ape_import_item(struct tag *tag, unsigned long flags,
...
@@ -61,96 +57,26 @@ tag_ape_import_item(struct tag *tag, unsigned long flags,
return
tag
;
return
tag
;
}
}
struct
tag
*
struct
tag_ape_ctx
{
tag_ape_load
(
const
char
*
file
)
struct
tag
*
tag
;
{
};
struct
tag
*
ret
=
NULL
;
FILE
*
fp
;
int
tagCount
;
char
*
buffer
=
NULL
;
char
*
p
;
size_t
tagLen
;
size_t
size
;
unsigned
long
flags
;
char
*
key
;
struct
{
unsigned
char
id
[
8
];
uint32_t
version
;
uint32_t
length
;
uint32_t
tagCount
;
unsigned
char
flags
[
4
];
unsigned
char
reserved
[
8
];
}
footer
;
fp
=
fopen
(
file
,
"rb"
);
if
(
!
fp
)
return
NULL
;
/* determine if file has an apeV2 tag */
if
(
fseek
(
fp
,
0
,
SEEK_END
))
goto
fail
;
size
=
(
size_t
)
ftell
(
fp
);
if
(
fseek
(
fp
,
size
-
sizeof
(
footer
),
SEEK_SET
))
goto
fail
;
if
(
fread
(
&
footer
,
1
,
sizeof
(
footer
),
fp
)
!=
sizeof
(
footer
))
goto
fail
;
if
(
memcmp
(
footer
.
id
,
"APETAGEX"
,
sizeof
(
footer
.
id
))
!=
0
)
goto
fail
;
if
(
GUINT32_FROM_LE
(
footer
.
version
)
!=
2000
)
goto
fail
;
/* find beginning of ape tag */
tagLen
=
GUINT32_FROM_LE
(
footer
.
length
);
if
(
tagLen
<=
sizeof
(
footer
)
+
10
)
goto
fail
;
if
(
tagLen
>
1024
*
1024
)
/* refuse to load more than one megabyte of tag data */
goto
fail
;
if
(
fseek
(
fp
,
size
-
tagLen
,
SEEK_SET
))
goto
fail
;
/* read tag into buffer */
tagLen
-=
sizeof
(
footer
);
assert
(
tagLen
>
10
);
buffer
=
g_malloc
(
tagLen
);
if
(
fread
(
buffer
,
1
,
tagLen
,
fp
)
!=
tagLen
)
goto
fail
;
/* read tags */
tagCount
=
GUINT32_FROM_LE
(
footer
.
tagCount
);
p
=
buffer
;
while
(
tagCount
--
&&
tagLen
>
10
)
{
size
=
GUINT32_FROM_LE
(
*
(
const
uint32_t
*
)
p
);
p
+=
4
;
tagLen
-=
4
;
flags
=
GUINT32_FROM_LE
(
*
(
const
uint32_t
*
)
p
);
p
+=
4
;
tagLen
-=
4
;
/* get the key */
key
=
p
;
while
(
tagLen
>
size
&&
*
p
!=
'\0'
)
{
p
++
;
tagLen
--
;
}
p
++
;
tagLen
--
;
/* get the value */
static
bool
if
(
tagLen
<
size
)
tag_ape_callback
(
unsigned
long
flags
,
const
char
*
key
,
goto
fail
;
const
char
*
value
,
size_t
value_length
,
void
*
_ctx
)
{
struct
tag_ape_ctx
*
ctx
=
_ctx
;
ret
=
tag_ape_import_item
(
ret
,
flags
,
key
,
p
,
size
);
ctx
->
tag
=
tag_ape_import_item
(
ctx
->
tag
,
flags
,
key
,
value
,
value_length
);
return
true
;
}
p
+=
size
;
struct
tag
*
tagLen
-=
size
;
tag_ape_load
(
const
char
*
file
)
}
{
struct
tag_ape_ctx
ctx
=
{
.
tag
=
NULL
};
fail:
tag_ape_scan
(
file
,
tag_ape_callback
,
&
ctx
);
if
(
fp
)
return
ctx
.
tag
;
fclose
(
fp
);
g_free
(
buffer
);
return
ret
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment