Fix crash when delete resources

tinymind · Dec 15, 2015 · 655f26f · 655f26f
1 parent 775c65b
commit 655f26f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 29 deletions.
diff --git a/LSUnusedResources/Info.plist b/LSUnusedResources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/LSUnusedResources/Recourse/Base.lproj/Main.storyboard b/LSUnusedResources/Recourse/Base.lproj/Main.storyboard
@@ -1000,7 +1000,7 @@
                                 <font key="titleFont" metaFont="system"/>
                             </box>
                             <button verticalHuggingPriority="750" id="d2Z-MZ-XC6">
-                                <rect key="frame" x="3" y="3" width="96" height="32"/>
+                                <rect key="frame" x="4" y="3" width="94" height="32"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <animations/>
                                 <buttonCell key="cell" type="push" title="Search" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cUV-ux-EjC">
@@ -1024,8 +1024,8 @@
                                 </connections>
                             </button>
                             <button hidden="YES" verticalHuggingPriority="750" id="q84-1O-TmH">
-                                <rect key="frame" x="364" y="3" width="82" height="32"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                <rect key="frame" x="350" y="3" width="94" height="32"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                 <buttonCell key="cell" type="push" title="Delete" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Cgc-bZ-CHo">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -1035,12 +1035,12 @@
                                 </connections>
                             </button>
                             <progressIndicator hidden="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" id="N6r-4n-Mu1">
-                                <rect key="frame" x="104" y="12" width="16" height="16"/>
+                                <rect key="frame" x="94" y="12" width="16" height="16"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <animations/>
                             </progressIndicator>
                             <textField verticalHuggingPriority="750" id="T1v-qi-uUW">
-                                <rect key="frame" x="126" y="12" width="238" height="17"/>
+                                <rect key="frame" x="110" y="12" width="238" height="17"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <animations/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="emm-3c-l2S">

diff --git a/LSUnusedResources/ViewController/MainViewController.m b/LSUnusedResources/ViewController/MainViewController.m
@@ -168,25 +168,24 @@ - (IBAction)onExportButtonClicked:(id)sender {
 
 - (IBAction)onDeleteButtonClicked:(id)sender {
     if (self.resultsTableView.numberOfSelectedRows > 0) {
-        NSLog(@"selected rows count:%ld", self.resultsTableView.numberOfSelectedRows);
-
-        __block NSError *error;
-
-        __block NSArray *results = [self.unusedResults copy];
-        [self.resultsTableView.selectedRowIndexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL * _Nonnull stop) {
-            ResourceFileInfo *info = [results objectAtIndex:idx];
-            [[NSFileManager defaultManager] removeItemAtURL:[NSURL fileURLWithPath:info.path] error:&error];
-            if (error) {
-                NSLog(@"File deletion error:%@", [error description]);
-                *stop = YES;
-            }else{
-                [self.resultsTableView beginUpdates];
-                NSIndexSet *indexSet = [NSIndexSet indexSetWithIndex:idx];
-                [self.resultsTableView removeRowsAtIndexes:indexSet withAnimation:NSTableViewAnimationSlideUp];
-                [self.unusedResults removeObject:info];
-                [self.resultsTableView endUpdates];
+        NSArray *results = [self.unusedResults copy];
+        NSIndexSet *selectedIndexSet = self.resultsTableView.selectedRowIndexes;
+        NSUInteger index = [selectedIndexSet firstIndex];
+        while (index != NSNotFound) {
+            if (index < results.count) {
+                ResourceFileInfo *info = [results objectAtIndex:index];
+                [[NSFileManager defaultManager] removeItemAtURL:[NSURL fileURLWithPath:info.path] error:nil];
             }
-        }];
+            index = [selectedIndexSet indexGreaterThanIndex:index];
+        }
+
+        [self.unusedResults removeObjectsAtIndexes:selectedIndexSet];
+        [self.resultsTableView reloadData];
+        [self updateUnusedResultsCount];
+    } else {
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert setMessageText:@"Please select first."];
+        [alert runModal];
     }
 }
 
@@ -278,7 +277,7 @@ - (NSArray *)includeFileSuffixs {
         [suffixs addObject:@"plist"];
     }
     if ([self.cssCheckbox state]) {
-        [suffixs addObject:@"plist"];
+        [suffixs addObject:@"css"];
     }
     if ([self.xibCheckbox state]) {
         [suffixs addObject:@"xib"];
@@ -296,10 +295,7 @@ - (NSArray *)includeFileSuffixs {
 - (void)setUIEnabled:(BOOL)state {
     // Individual
     if (state) {
-        [self.processIndicator stopAnimation:self];
-        NSUInteger count = self.unusedResults.count;
-        NSString *tips = count > 2 ? @"resources" : @"resource";
-        self.statusLabel.stringValue = [NSString stringWithFormat:@"%d unsued %@.", (int)count, tips];
+        [self updateUnusedResultsCount];
     } else {
         [self.processIndicator startAnimation:self];
         self.statusLabel.stringValue = @"Searching...";
@@ -332,6 +328,13 @@ - (void)setUIEnabled:(BOOL)state {
     [_processIndicator setHidden:state];
 }
 
+- (void)updateUnusedResultsCount {
+    [self.processIndicator stopAnimation:self];
+    NSUInteger count = self.unusedResults.count;
+    NSString *tips = count > 2 ? @"resources" : @"resource";
+    self.statusLabel.stringValue = [NSString stringWithFormat:@"%d unsued %@.", (int)count, tips];
+}
+
 - (void)searchUnusedResources {
     if (self.isFileDone && self.isStringDone) {
         NSArray *resNames = [[[ResourceFileSearcher sharedObject].resNameInfoDict allKeys] sortedArrayUsingSelector:@selector(localizedCaseInsensitiveCompare:)];

diff --git a/LSUnusedResourcesExample.gif b/LSUnusedResourcesExample.gif
diff --git a/Release/LSUnusedResources.app.zip b/Release/LSUnusedResources.app.zip