Skip to content

Commit 2cd2905

Browse files
author
yanqizhou
committed
替换cocoasynsocket为gcdwebser
1 parent dd255ca commit 2cd2905

14 files changed

+211
-414
lines changed

‎DebugDatabase/DebugDatabaseManager.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
//
88

99
#import <Foundation/Foundation.h>
10+
#import "GCDWebServer.h"
1011

11-
@interface DebugDatabaseManager : NSObject
12+
@interface DebugDatabaseManager : GCDWebServer
1213

1314
+ (instancetype)shared;
1415

@@ -17,6 +18,4 @@
1718
//默认目录为cache目录和document目录
1819
- (void)startServerOnPort:(NSInteger)port;
1920

20-
- (NSString*)mapOrArrayTransformToJsonString:(NSObject*)obj;
21-
2221
@end

‎DebugDatabase/DebugDatabaseManager.m

+171-210
Large diffs are not rendered by default.

‎DebugDatabase/DebugDatabaseRequest.h

-21
This file was deleted.

‎DebugDatabase/DebugDatabaseRequest.m

-48
This file was deleted.

‎DebugDatabase/DebugDatabaseResponse.h

-25
This file was deleted.

‎DebugDatabase/DebugDatabaseResponse.m

-88
This file was deleted.

‎DebugDatabase/Web.bundle/app.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ function updateTableData(updatedData, callback) {
319319
});
320320
//build request parameters
321321
var requestParameters = {};
322-
requestParameters.dbName = selectedTableElement.attr('data-db-name');
322+
requestParameters.database = selectedTableElement.attr('data-db-name');
323323
requestParameters.tableName = selectedTableElement.attr('data-table-name');;
324324
requestParameters.updatedData = encodeURIComponent(JSON.stringify(filteredUpdatedData));
325325

