Adjusted file name for Newsstand or Opt-In reports

Cocoanetics · Apr 12, 2013 · 9324d4b · 9324d4b
1 parent 94aec92
commit 9324d4b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Core/Source/DTITCFunctions.m b/Core/Source/DTITCFunctions.m
@@ -173,4 +173,4 @@ ITCReportDateType reportDateTypeFromString(NSString *reportDateTypeString)
             return @"yyyy";
         }
     }
-}
+}
diff --git a/Core/Source/DTITCReportDownloader.m b/Core/Source/DTITCReportDownloader.m
@@ -189,10 +189,17 @@ - (NSString *)predictedFileNameForDate:(NSDate *)date
 {
 	NSMutableString *retString = [NSMutableString string];
 
-	// always Sales (or is this
-	[retString appendString:@"S"];
+    NSString *reportTypeString = [NSStringFromITCReportType(reportType) substringToIndex:1];
+	[retString appendString:reportTypeString];
 
 	[retString appendString:@"_"];
+
+    if (reportType != ITCReportTypeSales)
+    {
+        NSString *reportSubTypeString = [NSStringFromITCReportSubType(reportSubType) substringToIndex:1];
+        [retString appendString:reportSubTypeString];
+        [retString appendString:@"_"];
+    }
 
     NSString *dateTypeString = NSStringFromITCReportDateType(reportDateType);