wnagrodzki/iNapi
1
0
Fork 0
mirror of https://github.com/wnagrodzki/iNapi.git synced 2025-04-05 11:51:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code cleanup: accessors are not used in inits and deallocs

Browse source
This commit is contained in:
Wojciech Nagrodzki 2012-08-04 11:02:30 +02:00
parent 16509b79cf
commit 5968766c17
Signed by: wnagrodzki
GPG key ID: E9D0EB0302264569
3 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
iNapi/Classes/Helpers/INPMovieFilter.m
View file

@ -21,13 +21,11 @@
@implementation INPMovieFilter @implementation INPMovieFilter
@synthesize fileManager;
- (id)init - (id)init
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
self.fileManager = [NSFileManager defaultManager]; _fileManager = [NSFileManager defaultManager];
} }
return self; return self;
} }
@ -40,7 +38,7 @@
BOOL isDirectory; BOOL isDirectory;
for (NSString * path in filePaths) { for (NSString * path in filePaths) {
[fileManager fileExistsAtPath:path isDirectory:&isDirectory]; [self.fileManager fileExistsAtPath:path isDirectory:&isDirectory];
if (isDirectory) { if (isDirectory) {
NSArray * moviePathsAtDirectory = [self moviePathsAtDirectory:path]; NSArray * moviePathsAtDirectory = [self moviePathsAtDirectory:path];
@ -80,14 +78,14 @@
{ {
NSMutableArray * movies = [NSMutableArray array]; NSMutableArray * movies = [NSMutableArray array];
NSDirectoryEnumerator* enumerator = [fileManager enumeratorAtPath:directoryPath]; NSDirectoryEnumerator* enumerator = [self.fileManager enumeratorAtPath:directoryPath];
BOOL isDirectory; BOOL isDirectory;
NSString * iPath = nil; NSString * iPath = nil;
NSString* completeIPath = nil; NSString* completeIPath = nil;
while (iPath = [enumerator nextObject]) { while (iPath = [enumerator nextObject]) {
completeIPath = [[NSString stringWithString:directoryPath] stringByAppendingPathComponent:iPath]; completeIPath = [[NSString stringWithString:directoryPath] stringByAppendingPathComponent:iPath];
[fileManager fileExistsAtPath:completeIPath isDirectory: &isDirectory]; [self.fileManager fileExistsAtPath:completeIPath isDirectory: &isDirectory];
if (!isDirectory) if (!isDirectory)
if ([self fileConformsToMovieUTI:completeIPath]) if ([self fileConformsToMovieUTI:completeIPath])

13
iNapi/Classes/Helpers/INSubtitleDownloader.m
View file

@ -19,11 +19,6 @@
@implementation INSubtitleDownloader @implementation INSubtitleDownloader
@synthesize delegate;
// Private
@synthesize downloadQueue;
@synthesize fileManager;
+ (INSubtitleDownloader *)sharedDownloader + (INSubtitleDownloader *)sharedDownloader
{ {
__strong static id _sharedObject = nil; __strong static id _sharedObject = nil;
@ -38,16 +33,16 @@
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
self.downloadQueue = dispatch_queue_create("com.izydor86.inapi.downloadSubtitles", DISPATCH_QUEUE_SERIAL); _downloadQueue = dispatch_queue_create("com.izydor86.inapi.downloadSubtitles", DISPATCH_QUEUE_SERIAL);
self.fileManager = [NSFileManager defaultManager]; _fileManager = [NSFileManager defaultManager];
} }
return self; return self;
} }
- (void)dealloc - (void)dealloc
{ {
dispatch_release(downloadQueue); dispatch_release(_downloadQueue);
self.downloadQueue = NULL; _downloadQueue = NULL;
} }
#pragma mark - Interface #pragma mark - Interface

13
iNapi/Classes/Models/INDownloadResult.m
View file

@ -19,28 +19,23 @@
@implementation INDownloadResult @implementation INDownloadResult
@synthesize movieFileName;
@synthesize downloadResultImage;
// Private
@synthesize downloadedSubtitlesURL;
- (id)initWithDownloadedSubtitlesURL:(NSURL *)aDownloadedSubtitlesURL error:(NSError *)error - (id)initWithDownloadedSubtitlesURL:(NSURL *)aDownloadedSubtitlesURL error:(NSError *)error
{ {
self = [super init]; self = [super init];
if (self) { if (self) {
self.downloadedSubtitlesURL = aDownloadedSubtitlesURL; _downloadedSubtitlesURL = aDownloadedSubtitlesURL;
if (error == nil) { if (error == nil) {
self.downloadResultImage = [NSImage imageNamed:@"DownloadStatusSucceeded"]; _downloadResultImage = [NSImage imageNamed:@"DownloadStatusSucceeded"];
return self; return self;
} }
if ([error.domain isEqualToString:@"com.izydor86.iNapi"] && error.code == 404) { if ([error.domain isEqualToString:@"com.izydor86.iNapi"] && error.code == 404) {
self.downloadResultImage = [NSImage imageNamed:@"DownloadStatusNotFound"]; _downloadResultImage = [NSImage imageNamed:@"DownloadStatusNotFound"];
return self; return self;
} }
self.downloadResultImage = [NSImage imageNamed:@"DownloadStatusFailed"]; _downloadResultImage = [NSImage imageNamed:@"DownloadStatusFailed"];
} }
return self; return self;
} }