@@ -361,7 +361,7 @@ function deleteTableData(deleteData, callback) {
361361

362362
//build request parameters
363363
var requestParameters = {};
364-
requestParameters.dbName = selectedTableElement.attr('data-db-name');
364+
requestParameters.database = selectedTableElement.attr('data-db-name');
365365
requestParameters.tableName = selectedTableElement.attr('data-table-name');;
366366
requestParameters.deleteData = encodeURIComponent(JSON.stringify(filteredUpdatedData));
367367

‎DebugDatabase/Web.bundle/appinfo.html

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
<li>
6464
<a href="index.html">Database</a>
6565
</li>
66+
<li>
67+
<a href="http://modelend.com/"
68+
target="_blank">Modelend</a>
69+
</li>
6670
<li>
6771
<a href="https://github.com/y500/YYDebugDatabase"
6872
target="_blank">Github</a>

‎DebugDatabase/Web.bundle/favicon.ico

-256 Bytes
Binary file not shown.

‎DebugDatabase/Web.bundle/index.html

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
<li>
6464
<a href="appinfo.html">App Info And User Default</a>
6565
</li>
66+
<li>
67+
<a href="http://modelend.com/"
68+
target="_blank">Modelend</a>
69+
</li>
6670
<li>
6771
<a href="https://github.com/y500/YYDebugDatabase"
6872
target="_blank">Github</a>

‎Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
target 'YYDebugDatabase' do
2-
pod 'CocoaAsyncSocket'
2+
pod "GCDWebServer"
33
pod 'FMDB'
44
end

‎YYDebugDatabase.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'YYDebugDatabase'
11-
s.version = '1.1.0'
11+
s.version = '2.0.0'
1212
s.summary = 'easy way to process splite db'
1313

1414
s.homepage = 'https://y500.me'
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
1818

1919
s.ios.deployment_target = '7.0'
2020

21-
s.dependency 'CocoaAsyncSocket'
21+
s.dependency 'GCDWebServer'
2222
s.dependency 'FMDB'
2323

2424
s.source_files = 'DebugDatabase/**/*.{h,m}', 'DebugDatabase/*.{h,m}'

‎YYDebugDatabase.xcodeproj/project.pbxproj

+7-13
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
E84AE5FB1F3ADDE3003A9EB7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E84AE5FA1F3ADDE3003A9EB7 /* Assets.xcassets */; };
1616
E84AE5FE1F3ADDE3003A9EB7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E84AE5FC1F3ADDE3003A9EB7 /* LaunchScreen.storyboard */; };
1717
E84AE6341F3C4210003A9EB7 /* DebugDatabaseManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E84AE6331F3C4210003A9EB7 /* DebugDatabaseManager.m */; };
18-
E84AE6371F3D4F91003A9EB7 /* DebugDatabaseRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = E84AE6361F3D4F91003A9EB7 /* DebugDatabaseRequest.m */; };
19-
E84AE63A1F3D4FA2003A9EB7 /* DebugDatabaseResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = E84AE6391F3D4FA2003A9EB7 /* DebugDatabaseResponse.m */; };
2018
E84AE63D1F3D8016003A9EB7 /* NSURL+scheme.m in Sources */ = {isa = PBXBuildFile; fileRef = E84AE63C1F3D8016003A9EB7 /* NSURL+scheme.m */; };
2119
E84AE6401F3D9BEF003A9EB7 /* Car.db in Resources */ = {isa = PBXBuildFile; fileRef = E84AE63E1F3D8843003A9EB7 /* Car.db */; };
2220
E84AE6411F3D9BEF003A9EB7 /* Contact.db in Resources */ = {isa = PBXBuildFile; fileRef = E84AE63F1F3D8843003A9EB7 /* Contact.db */; };
@@ -43,10 +41,6 @@
4341
E84AE5FF1F3ADDE3003A9EB7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4442
E84AE6321F3C4210003A9EB7 /* DebugDatabaseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugDatabaseManager.h; sourceTree = "<group>"; };
4543
E84AE6331F3C4210003A9EB7 /* DebugDatabaseManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugDatabaseManager.m; sourceTree = "<group>"; };
46-
E84AE6351F3D4F91003A9EB7 /* DebugDatabaseRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugDatabaseRequest.h; sourceTree = "<group>"; };
47-
E84AE6361F3D4F91003A9EB7 /* DebugDatabaseRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugDatabaseRequest.m; sourceTree = "<group>"; };
48-
E84AE6381F3D4FA2003A9EB7 /* DebugDatabaseResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DebugDatabaseResponse.h; sourceTree = "<group>"; };
49-
E84AE6391F3D4FA2003A9EB7 /* DebugDatabaseResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DebugDatabaseResponse.m; sourceTree = "<group>"; };
5044
E84AE63B1F3D8016003A9EB7 /* NSURL+scheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+scheme.h"; sourceTree = "<group>"; };
5145
E84AE63C1F3D8016003A9EB7 /* NSURL+scheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+scheme.m"; sourceTree = "<group>"; };
5246
E84AE63E1F3D8843003A9EB7 /* Car.db */ = {isa = PBXFileReference; lastKnownFileType = file; path = Car.db; sourceTree = "<group>"; };
@@ -146,10 +140,6 @@
146140
E8E069C81F40954500477064 /* Web.bundle */,
147141
E84AE6321F3C4210003A9EB7 /* DebugDatabaseManager.h */,
148142
E84AE6331F3C4210003A9EB7 /* DebugDatabaseManager.m */,
149-
E84AE6351F3D4F91003A9EB7 /* DebugDatabaseRequest.h */,
150-
E84AE6361F3D4F91003A9EB7 /* DebugDatabaseRequest.m */,
151-
E84AE6381F3D4FA2003A9EB7 /* DebugDatabaseResponse.h */,
152-
E84AE6391F3D4FA2003A9EB7 /* DebugDatabaseResponse.m */,
153143
E84AE6421F3D9F8F003A9EB7 /* DatabaseUtil.h */,
154144
E84AE6431F3D9F8F003A9EB7 /* DatabaseUtil.m */,
155145
E84AE63B1F3D8016003A9EB7 /* NSURL+scheme.h */,
@@ -244,9 +234,12 @@
244234
files = (
245235
);
246236
inputPaths = (
237+
"${SRCROOT}/Pods/Target Support Files/Pods-YYDebugDatabase/Pods-YYDebugDatabase-resources.sh",
238+
"${PODS_ROOT}/GCDWebServer/GCDWebUploader/GCDWebUploader.bundle",
247239
);
248240
name = "[CP] Copy Pods Resources";
249241
outputPaths = (
242+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
250243
);
251244
runOnlyForDeploymentPostprocessing = 0;
252245
shellPath = /bin/sh;
@@ -274,13 +267,16 @@
274267
files = (
275268
);
276269
inputPaths = (
270+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
271+
"${PODS_ROOT}/Manifest.lock",
277272
);
278273
name = "[CP] Check Pods Manifest.lock";
279274
outputPaths = (
275+
"$(DERIVED_FILE_DIR)/Pods-YYDebugDatabase-checkManifestLockResult.txt",
280276
);
281277
runOnlyForDeploymentPostprocessing = 0;
282278
shellPath = /bin/sh;
283-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
279+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
284280
showEnvVarsInLog = 0;
285281
};
286282
/* End PBXShellScriptBuildPhase section */
@@ -290,11 +286,9 @@
290286
isa = PBXSourcesBuildPhase;
291287
buildActionMask = 2147483647;
292288
files = (
293-
E84AE6371F3D4F91003A9EB7 /* DebugDatabaseRequest.m in Sources */,
294289
E84AE6341F3C4210003A9EB7 /* DebugDatabaseManager.m in Sources */,
295290
E84AE5F61F3ADDE3003A9EB7 /* ViewController.m in Sources */,
296291
E84AE64F1F3EA78F003A9EB7 /* NSString+json.m in Sources */,
297-
E84AE63A1F3D4FA2003A9EB7 /* DebugDatabaseResponse.m in Sources */,
298292
E84AE64C1F3EA0DF003A9EB7 /* NSMutableDictionary+safe.m in Sources */,
299293
E84AE6441F3D9F8F003A9EB7 /* DatabaseUtil.m in Sources */,
300294
E84AE63D1F3D8016003A9EB7 /* NSURL+scheme.m in Sources */,

‎YYDebugDatabase/AppDelegate.m

+18-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,24 @@ @implementation AppDelegate
1919
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
2020
// Override point for customization after application launch.
2121

22-
[[DebugDatabaseManager shared] startServerOnPort:9002 directories:@[[[NSBundle mainBundle] resourcePath]]];
22+
NSFileManager*fileManager =[NSFileManager defaultManager];
23+
NSError*error;
24+
NSArray*paths =NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,NSUserDomainMask, YES);
25+
NSString*documentsDirectory =[paths objectAtIndex:0];
26+
27+
NSString*txtPath =[documentsDirectory stringByAppendingPathComponent:@"document.db"];
28+
29+
if([fileManager fileExistsAtPath:txtPath]== NO){
30+
NSString*resourcePath =[[NSBundle mainBundle] pathForResource:@"Car" ofType:@"db"];
31+
[fileManager copyItemAtPath:resourcePath toPath:txtPath error:&error];
32+
NSLog(@"%@", error);
33+
}
34+
35+
NSString *resourceDirectory = [[NSBundle mainBundle] resourcePath];
36+
NSString *databaseDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents/database"];
37+
NSString *documentDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
38+
NSString *cacheDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Cache"];
39+
[[DebugDatabaseManager shared] startServerOnPort:80 directories:@[resourceDirectory, databaseDirectory, documentDirectory, cacheDirectory]];
2340

2441
return YES;
2542
}

0 commit comments

Comments
 (0)