7777e50f03
The TagLib C++ code was missing generic try/catch handling which could result in any generic errors throwing straight to a full crash. Add exception handling and logging, which will fix a logged crash regardless of whether the tags are read correctly or not by the newer TagLib version. Fixes #415 Signed-off-by: Christopher Snowhill <kode54@gmail.com>
81 lines
2 KiB
Objective-C
81 lines
2 KiB
Objective-C
//
|
|
// TagLibMetadataWriter.m
|
|
// TagLib
|
|
//
|
|
// Created by Safari on 08/11/17.
|
|
// Copyright 2008 __MyCompanyName__. All rights reserved.
|
|
//
|
|
|
|
#import "TagLibMetadataWriter.h"
|
|
|
|
#import <tag/fileref.h>
|
|
#import <tag/tag.h>
|
|
|
|
#import "Logging.h"
|
|
|
|
@implementation TagLibMetadataWriter
|
|
|
|
+ (int)putMetadataInURL:(NSURL *)url tagData:(NSDictionary *)tagData {
|
|
NSString *lArtist = @"", *lTitle = @"", *lAlbum = @"", *lGenre = @"";
|
|
// int lYear = 0, lTrack = 0;
|
|
|
|
try {
|
|
TagLib::FileRef f((const char *)[[url path] UTF8String], false);
|
|
if(!f.isNull()) {
|
|
const TagLib::Tag *tag = f.tag();
|
|
|
|
if(tag) {
|
|
const TagLib::String pArtist, pTitle, pAlbum, pGenre, pComment;
|
|
|
|
lArtist = [tagData valueForKey:@"artist"];
|
|
lTitle = [tagData valueForKey:@"title"];
|
|
lAlbum = [tagData valueForKey:@"album"];
|
|
lGenre = [tagData valueForKey:@"genre"];
|
|
|
|
f.tag()->setTitle([lTitle UTF8String]);
|
|
f.tag()->setArtist([lArtist UTF8String]);
|
|
}
|
|
|
|
/*
|
|
|
|
NSArray *keys = @[@"key1", @"key2", @"key3"];
|
|
NSArray *objects = @[@"value1", @"value2", @"value3"];
|
|
NSDictionary *dictionary = [NSDictionary dictionaryWithObjects:objects forKeys:keys];
|
|
|
|
for (id key in dictionary)
|
|
{
|
|
DLog(@"key: %@, value: %@", key, [dictionary objectForKey:key]);
|
|
}
|
|
|
|
pArtist = tag->artist();
|
|
pTitle = tag->title();;
|
|
pAlbum = tag->album();
|
|
pGenre = tag->genre();
|
|
pComment = tag->comment();
|
|
|
|
lYear = tag->year();
|
|
lTrack = tag->track();
|
|
lDisc = tag->disc();
|
|
|
|
if (!pArtist.isNull())
|
|
lArtist = [NSString stringWithUTF8String:pArtist.toCString(true)];
|
|
|
|
if (!pAlbum.isNull())
|
|
lAlbum = [NSString stringWithUTF8String:pAlbum.toCString(true)];
|
|
|
|
if (!pTitle.isNull())
|
|
lTitle = [NSString stringWithUTF8String:pTitle.toCString(true)];
|
|
|
|
if (!pGenre.isNull())
|
|
lGenre = [NSString stringWithUTF8String:pGenre.toCString(true)];
|
|
*/
|
|
}
|
|
} catch (std::exception &e) {
|
|
ALog(@"Exception caught writing with TagLib: %s", e.what());
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
@end
|