1.5.3

Minor optimisations and bug fixes
fabulouspanda · Dec 23, 2013 · 2eff329 · 2eff329
1 parent fe948ac
commit 2eff329
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 27 deletions.
diff --git a/MacMiner/MacMiner-Info.plist b/MacMiner/MacMiner-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.2</string>
+	<string>1.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1502</string>
+	<string>1503</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/MacMiner/asicMiner.m b/MacMiner/asicMiner.m
@@ -310,11 +310,11 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer
 
             [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:pgaCount,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",@" ",@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",apiIntensity,@"intensity",nil]];
 
-            NSInteger *u = [mhs5S integerValue];
+            int u = [mhs5S integerValue];
             NSString *apiHash5s = [NSString stringWithFormat:@"%d", u];
             apiHash5s = [apiHash5s stringByAppendingString:@"000"];
 
-            NSInteger *v = [mhsAv integerValue];
+            int v = [mhsAv integerValue];
             NSString *apiHashAv = [NSString stringWithFormat:@"%d", v];
             apiHashAv = [apiHashAv stringByAppendingString:@"000"];
 
@@ -376,11 +376,11 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer
             NSString *apiDiffRej = [self getDataBetweenFromString:pgaAPIData leftString:@"[Difficulty Rejected] =>" rightString:@"[" leftOffset:25];
             NSString *apiName = [self getDataBetweenFromString:pgaAPIData leftString:@"[Name] =>" rightString:@"[" leftOffset:10];
 
-            NSInteger *u = [mhs5S integerValue];
+            int u = [mhs5S integerValue];
             NSString *apiHash5s = [NSString stringWithFormat:@"%d", u];
             apiHash5s = [apiHash5s stringByAppendingString:@"000"];
 
-            NSInteger *v = [mhsAv integerValue];
+            int v = [mhsAv integerValue];
             NSString *apiHashAv = [NSString stringWithFormat:@"%d", v];
             apiHashAv = [apiHashAv stringByAppendingString:@"000"];
 
@@ -393,7 +393,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer
 
                 NSString *apiPoolString = [prefs stringForKey:@"defaultPoolValue"];
 
-                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"USB\",\"Index\":0,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
+                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"PGA\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
 
 
                 pgaStats = [pgaStats stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
@@ -416,7 +416,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer
 
                 NSString *apiPoolString = [prefs stringForKey:@"defaultPoolValue"];
 
-                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"USB\",\"Index\":0,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
+                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"PGA\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
 
 
                 pgaStats = [pgaStats stringByReplacingOccurrencesOfString:@"\n" withString:@""];
@@ -505,7 +505,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer
 
                 NSString *apiPoolString = [prefs stringForKey:@"defaultPoolValue"];
 
-                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"USB\",\"Index\":0,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
+                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"ASC\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
 
 
                 pgaStats = [pgaStats stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]];
@@ -529,7 +529,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer
 
                 NSString *apiPoolString = [prefs stringForKey:@"defaultPoolValue"];
 
-                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"USB\",\"Index\":0,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
+                NSString *pgaStats = [NSString stringWithFormat:@"{\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"ASC\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString];
 
 
                 pgaStats = [pgaStats stringByReplacingOccurrencesOfString:@"\n" withString:@""];
