抽取检测文件夹是否创建的方法，默认自动关闭数据库连接时间为15秒

Author: [email protected]

LKDBHelper/Helper/LKDBHelper.m

@@ -168,6 +168,7 @@ - (instancetype)initWithDBPath:(NSString *)filePath
                 self.threadLock = [[NSRecursiveLock alloc] init];
                 self.createdTableNames = [NSMutableArray array];
                 self.lastExecuteDBTime = [[NSDate date] timeIntervalSince1970];
+                self.autoCloseDBDelayTime = 15;
 
                 [self setDBPath:filePath];
                 [LKDBHelper dbHelperWithPath:nil save:self];
@@ -199,68 +200,43 @@ - (void)setDBName:(NSString *)dbName
 
 - (void)setDBPath:(NSString *)filePath
 {
+    [self.threadLock lock];
     if (self.bindingQueue && [self.dbPath isEqualToString:filePath]) {
-        return;
-    }
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    // 创建数据库目录
-    NSRange lastComponent = [filePath rangeOfString:@"/" options:NSBackwardsSearch];
-
-    if (lastComponent.length > 0) {
-        NSString *dirPath = [filePath substringToIndex:lastComponent.location];
-        BOOL isDir = NO;
-        BOOL isCreated = [fileManager fileExistsAtPath:dirPath isDirectory:&isDir];
-
-        if ((isCreated == NO) || (isDir == NO)) {
-            NSError *error = nil;
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
-            NSDictionary *attributes = @{NSFileProtectionKey: NSFileProtectionNone};
-#else
-            NSDictionary *attributes = nil;
-#endif
-            BOOL success = [fileManager createDirectoryAtPath:dirPath
-                                  withIntermediateDirectories:YES
-                                                   attributes:attributes
-                                                        error:&error];
-            if (success == NO) {
-                LKErrorLog(@"create dir error: %@", error.debugDescription);
-            }
-        } else {
-/**
-             *  @brief  Disk I/O error when device is locked
-             *          https://github.com/ccgus/fmdb/issues/262
-             */
-#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
-            [fileManager setAttributes:@{ NSFileProtectionKey: NSFileProtectionNone }
-                          ofItemAtPath:dirPath
-                                 error:nil];
-#endif
-        }
+        LKErrorLog(@"current dbPath isEqual filePath :%@", filePath);
+    } else {
+        // reset encryptionKey
+        _encryptionKey = nil;
+        // set db path
+        self.dbPath = filePath;
+        [self openDB];
     }
+    [self.threadLock unlock];
+}
 
-    [self.threadLock lock];
-
-    self.dbPath = filePath;
+- (void)openDB {
+    /// 重置所有配置
     [self.bindingQueue close];
     [self.createdTableNames removeAllObjects];
 
+    NSString *filePath = self.dbPath;
+    BOOL hasCreated = [LKDBUtils createDirectoryWithFilePath:filePath];
+    if (!hasCreated) {
+        /// 数据库目录创建失败
+        return;
+    }
+    
     self.bindingQueue = [[FMDatabaseQueue alloc] initWithPath:filePath
                                                         flags:LKDBOpenFlags];
-
-    ///reset encryptionKey
-    _encryptionKey = nil;
-
     [self.bindingQueue inDatabase:^(FMDatabase *db) {
         db.logsErrors = LKDBLogErrorEnable;
     }];
 
 #ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+    NSFileManager *fileManager = [NSFileManager defaultManager];
     if ([fileManager fileExistsAtPath:filePath]) {
         [fileManager setAttributes:@{ NSFileProtectionKey: NSFileProtectionNone } ofItemAtPath:filePath error:nil];
     }
 #endif
-    
-    [self.threadLock unlock];
 }
 
 - (void)closeDB {
@@ -283,15 +259,12 @@ - (void)executeDB:(void (^)(FMDatabase *db))block
         block(self.usingdb);
     } else {
         if (self.bindingQueue == nil) {
-            [self.createdTableNames removeAllObjects];
-            self.bindingQueue = [[FMDatabaseQueue alloc] initWithPath:self.dbPath
-                                                                flags:LKDBOpenFlags];
-            [self.bindingQueue inDatabase:^(FMDatabase *db) {
-                db.logsErrors = LKDBLogErrorEnable;
-                if (_encryptionKey.length > 0) {
+            [self openDB];
+            if (_encryptionKey.length > 0) {
+                [self.bindingQueue inDatabase:^(FMDatabase *db) {
                     [db setKey:_encryptionKey];
-                }
-            }];
+                }];
+            }
         }
         [self.bindingQueue inDatabase:^(FMDatabase *db) {
             self.usingdb = db;
@@ -339,7 +312,8 @@ - (void)startAutoCloseTimer {
 
 - (BOOL)autoCloseDBConnection {
     NSInteger now = [[NSDate date] timeIntervalSince1970];
-    if (now - self.lastExecuteDBTime > 5) {
+    /// 如果10秒没有操作 则关闭数据库链接
+    if (now - self.lastExecuteDBTime > 10) {
         [self closeDB];
         return YES;
     }
@@ -395,7 +369,7 @@ - (void)executeForTransaction:(BOOL (^)(LKDBHelper *))block
     LKDBHelper *helper = self;
 
     [self executeDB:^(FMDatabase *db) {
-        BOOL inTransacttion = db.inTransaction;
+        BOOL inTransacttion = db.isInTransaction;
 
         if (!inTransacttion) {
             [db beginTransaction];

LKDBHelper/Helper/LKDBUtils.h

@@ -11,6 +11,10 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface LKDBUtils : NSObject
+
+// 创建文件路径所需要的文件夹
++ (BOOL)createDirectoryWithFilePath:(NSString *)filePath;
+
 ///返回根目录路径 "document"
 + (NSString *)getDocumentPath;
 ///返回 "document/dir/" 文件夹路径

LKDBHelper/Helper/LKDBUtils.m

@@ -71,6 +71,56 @@ - (NSNumber *)numberFromString:(NSString *)string
 @end
 
 @implementation LKDBUtils
+
++ (BOOL)createDirectoryWithFilePath:(NSString *)filePath
+{
+    NSString *dirPath = filePath.stringByDeletingLastPathComponent;
+    if (!dirPath) {
+        return NO;
+    }
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    
+    BOOL isDir = NO;
+    BOOL isCreated = [fileManager fileExistsAtPath:dirPath isDirectory:&isDir];
+    
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+    NSDictionary *attributes = @{NSFileProtectionKey: NSFileProtectionNone};
+#else
+    NSDictionary *attributes = nil;
+#endif
+    
+    if (!isCreated || !isDir) {
+        NSError *error = nil;
+        BOOL success = [fileManager createDirectoryAtPath:dirPath
+                              withIntermediateDirectories:YES
+                                               attributes:attributes
+                                                    error:&error];
+        if (!success) {
+            LKErrorLog(@"create dir error: %@", error.debugDescription);
+            /// 下个主线程继续尝试次
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [fileManager createDirectoryAtPath:dirPath
+                       withIntermediateDirectories:YES
+                                        attributes:attributes
+                                             error:nil];
+            });
+        }
+        return success;
+    } else {
+        /**
+         *  @brief  Disk I/O error when device is locked
+         *          https://github.com/ccgus/fmdb/issues/262
+         */
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+        [fileManager setAttributes:attributes
+                      ofItemAtPath:dirPath
+                             error:nil];
+#endif
+        return YES;
+    }
+}
+
 + (NSString *)getDocumentPath
 {
 #ifdef __IPHONE_OS_VERSION_MIN_REQUIRED