Skip to content

Parse more REM lines #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lipnitsk merged 3 commits into from
Sep 29, 2025
Merged

Parse more REM lines #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16d9679
parse "REM DISCNUMBER" and "REM TOTALDISCS" lines
Cycloctane Sep 27, 2025
f1d212e
add test for disc number and total discs
Cycloctane Sep 28, 2025
b4acf6f
move new REM fields to the end
Cycloctane Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions cue_parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,14 @@ Cd *cue_parse_string(const char*);
/* REM */
%type <ival> rem_item
%token <ival> DATE
%token <ival> COMMENT
%token <ival> XXX_GENRE /* parsed in REM but stored in CD-TEXT */
%token <ival> REPLAYGAIN_ALBUM_GAIN
%token <ival> REPLAYGAIN_ALBUM_PEAK
%token <ival> REPLAYGAIN_TRACK_GAIN
%token <ival> REPLAYGAIN_TRACK_PEAK
%token <ival> COMMENT
%token <ival> DISCNUMBER
%token <ival> TOTALDISCS
%%

cuefile
Expand Down Expand Up @@ -312,11 +314,13 @@ rem

rem_item
: DATE
| COMMENT
| REPLAYGAIN_ALBUM_GAIN
| REPLAYGAIN_ALBUM_PEAK
| REPLAYGAIN_TRACK_GAIN
| REPLAYGAIN_TRACK_PEAK
| COMMENT
| DISCNUMBER
| TOTALDISCS
;

end_cd
Expand Down
4 changes: 3 additions & 1 deletion cue_scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ ISRC { BEGIN(NAME); return TRACK_ISRC; }
REM { BEGIN(REM); /* exclusive rules for special exceptions */ }

<REM>DATE { BEGIN(NAME); yylval.ival = REM_DATE; return DATE; }
<REM>COMMENT { BEGIN(NAME); yylval.ival = REM_COMMENT; return COMMENT; }
<REM>GENRE { BEGIN(NAME); yylval.ival = PTI_GENRE; return XXX_GENRE; }
<REM>REPLAYGAIN_ALBUM_GAIN { BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_ALBUM_GAIN;
return REPLAYGAIN_ALBUM_GAIN; }
Expand All @@ -112,6 +111,9 @@ REM { BEGIN(REM); /* exclusive rules for special exceptions */ }
return REPLAYGAIN_TRACK_GAIN; }
<REM>REPLAYGAIN_TRACK_PEAK { BEGIN(RPG); yylval.ival = REM_REPLAYGAIN_TRACK_PEAK;
return REPLAYGAIN_TRACK_PEAK; }
<REM>COMMENT { BEGIN(NAME); yylval.ival = REM_COMMENT; return COMMENT; }
<REM>DISCNUMBER { BEGIN(NAME); yylval.ival = REM_DISCNUMBER; return DISCNUMBER; }
<REM>TOTALDISCS { BEGIN(NAME); yylval.ival = REM_TOTALDISCS; return TOTALDISCS; }

<REM>{ws}+ { BEGIN(REM); }
<REM>. { BEGIN(REM); }
Expand Down
4 changes: 3 additions & 1 deletion libcue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,13 @@ enum Pti {

enum RemType {
REM_DATE, /* date of cd/track */
REM_COMMENT,
REM_REPLAYGAIN_ALBUM_GAIN,
REM_REPLAYGAIN_ALBUM_PEAK,
REM_REPLAYGAIN_TRACK_GAIN,
REM_REPLAYGAIN_TRACK_PEAK,
REM_COMMENT,
REM_DISCNUMBER,
REM_TOTALDISCS,
REM_END /* terminating REM (for stepping through REMs) */
};

Expand Down
4 changes: 3 additions & 1 deletion rem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ rem_new( void)

Rem rem[] = {
{REM_DATE, NULL},
{REM_COMMENT, NULL},
{REM_REPLAYGAIN_ALBUM_GAIN, NULL},
{REM_REPLAYGAIN_ALBUM_PEAK, NULL},
{REM_REPLAYGAIN_TRACK_GAIN, NULL},
{REM_REPLAYGAIN_TRACK_PEAK, NULL},
{REM_COMMENT, NULL},
{REM_DISCNUMBER, NULL},
{REM_TOTALDISCS, NULL},
{REM_END, NULL}
};

Expand Down
10 changes: 10 additions & 0 deletions t/standard_cue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ int tests_run;
static char cue[] = "REM GENRE Alternative\n"
"REM DATE 1991\n"
"REM DISCID 860B640B\n"
"REM DISCNUMBER 1\n"
"REM TOTALDISCS 2\n"
"REM COMMENT \"ExactAudioCopy v0.95b4\"\n"
"PERFORMER \"My Bloody Valentine\"\n"
"TITLE \"Loveless\"\n"
Expand Down Expand Up @@ -54,6 +56,14 @@ static char* cue_test()
mu_assert ("error getting CD date", val != NULL);
mu_assert ("error validating CD date", strcmp (val, "1991") == 0);

val = rem_get (REM_DISCNUMBER, rem);
mu_assert ("error getting CD disc number", val != NULL);
mu_assert ("error validating CD disc number", strcmp (val, "1") == 0);

val = rem_get (REM_TOTALDISCS, rem);
mu_assert ("error getting CD total discs", val != NULL);
mu_assert ("error validating CD total discs", strcmp (val, "2") == 0);

val = rem_get (REM_COMMENT, rem);
mu_assert ("error getting CD comment", val != NULL);
mu_assert ("error validating CD comment", strcmp (val, "ExactAudioCopy v0.95b4") == 0);
Expand Down