@@ -666,8 +666,8 @@ - (void)toggleTimerFired:(NSTimer*)timer
 
 - (void)taskThreeWrapper:(taskThreeWrapper *)taskThreeWrapper didProduceOutput:(NSString *)output
 {
-
-    if (output.length >= 1) {
+    
+    if ([output rangeOfString:@"Reply was"].location != NSNotFound) {
          self.networkMinerData.string = output;
         if (self.asicAPIStorage.string.length <= 5) {
             self.asicAPIOutput.string = output;
@@ -704,9 +704,9 @@ - (void)taskThreeWrapper:(taskThreeWrapper *)taskThreeWrapper didFinishTaskWithS
 - (void)taskTwoWrapper:(taskTwoWrapper *)taskTwoWrapper didProduceOutput:(NSString *)output
 {
 
-    if (output.length >= 1) {
+    if (output.length >= 10) {
 
-        if (self.networkMinerData.string.length >= 7) {
+            if ([self.networkMinerData.string rangeOfString:@"Reply was"].location != NSNotFound) {
             output = [output stringByAppendingString:self.networkMinerData.string];
         }
 

diff --git a/MacMiner/autoConfigViewViewController.m b/MacMiner/autoConfigViewViewController.m
@@ -52,9 +52,7 @@ - (void)awakeFromNib
         NSString *btcConfig = [NSString stringWithContentsOfFile : openBTCConfigFilePath encoding:NSUTF8StringEncoding error:nil];
         NSString *ltcConfig = [NSString stringWithContentsOfFile : openLTCConfigFilePath encoding:NSUTF8StringEncoding error:nil];
 
-        NSString *stringUser = @"user";
-
-        if ([btcConfig rangeOfString:stringUser].location != NSNotFound) {
+        if ([btcConfig rangeOfString:@"user"].location != NSNotFound) {
             NSString *numberString = [self getDataBetweenFromString:btcConfig
                                                          leftString:@"url" rightString:@"," leftOffset:8];
             NSString *setupURLValue = [numberString stringByReplacingOccurrencesOfString:@"\"" withString:@""];
@@ -96,8 +94,49 @@ - (void)awakeFromNib
             setupPassValue = nil;
 
         }
+        else if ([btcConfig rangeOfString:@"quota"].location != NSNotFound) {
+            NSString *numberString = [self getDataBetweenFromString:btcConfig
+                                                         leftString:@"quota" rightString:@"," leftOffset:8];
+            NSString *setupURLValue = [numberString stringByReplacingOccurrencesOfString:@"\"" withString:@""];
+            numberString = nil;
+            NSString *acceptString = [self getDataBetweenFromString:btcConfig
+                                                         leftString:@"user" rightString:@"," leftOffset:9];
+            NSString *setupUserValue = [acceptString stringByReplacingOccurrencesOfString:@"\"" withString:@""];
+            acceptString = nil;
+            NSString *rejectString = [self getDataBetweenFromString:btcConfig
+                                                         leftString:@"pass" rightString:@"}" leftOffset:9];
+            NSString *passString = [self getDataBetweenFromString:btcConfig
+                                                       leftString:@"pass" rightString:@"," leftOffset:9];
+            if (rejectString.length >= passString.length) {
+                rejectString = passString;
+
+            }
+            rejectString = [rejectString stringByReplacingOccurrencesOfString:@"\"" withString:@""];
+            rejectString = [rejectString stringByReplacingOccurrencesOfString:@"\n	" withString:@""];
+            NSString *setupPassValue = [rejectString stringByReplacingOccurrencesOfString:@"	}" withString:@""];
+            rejectString = nil;
+            passString = nil;
+
+            self.poolBoox.stringValue = setupURLValue;
+            NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+            [prefs synchronize];
+
+
+            NSString *defaultBitcoin = [prefs objectForKey:@"defaultBTC"];
+
+            if (defaultBitcoin.length >=26) {
+                self.userNameTextField.stringValue = defaultBitcoin;
+            }
+
+            self.btcuserNameTextField.stringValue = setupUserValue;
+            self.btcpassWordTextField.stringValue = setupPassValue;
+
+            setupURLValue = nil;
+            setupUserValue = nil;
+            setupPassValue = nil;
+        }
 
-        if ([ltcConfig rangeOfString:stringUser].location != NSNotFound) {
+        if ([ltcConfig rangeOfString:@"user"].location != NSNotFound) {
             NSString *ltcURLData = [self getDataBetweenFromString:ltcConfig
                                                        leftString:@"url" rightString:@"," leftOffset:8];
             NSString *setupLTCURLValue = [ltcURLData stringByReplacingOccurrencesOfString:@"\"" withString:@""];
@@ -123,6 +162,32 @@ - (void)awakeFromNib
             setupLTCPassValue = nil;
 
         }
+        else if ([ltcConfig rangeOfString:@"quota"].location != NSNotFound) {
+            NSString *ltcURLData = [self getDataBetweenFromString:ltcConfig
+                                                       leftString:@"quota" rightString:@"," leftOffset:8];
+            NSString *setupLTCURLValue = [ltcURLData stringByReplacingOccurrencesOfString:@"\"" withString:@""];
+            ltcURLData = nil;
+            NSString *ltcUserData = [self getDataBetweenFromString:ltcConfig
+                                                        leftString:@"user" rightString:@"," leftOffset:9];
+            NSString *setupLTCUserValue = [ltcUserData stringByReplacingOccurrencesOfString:@"\"" withString:@""];
+            ltcUserData = nil;
+            NSString *ltcPassData = [self getDataBetweenFromString:ltcConfig
+                                                        leftString:@"pass" rightString:@"}" leftOffset:9];
+            ltcPassData = [ltcPassData stringByReplacingOccurrencesOfString:@"\"" withString:@""];
+            ltcPassData = [ltcPassData stringByReplacingOccurrencesOfString:@"\n	" withString:@""];
+            NSString *setupLTCPassValue = [ltcPassData stringByReplacingOccurrencesOfString:@"	}" withString:@""];
+            ltcPassData = nil;
+
+            self.ltcpoolBoox.stringValue = setupLTCURLValue;
+            self.passWordTextField.stringValue = setupLTCUserValue;
+            self.ltcuserNameTextField.stringValue = setupLTCUserValue;
+            self.ltcpassWordTextField.stringValue = setupLTCPassValue;
+
+            setupLTCURLValue = nil;
+            setupLTCUserValue = nil;
+            setupLTCPassValue = nil;
+
+        }
 
 
     }