anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

library: Don't attach artist_id to albums 

This was an unnecessary field, and might potentally result in album
duplication.

Signed-off-by: Anna Schumaker <anna@ocarinaproject.net>
This commit is contained in:
Anna Schumaker 2014-04-01 21:06:15 -04:00
parent 2960b72967
commit 1e09406730
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/library.h
View File

@ -44,7 +44,6 @@ namespace library
std :: string name;
std :: string name_lower;
unsigned int year;
unsigned int artist_id;
Album();
Album(TagLib :: Tag *, unsigned int);

12
lib/library.cpp
View File

@ -83,19 +83,19 @@ void library :: AGInfo :: write(File &f)
*/
library :: Album :: Album()
: name(""), year(0), artist_id(0)
: name(""), year(0)
{
}
library :: Album :: Album(TagLib :: Tag *tag, unsigned int artist)
: name(tag->album().stripWhiteSpace().to8Bit(true)),
year(tag->year()), artist_id(artist)
year(tag->year())
{
name_lower = filter :: lowercase(name);
}
library :: Album :: Album(const std::string &str, unsigned int yr, unsigned int artist)
: name(str), year(yr), artist_id(artist)
: name(str), year(yr)
{
name_lower = filter :: lowercase(name);
}
@ -103,20 +103,20 @@ library :: Album :: Album(const std::string &str, unsigned int yr, unsigned int
const std::string library :: Album :: primary_key()
{
std::stringstream ss;
ss << artist_id << "." << name << "." << year;
ss << name << "." << year;
return ss.str();
}
void library :: Album :: read(File &f)
{
f >> artist_id >> year;
f >> year;
name = f.getline();
name_lower = filter :: lowercase(name);
}
void library :: Album :: write(File &f)
{
f << artist_id << " " << year << " " << name;
f << year << " " << name;
}