Navigation Menu

Skip to content

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history 
Conversion window "file n / total files" message fixed
Fixed some bugs with language DB
  • Loading branch information
@taglia
taglia committed Feb 12, 2013
1 parent 0c3fee5 commit 9ba31f2
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 26 deletions.
22 changes: 15 additions & 7 deletions HandBrakeBatch.xcodeproj/project.pbxproj
View file
Expand Up @@ -10,13 +10,13 @@
0E108B6B136C47F200168057 /* HBBProgressController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E108B6A136C47F200168057 /* HBBProgressController.m */; };
0E18546B136C4222004B5558 /* HBBProgressWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0E18546A136C4222004B5558 /* HBBProgressWindow.xib */; };
0E337A4715144FCC006150DD /* RSRTVArrayController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E337A4615144FCC006150DD /* RSRTVArrayController.m */; };
0E3698D916C9DF31001D912F /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E3698D816C9DF31001D912F /* libsqlite3.dylib */; };
0E49A762137642B700FB3B77 /* plist.rb in Resources */ = {isa = PBXBuildFile; fileRef = 0E49A75E137642B700FB3B77 /* plist.rb */; };
0E49A7641376437400FB3B77 /* generator.rb in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0E49A75B137642B700FB3B77 /* generator.rb */; };
0E49A7651376437400FB3B77 /* parser.rb in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0E49A75C137642B700FB3B77 /* parser.rb */; };
0E49A76813764A1500FB3B77 /* HBBPresets.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E49A76713764A1500FB3B77 /* HBBPresets.m */; };
0E54925F136C49890094563F /* HBBInputFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E54925E136C49890094563F /* HBBInputFile.m */; };
0E6C285C14C288BC004A0FE5 /* iso639-2.db in Resources */ = {isa = PBXBuildFile; fileRef = 0E6C285B14C288BC004A0FE5 /* iso639-2.db */; };
0E6C285F14C289DE004A0FE5 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E6C285E14C289DE004A0FE5 /* libsqlite3.dylib */; };
0E6C286214C29515004A0FE5 /* HBBLangData.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E6C286114C29515004A0FE5 /* HBBLangData.m */; };
0E933F9D14C47C8000A5BB1D /* HBBVideoScan.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E933F9C14C47C8000A5BB1D /* HBBVideoScan.m */; };
0E987E2113E4062C00A99716 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0E987E2013E4062C00A99716 /* Preferences.xib */; };
Expand Down Expand Up @@ -70,6 +70,7 @@
0E18546A136C4222004B5558 /* HBBProgressWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HBBProgressWindow.xib; sourceTree = "<group>"; };
0E337A4515144FCC006150DD /* RSRTVArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RSRTVArrayController.h; sourceTree = "<group>"; };
0E337A4615144FCC006150DD /* RSRTVArrayController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RSRTVArrayController.m; sourceTree = "<group>"; };
0E3698D816C9DF31001D912F /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
0E49A75B137642B700FB3B77 /* generator.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; lineEnding = 0; path = generator.rb; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
0E49A75C137642B700FB3B77 /* parser.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = parser.rb; sourceTree = "<group>"; };
0E49A75E137642B700FB3B77 /* plist.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = plist.rb; sourceTree = "<group>"; };
Expand All @@ -78,7 +79,6 @@
0E54925D136C49890094563F /* HBBInputFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBBInputFile.h; sourceTree = "<group>"; };
0E54925E136C49890094563F /* HBBInputFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBBInputFile.m; sourceTree = "<group>"; };
0E6C285B14C288BC004A0FE5 /* iso639-2.db */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iso639-2.db"; sourceTree = "<group>"; };
0E6C285E14C289DE004A0FE5 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = SDKs/MacOSX10.6.sdk/usr/lib/libsqlite3.dylib; sourceTree = DEVELOPER_DIR; };
0E6C286014C29515004A0FE5 /* HBBLangData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBBLangData.h; sourceTree = "<group>"; };
0E6C286114C29515004A0FE5 /* HBBLangData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBBLangData.m; sourceTree = "<group>"; };
0E933F9B14C47C8000A5BB1D /* HBBVideoScan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBBVideoScan.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -117,7 +117,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0E6C285F14C289DE004A0FE5 /* libsqlite3.dylib in Frameworks */,
0E3698D916C9DF31001D912F /* libsqlite3.dylib in Frameworks */,
0EEC80401369B4EA00D05124 /* Cocoa.framework in Frameworks */,
0EF8EFB1136D981000884AE8 /* Sparkle.framework in Frameworks */,
0EDBC5741390AFB300D88A0B /* Growl.framework in Frameworks */,
Expand Down Expand Up @@ -168,6 +168,7 @@
0EEC80301369B4EA00D05124 = {
isa = PBXGroup;
children = (
0E3698D816C9DF31001D912F /* libsqlite3.dylib */,
0EB54A431596B7FD00EE2AB4 /* Quartz.framework */,
0EB54A441596B7FD00EE2AB4 /* QuartzCore.framework */,
0EEC80451369B4EA00D05124 /* HandBrakeBatch */,
Expand All @@ -187,7 +188,6 @@
0EEC803E1369B4EA00D05124 /* Frameworks */ = {
isa = PBXGroup;
children = (
0E6C285E14C289DE004A0FE5 /* libsqlite3.dylib */,
0EEC803F1369B4EA00D05124 /* Cocoa.framework */,
0EEC80411369B4EA00D05124 /* Other Frameworks */,
);
Expand Down Expand Up @@ -278,7 +278,7 @@
0EEC80321369B4EA00D05124 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0450;
LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "";
};
buildConfigurationList = 0EEC80351369B4EA00D05124 /* Build configuration list for PBXProject "HandBrakeBatch" */;
Expand Down Expand Up @@ -374,8 +374,11 @@
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ARC_MIGRATION = donothing;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_OBJCPP_ARC_ABI = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = unsupported;
Expand All @@ -385,6 +388,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -399,14 +403,18 @@
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ARC_MIGRATION = donothing;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_OBJCPP_ARC_ABI = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_RECEIVER_WEAK = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_GC = unsupported;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
PROVISIONING_PROFILE = "";
Expand Down
2 changes: 1 addition & 1 deletion HandBrakeBatch.xcodeproj/xcuserdata/taglia.xcuserdatad/xcschemes/HandBrakeBatch.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0450"
LastUpgradeVersion = "0460"
version = "1.8">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
32 changes: 18 additions & 14 deletions HandBrakeBatch/HBBLangData.m
View file
Expand Up @@ -30,20 +30,18 @@ + (HBBLangData *)defaultHBBLangData {
return instance;
}

- (int)dbOpen {
NSString *dbFileName = [[NSBundle mainBundle] pathForResource:@"iso639-2" ofType:@"db"];
sqlite3 *dbHandle = self.dbHandle;
int status = sqlite3_open_v2([dbFileName cStringUsingEncoding:NSUTF8StringEncoding], &dbHandle, SQLITE_OPEN_READONLY, NULL);
self.dbHandle = dbHandle;

return status;
}

- (id)init {
self = [super init];

if (self) {
NSString *dbFileName = [[NSBundle mainBundle] pathForResource:@"iso639-2" ofType:@"db"];
sqlite3 *dbHandle = self.dbHandle;
int status = sqlite3_open_v2([dbFileName cStringUsingEncoding:NSUTF8StringEncoding], &dbHandle, SQLITE_OPEN_READONLY, NULL);

if (status != SQLITE_OK) {
NSLog(@"Error opening language list database: %s", sqlite3_errmsg(dbHandle));
return nil;
}
}

return self;
}

Expand All @@ -52,7 +50,7 @@ - (NSArray *)languageList {
const char *unused;
sqlite3_stmt *statement;
sqlite3 *dbHandle = self.dbHandle;

if (sqlite3_prepare_v2(dbHandle, [statementString cStringUsingEncoding:NSUTF8StringEncoding], (int)[statementString length], &statement, &unused) != SQLITE_OK) {
NSLog(@"Error preparing SQL statement (%@): %s", statementString, sqlite3_errmsg(dbHandle));
return nil;
Expand All @@ -79,8 +77,14 @@ - (NSArray *)languageList {
- (NSString *)execSimpleStatement:(NSString *)statementString {
const char *unused;
sqlite3_stmt *statement;
sqlite3 *dbHandle = self.dbHandle;


if ([self dbOpen] != SQLITE_OK) {
NSLog(@"Error opening language list database: %s", sqlite3_errmsg([self dbHandle]));
return nil;
}

sqlite3 *dbHandle = self.dbHandle;

if (sqlite3_prepare_v2(dbHandle, [statementString cStringUsingEncoding:NSUTF8StringEncoding], (int)[statementString length], &statement, &unused) != SQLITE_OK) {
NSLog(@"Error preparing SQL statement (%@): %s", statementString, sqlite3_errmsg(dbHandle));
return nil;
Expand Down
2 changes: 1 addition & 1 deletion HandBrakeBatch/HBBProgressController.m
View file
Expand Up @@ -300,7 +300,7 @@ - (void)startConversion {
[self prepareTask];

totalFiles = [queue count];
currentFile = 0;
currentFile = 1;
[self.processingLabel setStringValue:[NSString stringWithFormat:@"Processing 1 / %ld", totalFiles]];

[self.backgroundTask launch];
Expand Down
6 changes: 3 additions & 3 deletions HandBrakeBatch/HBBVideoScan.m
View file
Expand Up @@ -57,7 +57,7 @@ - (void)scan {
[task setStandardError:[task standardOutput]];

// No perf issues here, so we always use the 32 bit version
[task setLaunchPath:[[NSBundle mainBundle] pathForResource:@"HandBrakeCLI_32" ofType:@""]];
[task setLaunchPath:[[NSBundle mainBundle] pathForResource:@"HandBrakeCLI" ofType:@""]];

// Setting arguments
[task setArguments:@[@"--scan", @"-i", fileName]];
Expand Down Expand Up @@ -88,14 +88,14 @@ - (void)scan {
[self.mutableSubtitleLanguages removeAllObjects];

if (audioIndex != NSNotFound) {
while ([outputLines[++audioIndex] characterAtIndex:4] == '+') {
while ([outputLines[++audioIndex] length] > 4 && [outputLines[audioIndex] characterAtIndex:4] == '+') {
NSRange range = [outputLines[audioIndex] rangeOfString:@"iso639-2: "];
[self.mutableAudioLanguages addObject:[outputLines[audioIndex] substringWithRange:NSMakeRange(range.location + range.length, 3)]];
}
}

if (subtitleIndex != NSNotFound) {
while ([outputLines[++subtitleIndex] characterAtIndex:4] == '+') {
while ([outputLines[++audioIndex] length] > 4 && [outputLines[subtitleIndex] characterAtIndex:4] == '+') {
NSRange range = [outputLines[subtitleIndex] rangeOfString:@"iso639-2: "];
[self.mutableSubtitleLanguages addObject:[outputLines[subtitleIndex] substringWithRange:NSMakeRange(range.location + range.length, 3)]];
}
Expand Down

0 comments on commit 9ba31f2

Please sign in to comment.