Merge pull request tinymind#24 from wangwanjie/master

增加html对单引号的检索，增加对js文件的检索
ZWQ123456789aaabbb · Mar 27, 2017 · 573a60f · 573a60f
2 parents afe84ff + 6ef532c
commit 573a60f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 11 deletions.
diff --git a/LSUnusedResources/Model/ResourceStringSearcher.m b/LSUnusedResources/Model/ResourceStringSearcher.m
@@ -22,6 +22,7 @@ typedef NS_ENUM(NSUInteger, LSFileType) {
     LSFileTypeXib   = 7,
     LSFileTypePlist = 8,
     LSFileTypeJson  = 9,
+    LSFileTypeJs  = 10
 };
 
 
@@ -197,7 +198,11 @@ - (void)parseFileAtPath:(NSString *)path withType:(LSFileType)fileType {
             groupIndex = 1;
             break;
         case LSFileTypeHtml:
-            pattern = @"img\\s+src=\"(.+?)\"";//<img src="xx">
+            pattern = @"img\\s+src=[\"\'](.+?)[\"\']";//<img src="xx"> <img src='xx'>
+            groupIndex = 1;
+            break;
+        case LSFileTypeJs:
+            pattern = @"[\"\']src[\"\'],\\s+[\"\'](.+?)[\"\']";// "src", "xx"> 'src', 'xx'>
             groupIndex = 1;
             break;
         case LSFileTypeJson:
@@ -276,6 +281,9 @@ - (LSFileType)fileTypeByName:(NSString *)name {
     if ([ext isEqualTo:@"json"]) {
         return LSFileTypeJson;
     }
+    if ([ext isEqualTo:@"js"]) {
+        return LSFileTypeJs;
+    }
     if ([ext isEqualTo:@"css"]) {
         return LSFileTypeCSS;
     }

diff --git a/LSUnusedResources/Recourse/Base.lproj/Main.storyboard b/LSUnusedResources/Recourse/Base.lproj/Main.storyboard
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" initialViewController="B8D-0N-5wS">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -645,7 +646,7 @@
                 <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="75" y="0.0"/>
+            <point key="canvasLocation" x="345" y="-103"/>
         </scene>
         <!--Window Controller-->
         <scene sceneID="R2V-B0-nI4">
@@ -664,7 +665,7 @@
                 </windowController>
                 <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="93" y="399"/>
+            <point key="canvasLocation" x="368" y="302"/>
         </scene>
         <!--Main View Controller-->
         <scene sceneID="hIz-AP-VOD">
@@ -881,8 +882,16 @@
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
+                                    <button misplaced="YES" id="Pb6-bK-hu7" userLabel="JavaScript Checkbox">
+                                        <rect key="frame" x="422" y="36" width="120" height="18"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <buttonCell key="cell" type="check" title=".js" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="Pz8-by-ofv" userLabel=".javascript">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="system"/>
+                                        </buttonCell>
+                                    </button>
                                     <button misplaced="YES" id="DXV-iK-pT8">
-                                        <rect key="frame" x="402" y="65" width="60" height="18"/>
+                                        <rect key="frame" x="422" y="65" width="60" height="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <buttonCell key="cell" type="check" title=".json" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="OFI-ad-LRu">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -895,11 +904,11 @@
                                 <rect key="frame" x="10" y="40" width="520" height="284"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <clipView key="contentView" id="sUG-kO-lfb">
-                                    <rect key="frame" x="1" y="0.0" width="518" height="283"/>
+                                    <rect key="frame" x="1" y="0.0" width="518" height="268"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" headerView="DQk-C7-ykG" id="Yqh-sW-D2a">
-                                            <rect key="frame" x="0.0" y="0.0" width="1286" height="260"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="1286" height="245"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -962,7 +971,7 @@
                                     </subviews>
                                 </clipView>
                                 <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="zEY-KI-pAy">
-                                    <rect key="frame" x="1" y="267" width="518" height="16"/>
+                                    <rect key="frame" x="1" y="268" width="518" height="15"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="KkO-YP-zyT">
@@ -1045,6 +1054,7 @@
                         <outlet property="headerCheckbox" destination="YpA-SJ-IRd" id="94A-NH-54r"/>
                         <outlet property="htmlCheckbox" destination="Ap8-HE-32k" id="ivY-qq-Mam"/>
                         <outlet property="ignoreSimilarCheckbox" destination="ty7-Lh-GkV" id="FCe-je-vQk"/>
+                        <outlet property="javaScriptCheckbox" destination="Pb6-bK-hu7" id="43O-2j-bRY"/>
                         <outlet property="jsonCheckbox" destination="DXV-iK-pT8" id="Vge-f8-Qtl"/>
                         <outlet property="mCheckbox" destination="9Nb-Td-UP4" id="hQT-Zb-axU"/>
                         <outlet property="mmCheckbox" destination="gRh-xT-XgN" id="BJY-YH-Zsq"/>
@@ -1062,7 +1072,7 @@
                 </viewController>
                 <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="93" y="1213"/>
+            <point key="canvasLocation" x="271" y="1036"/>
         </scene>
     </scenes>
 </document>
diff --git a/LSUnusedResources/ViewController/MainViewController.m b/LSUnusedResources/ViewController/MainViewController.m
@@ -41,6 +41,7 @@ @interface MainViewController () <NSTableViewDelegate, NSTableViewDataSource>{
 @property (weak) IBOutlet NSButton *xibCheckbox;
 @property (weak) IBOutlet NSButton *sbCheckbox;
 @property (weak) IBOutlet NSButton *jsonCheckbox;
+@property (weak) IBOutlet NSButton *javaScriptCheckbox;
 
 @property (weak) IBOutlet NSButton *ignoreSimilarCheckbox;
 
@@ -320,6 +321,9 @@ - (NSArray *)includeFileSuffixs {
     if ([self.sbCheckbox state]) {
         [suffixs addObject:@"storyboard"];
     }
+    if ([self.javaScriptCheckbox state]) {
+        [suffixs addObject:@"js"];
+    }
 
     if (suffixs.count == 0) {
         [suffixs addObject:@"m"];
@@ -351,6 +355,7 @@ - (void)setUIEnabled:(BOOL)state {
     [_headerCheckbox setEnabled:state];
     [_htmlCheckbox setEnabled:state];
     [_jsonCheckbox setEnabled:state];
+    [_javaScriptCheckbox setEnabled:state];
     [_plistCheckbox setEnabled:state];
     [_cssCheckbox setEnabled:state];
     [_swiftCheckbox setEnabled:state];