fix #6 and add formatter

tattali · Oct 20, 2019 · d9ade48 · d9ade48
1 parent d19e1d8
commit d9ade48
Show file tree

Hide file tree

Showing 13 changed files with 453 additions and 417 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1 @@
+ColumnLimit: 120
diff --git a/QuickLookAddict.xcodeproj/project.pbxproj b/QuickLookAddict.xcodeproj/project.pbxproj
@@ -7,39 +7,20 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0C35F91F1EB54FC40088620B /* addic7ed.css in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0CE3C8101E8BE459006BA7CB /* addic7ed.css */; };
-		0C35F9201EB54FCF0088620B /* addic7ed-grey.css in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0CB8F2D91E9403BA00294F77 /* addic7ed-grey.css */; };
-		0C35F9211EB54FD50088620B /* farran.css in CopyFiles */ = {isa = PBXBuildFile; fileRef = 0CBD1BD61E9E75C000989C7A /* farran.css */; };
+		0C6CB408235C865000F18424 /* themes in Resources */ = {isa = PBXBuildFile; fileRef = 0C6CB407235C864F00F18424 /* themes */; };
 		0CE3C8051E8ABFB8006BA7CB /* GenerateThumbnailForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE3C8041E8ABFB8006BA7CB /* GenerateThumbnailForURL.m */; };
 		0CE3C8071E8ABFB8006BA7CB /* GeneratePreviewForURL.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CE3C8061E8ABFB8006BA7CB /* GeneratePreviewForURL.m */; };
 		0CE3C8091E8ABFB8006BA7CB /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 0CE3C8081E8ABFB8006BA7CB /* main.c */; };
 		0CF9E8321EB54A6900AA0DDC /* base.css in Resources */ = {isa = PBXBuildFile; fileRef = 0CF9E8311EB54A6900AA0DDC /* base.css */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		0C35F91E1EB54F800088620B /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = themes;
-			dstSubfolderSpec = 7;
-			files = (
-				0C35F9211EB54FD50088620B /* farran.css in CopyFiles */,
-				0C35F9201EB54FCF0088620B /* addic7ed-grey.css in CopyFiles */,
-				0C35F91F1EB54FC40088620B /* addic7ed.css in CopyFiles */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
-		0CB8F2D91E9403BA00294F77 /* addic7ed-grey.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "addic7ed-grey.css"; sourceTree = "<group>"; };
-		0CBD1BD61E9E75C000989C7A /* farran.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = farran.css; sourceTree = "<group>"; };
+		0C6CB407235C864F00F18424 /* themes */ = {isa = PBXFileReference; lastKnownFileType = folder; path = themes; sourceTree = "<group>"; };
 		0CE3C8011E8ABFB8006BA7CB /* QLAddict.qlgenerator */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = QLAddict.qlgenerator; sourceTree = BUILT_PRODUCTS_DIR; };
 		0CE3C8041E8ABFB8006BA7CB /* GenerateThumbnailForURL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GenerateThumbnailForURL.m; sourceTree = "<group>"; };
 		0CE3C8061E8ABFB8006BA7CB /* GeneratePreviewForURL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GeneratePreviewForURL.m; sourceTree = "<group>"; };
 		0CE3C8081E8ABFB8006BA7CB /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
 		0CE3C80A1E8ABFB9006BA7CB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		0CE3C8101E8BE459006BA7CB /* addic7ed.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = addic7ed.css; sourceTree = "<group>"; };
 		0CF9E8311EB54A6900AA0DDC /* base.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = base.css; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -85,23 +66,13 @@
 		0CE3C8121E8BF584006BA7CB /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				0C6CB407235C864F00F18424 /* themes */,
 				0CF9E8311EB54A6900AA0DDC /* base.css */,
-				0CF9E8301EB54A3100AA0DDC /* themes */,
 			);
 			name = Resources;
 			path = QuickLookAddict;
 			sourceTree = "<group>";
 		};
-		0CF9E8301EB54A3100AA0DDC /* themes */ = {
-			isa = PBXGroup;
-			children = (
-				0CE3C8101E8BE459006BA7CB /* addic7ed.css */,
-				0CB8F2D91E9403BA00294F77 /* addic7ed-grey.css */,
-				0CBD1BD61E9E75C000989C7A /* farran.css */,
-			);
-			name = themes;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -124,7 +95,6 @@
 				0CE3C7FE1E8ABFB8006BA7CB /* Headers */,
 				0CE3C7FF1E8ABFB8006BA7CB /* Resources */,
 				0C9EBD591E8D932C00D35520 /* ShellScript */,
-				0C35F91E1EB54F800088620B /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -141,7 +111,7 @@
 		0CE3C7F81E8ABFB8006BA7CB /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1110;
 				ORGANIZATIONNAME = "Théo Attali";
 				TargetAttributes = {
 					0CE3C8001E8ABFB8006BA7CB = {
@@ -152,10 +122,11 @@
 			};
 			buildConfigurationList = 0CE3C7FB1E8ABFB8006BA7CB /* Build configuration list for PBXProject "QuickLookAddict" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 0CE3C7F71E8ABFB8006BA7CB;
 			productRefGroup = 0CE3C8021E8ABFB8006BA7CB /* Products */;
@@ -172,6 +143,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0C6CB408235C865000F18424 /* themes in Resources */,
 				0CF9E8321EB54A6900AA0DDC /* base.css in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -190,7 +162,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "rm -rf ~/Library/QuickLook/QLAddict.qlgenerator\ncp -av ~/Library/Developer/Xcode/DerivedData/QuickLookAddict-dmgipdweaarobwbdbjjujtrsczsf/Build/Products/Debug/QLAddict.qlgenerator ~/Library/QuickLook/\nqlmanage -r";
+			shellScript = "#!/bin/sh\n\nPRODUCT=\"${PRODUCT_NAME}.qlgenerator\"\nQL_PATH=~/Library/QuickLook/\n\nrm -rf \"$QL_PATH/$PRODUCT\"\ntest -d \"$QL_PATH\" || mkdir -p \"$QL_PATH\" && cp -R \"$BUILT_PRODUCTS_DIR/$PRODUCT\" \"$QL_PATH\"\nqlmanage -r\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -212,21 +184,30 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -260,21 +241,30 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

diff --git a/QuickLookAddict.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/QuickLookAddict.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/QuickLookAddict.xcodeproj/xcshareddata/xcschemes/QuickLookAddict.xcscheme b/QuickLookAddict.xcodeproj/xcshareddata/xcschemes/QuickLookAddict.xcscheme
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1110"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0CE3C8001E8ABFB8006BA7CB"
+               BuildableName = "QLAddict.qlgenerator"
+               BlueprintName = "QuickLookAddict"
+               ReferencedContainer = "container:QuickLookAddict.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0CE3C8001E8ABFB8006BA7CB"
+            BuildableName = "QLAddict.qlgenerator"
+            BlueprintName = "QuickLookAddict"
+            ReferencedContainer = "container:QuickLookAddict.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>