Skip to content

Commit 20de47f

Browse files
CreaterOSCreaterOS
committed
v1.3.2
1 parent 576f122 commit 20de47f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+383
-11416
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎Paintinglite/Paintinglite.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@
1717
6888B26F24B9DBFA003345D9 /* PaintingliteCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 6888B26E24B9DBFA003345D9 /* PaintingliteCache.m */; };
1818
689E0677247EA79300D6DF95 /* PaintingliteSecurity.m in Sources */ = {isa = PBXBuildFile; fileRef = 689E0676247EA79300D6DF95 /* PaintingliteSecurity.m */; };
1919
689E067A247EACD000D6DF95 /* PaintingliteDataBaseOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 689E0679247EACD000D6DF95 /* PaintingliteDataBaseOptions.m */; };
20-
689F24B3248CD1B100A9DC3B /* unzip.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F2491248CD1B000A9DC3B /* unzip.m */; };
21-
689F24B4248CD1B100A9DC3B /* zip.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F2492248CD1B000A9DC3B /* zip.m */; };
22-
689F24B5248CD1B100A9DC3B /* ioapi.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F2493248CD1B000A9DC3B /* ioapi.m */; };
23-
689F24B6248CD1B100A9DC3B /* mztools.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F2494248CD1B000A9DC3B /* mztools.m */; };
24-
689F24B7248CD1B100A9DC3B /* aeskey.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F249B248CD1B000A9DC3B /* aeskey.m */; };
25-
689F24B8248CD1B100A9DC3B /* hmac.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F249D248CD1B000A9DC3B /* hmac.m */; };
26-
689F24B9248CD1B100A9DC3B /* aescrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24A0248CD1B000A9DC3B /* aescrypt.m */; };
27-
689F24BA248CD1B100A9DC3B /* fileenc.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24A1248CD1B000A9DC3B /* fileenc.m */; };
28-
689F24BB248CD1B100A9DC3B /* sha1.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24A4248CD1B000A9DC3B /* sha1.m */; };
29-
689F24BC248CD1B100A9DC3B /* prng.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24AA248CD1B000A9DC3B /* prng.m */; };
30-
689F24BD248CD1B100A9DC3B /* pwd2key.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24AB248CD1B000A9DC3B /* pwd2key.m */; };
31-
689F24BE248CD1B100A9DC3B /* aestab.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24AC248CD1B000A9DC3B /* aestab.m */; };
32-
689F24BF248CD1B100A9DC3B /* entropy.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24AF248CD1B000A9DC3B /* entropy.m */; };
33-
689F24C0248CD1B100A9DC3B /* SSZipArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 689F24B0248CD1B000A9DC3B /* SSZipArchive.m */; };
3420
68A1F058247F9CBF0091EAFB /* PaintingliteExec.m in Sources */ = {isa = PBXBuildFile; fileRef = 68A1F057247F9CBF0091EAFB /* PaintingliteExec.m */; };
3521
68B84AA02497B9410021CFC2 /* PaintingliteSplitTable.m in Sources */ = {isa = PBXBuildFile; fileRef = 68B84A9F2497B9410021CFC2 /* PaintingliteSplitTable.m */; };
3622
68C2F0A8248B8ECB007ADEB0 /* PaintingliteBackUpManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 68C2F0A7248B8ECB007ADEB0 /* PaintingliteBackUpManager.m */; };
@@ -95,40 +81,6 @@
9581
689E0676247EA79300D6DF95 /* PaintingliteSecurity.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PaintingliteSecurity.m; sourceTree = "<group>"; };
9682
689E0678247EACD000D6DF95 /* PaintingliteDataBaseOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaintingliteDataBaseOptions.h; sourceTree = "<group>"; };
9783
689E0679247EACD000D6DF95 /* PaintingliteDataBaseOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PaintingliteDataBaseOptions.m; sourceTree = "<group>"; };
98-
689F248C248CD1AF00A9DC3B /* SSZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSZipArchive.h; sourceTree = "<group>"; };
99-
689F248E248CD1AF00A9DC3B /* SSZipCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSZipCommon.h; sourceTree = "<group>"; };
100-
689F248F248CD1AF00A9DC3B /* ZipArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipArchive.h; sourceTree = "<group>"; };
101-
689F2491248CD1B000A9DC3B /* unzip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = unzip.m; sourceTree = "<group>"; };
102-
689F2492248CD1B000A9DC3B /* zip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = zip.m; sourceTree = "<group>"; };
103-
689F2493248CD1B000A9DC3B /* ioapi.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ioapi.m; sourceTree = "<group>"; };
104-
689F2494248CD1B000A9DC3B /* mztools.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = mztools.m; sourceTree = "<group>"; };
105-
689F2495248CD1B000A9DC3B /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
106-
689F2496248CD1B000A9DC3B /* zip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
107-
689F2497248CD1B000A9DC3B /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
108-
689F2498248CD1B000A9DC3B /* mztools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mztools.h; sourceTree = "<group>"; };
109-
689F2499248CD1B000A9DC3B /* ioapi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ioapi.h; sourceTree = "<group>"; };
110-
689F249B248CD1B000A9DC3B /* aeskey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = aeskey.m; sourceTree = "<group>"; };
111-
689F249C248CD1B000A9DC3B /* prng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prng.h; sourceTree = "<group>"; };
112-
689F249D248CD1B000A9DC3B /* hmac.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = hmac.m; sourceTree = "<group>"; };
113-
689F249E248CD1B000A9DC3B /* aestab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aestab.h; sourceTree = "<group>"; };
114-
689F249F248CD1B000A9DC3B /* pwd2key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pwd2key.h; sourceTree = "<group>"; };
115-
689F24A0248CD1B000A9DC3B /* aescrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = aescrypt.m; sourceTree = "<group>"; };
116-
689F24A1248CD1B000A9DC3B /* fileenc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = fileenc.m; sourceTree = "<group>"; };
117-
689F24A2248CD1B000A9DC3B /* aesopt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aesopt.h; sourceTree = "<group>"; };
118-
689F24A3248CD1B000A9DC3B /* aes_via_ace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes_via_ace.h; sourceTree = "<group>"; };
119-
689F24A4248CD1B000A9DC3B /* sha1.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = sha1.m; sourceTree = "<group>"; };
120-
689F24A5248CD1B000A9DC3B /* brg_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = brg_types.h; sourceTree = "<group>"; };
121-
689F24A6248CD1B000A9DC3B /* entropy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entropy.h; sourceTree = "<group>"; };
122-
689F24A7248CD1B000A9DC3B /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = "<group>"; };
123-
689F24A8248CD1B000A9DC3B /* brg_endian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = brg_endian.h; sourceTree = "<group>"; };
124-
689F24A9248CD1B000A9DC3B /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
125-
689F24AA248CD1B000A9DC3B /* prng.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = prng.m; sourceTree = "<group>"; };
126-
689F24AB248CD1B000A9DC3B /* pwd2key.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = pwd2key.m; sourceTree = "<group>"; };
127-
689F24AC248CD1B000A9DC3B /* aestab.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = aestab.m; sourceTree = "<group>"; };
128-
689F24AD248CD1B000A9DC3B /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; };
129-
689F24AE248CD1B000A9DC3B /* fileenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileenc.h; sourceTree = "<group>"; };
130-
689F24AF248CD1B000A9DC3B /* entropy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = entropy.m; sourceTree = "<group>"; };
131-
689F24B0248CD1B000A9DC3B /* SSZipArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSZipArchive.m; sourceTree = "<group>"; };
13284
68A1F056247F9CBF0091EAFB /* PaintingliteExec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaintingliteExec.h; sourceTree = "<group>"; };
13385
68A1F057247F9CBF0091EAFB /* PaintingliteExec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PaintingliteExec.m; sourceTree = "<group>"; };
13486
68B84A9E2497B9410021CFC2 /* PaintingliteSplitTable.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaintingliteSplitTable.h; sourceTree = "<group>"; };
@@ -208,63 +160,6 @@
208160
/* End PBXFrameworksBuildPhase section */
209161

