diff options
| author | Max <post@wickenrode.com> | 2015-10-08 13:50:38 +0200 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2015-10-08 13:50:38 +0200 |
| commit | 1dedadcaba2cd474a251a24d893dc3b7b2a719a7 (patch) | |
| tree | 6859a81f84293266e340517a49b0edd4318a5c8b /Source/SPDataImport.m | |
| parent | e3b8f07f34cd630bc285357d016e38c1926e362a (diff) | |
| download | sequelpro-1dedadcaba2cd474a251a24d893dc3b7b2a719a7.tar.gz sequelpro-1dedadcaba2cd474a251a24d893dc3b7b2a719a7.tar.bz2 sequelpro-1dedadcaba2cd474a251a24d893dc3b7b2a719a7.zip | |
* Change a method name to fit standard naming conventions
* Remove a redundant ivar (and while we are at it, restructure some code)
* And then there was this gem:
(...)
if (fileMode == O_RDONLY) {
int i, c;
char bzbuf[4];
const char *charFileMode = fileMode == O_WRONLY ? "wb" : "rb";
(...)
Diffstat (limited to 'Source/SPDataImport.m')
| -rw-r--r-- | Source/SPDataImport.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m index 8ce41afc..64f314a9 100644 --- a/Source/SPDataImport.m +++ b/Source/SPDataImport.m @@ -389,7 +389,7 @@ [[NSFileManager defaultManager] removeItemAtPath:filename error:nil]; return; } - fileIsCompressed = [sqlFileHandle isCompressed]; + fileIsCompressed = ([sqlFileHandle compressionFormat] != SPNoCompression); // Grab the file length fileTotalLength = (NSUInteger)[[[[NSFileManager defaultManager] attributesOfItemAtPath:filename error:NULL] objectForKey:NSFileSize] longLongValue]; @@ -752,7 +752,7 @@ // Grab the file length and status fileTotalLength = (NSUInteger)[[[[NSFileManager defaultManager] attributesOfItemAtPath:filename error:NULL] objectForKey:NSFileSize] longLongValue]; if (!fileTotalLength) fileTotalLength = 1; - fileIsCompressed = [csvFileHandle isCompressed]; + fileIsCompressed = ([csvFileHandle compressionFormat] != SPNoCompression); // If importing a bzipped file, use indeterminate progress bars as no progress is available BOOL useIndeterminate = NO; |