Switch to the updated Yahoo data source for the stock graph.

mikepj · Feb 7, 2020 · a7a6b3c · a7a6b3c
1 parent ff8bd29
commit a7a6b3c
Show file tree

Hide file tree

Showing 3 changed files with 146 additions and 180 deletions.
diff --git a/Graph Views/XRGStockView.m b/Graph Views/XRGStockView.m
@@ -49,8 +49,6 @@ - (void)awakeFromNib {
 
     djia = [[XRGStock alloc] init];
     [djia setSymbol:@"%5EDJI"];
-    [djia setURL];
-
 
     NSUserDefaults *defs = [NSUserDefaults standardUserDefaults];    
     m = [[XRGModule alloc] initWithName:@"Stock" andReference:self];
@@ -110,15 +108,13 @@ - (void)setStockSymbolsFromString:(NSString *)s {
         [self reloadStockData];
 }
 
-// *** Memory leak when allocating in the for loop.  Should be correct.
 - (void)resetStockObjects {
     int i;
 
     [stockObjects removeAllObjects];
     for (i = 0; i < [stockSymbols count]; i++) {
         XRGStock *tmpStock = [[XRGStock alloc] init];
         [tmpStock setSymbol:stockSymbols[i]];
-        [tmpStock setURL];
         [stockObjects addObject:tmpStock];
     }
 
@@ -136,20 +132,14 @@ - (void)reloadStockData {
 }
 
 - (bool)dataIsReady {
-    int i;
-    XRGStock *tmpStock;
-
     if (!self.gettingData) return YES;
 
-    for (i = 0; i < [stockObjects count]; i++) {
-        tmpStock = stockObjects[i];
-        [tmpStock checkForData];
+    for (XRGStock *tmpStock in stockObjects) {
         if ([tmpStock gettingData]) {
             return NO;
         }
     }
 
-    [djia checkForData];
     if ([djia gettingData]) {
         return NO;
     }
@@ -228,13 +218,13 @@ - (void)drawMiniGraph {
             // draw the graph
             NSArray *a = nil;
             if ([appSettings stockGraphTimeFrame] == 0)
-                a = [showStock get1MonthValues:366];
+                a = [showStock get1MonthValues];
             else if ([appSettings stockGraphTimeFrame] == 1)
-                a = [showStock get3MonthValues:366];
+                a = [showStock get3MonthValues];
             else if ([appSettings stockGraphTimeFrame] == 2)
-                a = [showStock get6MonthValues:366];
+                a = [showStock get6MonthValues];
             else if ([appSettings stockGraphTimeFrame] == 3)
-                a = [showStock get12MonthValues:366];
+                a = [showStock get12MonthValues];
 
             if ([a count] > 0) {
                 // find the high, low and range of the graph
@@ -287,13 +277,13 @@ - (void)drawGraph {
             // draw the graph
             NSArray *a = nil;
             if ([appSettings stockGraphTimeFrame] == 0)
-                a = [stockObjects[stockToShow] get1MonthValues:self.graphSize.width];
+                a = [stockObjects[stockToShow] get1MonthValues];
             else if ([appSettings stockGraphTimeFrame] == 1)
-                a = [stockObjects[stockToShow] get3MonthValues:self.graphSize.width];
+                a = [stockObjects[stockToShow] get3MonthValues];
             else if ([appSettings stockGraphTimeFrame] == 2)
-                a = [stockObjects[stockToShow] get6MonthValues:self.graphSize.width];
+                a = [stockObjects[stockToShow] get6MonthValues];
             else if ([appSettings stockGraphTimeFrame] == 3)
-                a = [stockObjects[stockToShow] get12MonthValues:self.graphSize.width];
+                a = [stockObjects[stockToShow] get12MonthValues];
 
             if ([a count] > 0) {
                 // find the high, low and range of the graph
@@ -314,7 +304,7 @@ - (void)drawGraph {
                 NSInteger count = [a count];
                 CGFloat *data = alloca(count * sizeof(CGFloat));
 
-                for (i = 0; i < count; i++) data[i] = [a[(count - 1 - i)] floatValue];
+                for (i = 0; i < count; i++) data[i] = [a[i] floatValue];
 
                 [self drawRangedGraphWithData:data size:[a count] currentIndex:(count - 1) upperBound:high lowerBound:low inRect:[self bounds] flipped:NO filled:YES color:[appSettings graphFG1Color]];
             }
@@ -325,23 +315,20 @@ - (void)drawGraph {
             if ([djia haveGoodDisplayData]) {
                 NSArray *a = nil;
                 if ([appSettings stockGraphTimeFrame] == 0)
-                    a = [djia get1MonthValues: self.graphSize.width];
+                    a = [djia get1MonthValues];
                 else if ([appSettings stockGraphTimeFrame] == 1)
-                    a = [djia get3MonthValues: self.graphSize.width];
+                    a = [djia get3MonthValues];
                 else if ([appSettings stockGraphTimeFrame] == 2)
-                    a = [djia get6MonthValues: self.graphSize.width];
+                    a = [djia get6MonthValues];
                 else if ([appSettings stockGraphTimeFrame] == 3)
-                    a = [djia get12MonthValues: self.graphSize.width];
+                    a = [djia get12MonthValues];
 
-                if (a != nil) {
-                    int i;
+                if ([a count] > 0) {
                     float high, low;
                     low = high = [a[0] floatValue];
-                    for (i = 1; i < [a count]; i++) {
-                        if ([a[i] floatValue] > high) 
-                            high = [a[i] floatValue];
-                        if ([a[i] floatValue] < low)
-                            low = [a[i] floatValue];
+                    for (NSNumber *closingPrice in a) {
+                        high = MAX(high, [closingPrice floatValue]);
+                        low = MIN(low, [closingPrice floatValue]);
                     }
 
                     r = (high - low) * .1;
@@ -351,7 +338,7 @@ - (void)drawGraph {
                     NSInteger count = [a count];
                     CGFloat *data = alloca(count * sizeof(CGFloat));
 
-                    for (i = 0; i < count; i++) data[i] = [a[(count - 1 - i)] floatValue];
+                    for (i = 0; i < count; i++) data[i] = [a[i] floatValue];
 
                     [self drawRangedGraphWithData:data size:[a count] currentIndex:(count - 1) upperBound:high lowerBound:low inRect:[self bounds] flipped:NO filled:NO color:[appSettings graphFG2Color]];
                 }

diff --git a/Utility/XRGStock.h b/Utility/XRGStock.h
@@ -29,11 +29,11 @@
 
 @interface XRGStock : NSObject
 
-@property NSString *label;
-@property (nonatomic) NSString *symbol;
+@property (nullable,readonly) NSString *label;
+@property (nullable,nonatomic) NSString *symbol;
 
-@property XRGURL *surl;
-@property XRGURL *immediateURL;
+@property (nullable) NSURL *sURL;
+@property (nullable) NSURL *immediateURL;
 
 @property CGFloat currentPrice;
 @property CGFloat lastChange;
@@ -47,25 +47,19 @@
 @property BOOL haveGoodStockArray;
 @property BOOL haveGoodDisplayData;
 
-@property NSMutableArray *closingPrices;
-@property NSMutableArray *volumes;
+@property (nullable) NSArray<NSNumber *> *closingPrices;
 
-- (NSString *)symbol;
-- (NSString *)label;
-- (void)setURL;
 - (void)resetData;
 - (void)loadData;
-- (void)checkForData;
-- (void)parseWebData:(NSString *)webData;
 
-- (NSArray *)get1MonthValues:(int)max;
-- (NSArray *)get3MonthValues:(int)max;
-- (NSArray *)get6MonthValues:(int)max;
-- (NSArray *)get12MonthValues:(int)max;
-- (NSArray *)getCurrentPriceAndChange;
+- (nullable NSArray<NSNumber *> *)get1MonthValues;
+- (nullable NSArray<NSNumber *> *)get3MonthValues;
+- (nullable NSArray<NSNumber *> *)get6MonthValues;
+- (nullable NSArray<NSNumber *> *)get12MonthValues;
+- (nullable NSArray<NSNumber *> *)getCurrentPriceAndChange;
 
-- (NSString *)priceString;
-- (NSString *)changeString;
+- (nonnull NSString *)priceString;
+- (nonnull NSString *)changeString;
 
 - (BOOL)errorOccurred;