210162
/* Begin PBXGroup section */
211-
689F248A248CD14600A9DC3B /* SSZipArchive */ = {
212-
isa = PBXGroup;
213-
children = (
214-
689F249A248CD1B000A9DC3B /* aes */,
215-
689F2490248CD1B000A9DC3B /* minizip */,
216-
689F248C248CD1AF00A9DC3B /* SSZipArchive.h */,
217-
689F24B0248CD1B000A9DC3B /* SSZipArchive.m */,
218-
689F248E248CD1AF00A9DC3B /* SSZipCommon.h */,
219-
689F248F248CD1AF00A9DC3B /* ZipArchive.h */,
220-
);
221-
path = SSZipArchive;
222-
sourceTree = "<group>";
223-
};
224-
689F2490248CD1B000A9DC3B /* minizip */ = {
225-
isa = PBXGroup;
226-
children = (
227-
689F2491248CD1B000A9DC3B /* unzip.m */,
228-
689F2492248CD1B000A9DC3B /* zip.m */,
229-
689F2493248CD1B000A9DC3B /* ioapi.m */,
230-
689F2494248CD1B000A9DC3B /* mztools.m */,
231-
689F2495248CD1B000A9DC3B /* crypt.h */,
232-
689F2496248CD1B000A9DC3B /* zip.h */,
233-
689F2497248CD1B000A9DC3B /* unzip.h */,
234-
689F2498248CD1B000A9DC3B /* mztools.h */,
235-
689F2499248CD1B000A9DC3B /* ioapi.h */,
236-
);
237-
path = minizip;
238-
sourceTree = "<group>";
239-
};
240-
689F249A248CD1B000A9DC3B /* aes */ = {
241-
isa = PBXGroup;
242-
children = (
243-
689F249B248CD1B000A9DC3B /* aeskey.m */,
244-
689F249C248CD1B000A9DC3B /* prng.h */,
245-
689F249D248CD1B000A9DC3B /* hmac.m */,
246-
689F249E248CD1B000A9DC3B /* aestab.h */,
247-
689F249F248CD1B000A9DC3B /* pwd2key.h */,
248-
689F24A0248CD1B000A9DC3B /* aescrypt.m */,
249-
689F24A1248CD1B000A9DC3B /* fileenc.m */,
250-
689F24A2248CD1B000A9DC3B /* aesopt.h */,
251-
689F24A3248CD1B000A9DC3B /* aes_via_ace.h */,
252-
689F24A4248CD1B000A9DC3B /* sha1.m */,
253-
689F24A5248CD1B000A9DC3B /* brg_types.h */,
254-
689F24A6248CD1B000A9DC3B /* entropy.h */,
255-
689F24A7248CD1B000A9DC3B /* hmac.h */,
256-
689F24A8248CD1B000A9DC3B /* brg_endian.h */,
257-
689F24A9248CD1B000A9DC3B /* aes.h */,
258-
689F24AA248CD1B000A9DC3B /* prng.m */,
259-
689F24AB248CD1B000A9DC3B /* pwd2key.m */,
260-
689F24AC248CD1B000A9DC3B /* aestab.m */,
261-
689F24AD248CD1B000A9DC3B /* sha1.h */,
262-
689F24AE248CD1B000A9DC3B /* fileenc.h */,
263-
689F24AF248CD1B000A9DC3B /* entropy.m */,
264-
);
265-
path = aes;
266-
sourceTree = "<group>";
267-
};
268163
68DE9918247C9B6A0078EDD5 = {
269164
isa = PBXGroup;
270165
children = (
@@ -324,7 +219,6 @@
324219
68DE9956247C9B9F0078EDD5 /* Paintinglite */ = {
325220
isa = PBXGroup;
326221
children = (
327-
689F248A248CD14600A9DC3B /* SSZipArchive */,
328222
68DE9957247C9C260078EDD5 /* PaintingliteSessionManager.h */,
329223
68DE9958247C9C260078EDD5 /* PaintingliteSessionManager.m */,
330224
6888B26A24B9BF61003345D9 /* PaintingliteFileManager.h */,
@@ -524,44 +418,30 @@
524418
files = (
525419
68DE9929247C9B6A0078EDD5 /* ViewController.m in Sources */,
526420
68EDCA84248747E200031B41 /* PaintingliteIntellegenceSelect.m in Sources */,
527-
689F24B7248CD1B100A9DC3B /* aeskey.m in Sources */,
528421
68275F0A2489392F008DE2A9 /* PaintingliteSnapManager.m in Sources */,
529422
68DE9934247C9B6C0078EDD5 /* main.m in Sources */,
530423
68D7BB60247FE56500AB994A /* PaintingliteObjRuntimeProperty.m in Sources */,
531424
68CF58A42484D36C0035F188 /* PaintingliteTableOptionsSelect.m in Sources */,
532425
68D6B434248DFB32008A2CD6 /* PaintingliteAggregateFunc.m in Sources */,
533426
68DE9965247CA2490078EDD5 /* PaintingliteConfiguration.m in Sources */,
534-
689F24BB248CD1B100A9DC3B /* sha1.m in Sources */,
535427
68DE9968247CA5870078EDD5 /* PaintingliteSessionError.m in Sources */,
536428
68CF869D24809DC000755126 /* PaintingliteException.m in Sources */,
537429
68DE9959247C9C260078EDD5 /* PaintingliteSessionManager.m in Sources */,
538430
6879F980248E66F300E66ABB /* PaintingliteCascadeShowerIUD.m in Sources */,
539-
689F24B3248CD1B100A9DC3B /* unzip.m in Sources */,
540431
6800074E2488D19000FF75DE /* PaintingliteCUDOptions.m in Sources */,
541-
689F24B6248CD1B100A9DC3B /* mztools.m in Sources */,
542432
68DE9926247C9B6A0078EDD5 /* AppDelegate.m in Sources */,
543433
68DE996B247D0B680078EDD5 /* PaintingliteLog.m in Sources */,
544-
689F24BC248CD1B100A9DC3B /* prng.m in Sources */,
545434
689E067A247EACD000D6DF95 /* PaintingliteDataBaseOptions.m in Sources */,
546435
68D5030724A1E9E0004EC32D /* PaintinglitePressureOS.m in Sources */,
547-
689F24BE248CD1B100A9DC3B /* aestab.m in Sources */,
548-
689F24B4248CD1B100A9DC3B /* zip.m in Sources */,
549436
68DE9962247CA1140078EDD5 /* PaintingliteSessionFactory.m in Sources */,
550-
689F24BF248CD1B100A9DC3B /* entropy.m in Sources */,
551437
68EB381C249083FD00DFC0CA /* PaintingliteUUID.m in Sources */,
552-
689F24B9248CD1B100A9DC3B /* aescrypt.m in Sources */,
553438
6846BC102484DD5E00887A5C /* PaintingliteTableOptionsSelectPQL.m in Sources */,
554439
68C2F0A8248B8ECB007ADEB0 /* PaintingliteBackUpManager.m in Sources */,
555-
689F24B8248CD1B100A9DC3B /* hmac.m in Sources */,
556440
689E0677247EA79300D6DF95 /* PaintingliteSecurity.m in Sources */,
557441
6888B26C24B9BF61003345D9 /* PaintingliteFileManager.m in Sources */,
558-
689F24B5248CD1B100A9DC3B /* ioapi.m in Sources */,
559-
689F24BA248CD1B100A9DC3B /* fileenc.m in Sources */,
560442
68A1F058247F9CBF0091EAFB /* PaintingliteExec.m in Sources */,
561443
6888B26F24B9DBFA003345D9 /* PaintingliteCache.m in Sources */,
562-
689F24C0248CD1B100A9DC3B /* SSZipArchive.m in Sources */,
563444
68CE9DBF2483505E00B96DC3 /* PaintingliteTransaction.m in Sources */,
564-
689F24BD248CD1B100A9DC3B /* pwd2key.m in Sources */,
565445
680969332481007A00048369 /* PaintingliteTableOptions.m in Sources */,
566446
68B84AA02497B9410021CFC2 /* PaintingliteSplitTable.m in Sources */,
567447
);

‎Paintinglite/Paintinglite.xcodeproj/project.xcworkspace/xcuserdata/bryantreyn.xcuserdatad/UserInterfaceState.xcuserstate‎

19.2 KB
Binary file not shown.

‎Paintinglite/Paintinglite/Paintinglite/PaintingliteAggregateFunc.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ - (NSString *__nonnull)aggregateSQL:(PaintingliteAggregateType)type field:(NSStr
9090
return [NSString stringWithFormat:@"SELECT AVG(%@) FROM %@ %@",field,[tableName lowercaseString],condatation];
9191
}
9292

93-
return NULL;
93+
return [NSString string];
9494
}
9595

9696
#pragma mark - 统计个数

‎Paintinglite/Paintinglite/Paintinglite/PaintingliteBackUpManager.h‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,17 @@ NS_ASSUME_NONNULL_BEGIN
4141
*/
4242
- (Boolean)backupDataBaseWithName:(sqlite3 *)ppDb sqliteName:(NSString *)sqliteName type:(PaintingliteBackUpManagerDBType)type completeHandler:(void(^ __nullable)(NSString *saveFilePath))completeHandler;
4343

44+
/**
45+
* 根据表名称数组备份
46+
* tableNameArray -- 表名数组
47+
* ppDb -- 数据库ppDb
48+
*/
49+
- (Boolean)backupTableRowWithTableName:(NSMutableArray<NSString *> *__nonnull)tableNameArray ppDb:(sqlite3 *)ppDb;
50+
4451
/**
4552
* 回退一次表数据
4653
*/
47-
- (Boolean)backupTableValueForBeforeOpt:(sqlite3 *)ppDb tableName:(NSString *__nonnull)tableName completeHandler:(void(^ __nullable)(PaintingliteSessionError *sessionerror,Boolean success, NSMutableArray<id> *newList))completeHandler;
54+
- (Boolean)backupTableValueForBeforeOpt:(sqlite3 *)ppDb tableName:(NSString *__nonnull)tableName completeHandler:(void(^ __nullable)(PaintingliteSessionError *sessionerror,Boolean success, NSMutableArray<NSDictionary *> *newList))completeHandler;
4855

4956
@end
5057

0 commit comments

Comments
 (0)