add delete logs method

fix methods style add Constance object
aabolfazl · Mar 6, 2022 · 9c6e9a0 · 9c6e9a0
1 parent 339c91d
commit 9c6e9a0
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 28 deletions.
diff --git a/filelogger/src/main/java/abbasi/android/filelogger/FileLogger.kt b/filelogger/src/main/java/abbasi/android/filelogger/FileLogger.kt
@@ -17,7 +17,7 @@ object FileLogger {
     private var initialized = false
     private var isEnable: Boolean = true
 
-    private lateinit var config: Config
+    private var config: Config? = null
     private var fileWriter: FileWriter? = null
     private var logQueue: ThreadQueue = ThreadQueue()
 
@@ -31,41 +31,53 @@ object FileLogger {
         initialized = true
     }
 
-    fun i(tag: String? = config.defaultTag, msg: String) = checkBlock {
-        if (config.logcatEnable) {
+    fun i(tag: String? = config?.defaultTag, msg: String) = checkBlock {
+        if (config?.logcatEnable == true) {
             Log.i(tag, msg)
         }
 
         postLog(LogLevel.Info, tag, msg)
     }
 
-    fun e(tag: String? = config.defaultTag, msg: String, throwable: Throwable? = null) =
-        checkBlock {
-            if (config.logcatEnable) {
-                Log.e(tag, msg, throwable)
-            }
-
-            postLog(logLevel = LogLevel.Error, tag = tag, msg = msg, throwable = throwable)
+    fun e(
+        tag: String? = config?.defaultTag,
+        msg: String,
+        throwable: Throwable? = null
+    ) = checkBlock {
+        if (config?.logcatEnable == true) {
+            Log.e(tag, msg, throwable)
         }
 
-    fun e(tag: String? = config.defaultTag, throwable: Throwable) = checkBlock {
-        if (config.logcatEnable) {
+        postLog(logLevel = LogLevel.Error, tag = tag, msg = msg, throwable = throwable)
+    }
+
+    fun e(
+        tag: String? = config?.defaultTag,
+        throwable: Throwable
+    ) = checkBlock {
+        if (config?.logcatEnable == true) {
             Log.e(tag, "", throwable)
         }
 
         postLog(logLevel = LogLevel.Error, tag = tag, throwable = throwable)
     }
 
-    fun w(tag: String? = config.defaultTag, msg: String) = checkBlock {
-        if (config.logcatEnable) {
+    fun w(
+        tag: String? = config?.defaultTag,
+        msg: String
+    ) = checkBlock {
+        if (config?.logcatEnable == true) {
             Log.w(tag, msg)
         }
 
         postLog(logLevel = LogLevel.Warning, tag = tag, msg = msg)
     }
 
-    fun d(tag: String? = config.defaultTag, msg: String) = checkBlock {
-        if (config.logcatEnable) {
+    fun d(
+        tag: String? = config?.defaultTag,
+        msg: String
+    ) = checkBlock {
+        if (config?.logcatEnable == true) {
             Log.d(tag, msg)
         }
 
@@ -74,7 +86,7 @@ object FileLogger {
 
     private fun postLog(
         logLevel: LogLevel,
-        tag: String? = config.defaultTag,
+        tag: String? = config?.defaultTag,
         msg: String? = "",
         throwable: Throwable? = null
     ) = fileWriter?.let { writer ->
@@ -95,6 +107,11 @@ object FileLogger {
         this.isEnable = isEnable
     }
 
+    fun deleteFiles() = checkBlock {
+        i(msg = "FileLogger delete files called")
+        fileWriter?.deleteLogsDir()
+    }
+
     private fun checkBlock(block: () -> Unit) {
         if (initialized && isEnable) {
             block()
@@ -103,8 +120,6 @@ object FileLogger {
                 javaClass.simpleName,
                 "SDK not initialized maybe forgot call FileLogger.init(config: Config)"
             )
-        } else {
-            Log.e(javaClass.simpleName, "SDK not enable!")
         }
     }
 }
diff --git a/filelogger/src/main/java/abbasi/android/filelogger/config/Config.kt b/filelogger/src/main/java/abbasi/android/filelogger/config/Config.kt
@@ -6,6 +6,10 @@
 
 package abbasi.android.filelogger.config
 
+import abbasi.android.filelogger.config.Constance.Companion.DEFAULT_PATTERN
+import abbasi.android.filelogger.config.Constance.Companion.DEFAULT_TAG
+import abbasi.android.filelogger.config.Constance.Companion.LOGCAT_ENABLE
+
 class Config private constructor(
     val directory: String,
     val defaultTag: String,
@@ -14,9 +18,9 @@ class Config private constructor(
 ) {
 
     class Builder(private val directory: String) {
-        private var defaultTag: String = "FileLogger"
-        private var logcatEnable: Boolean = true
-        private var dataFormatterPattern: String = "dd-MM-yyyy-HH:mm:ss"
+        private var defaultTag: String = DEFAULT_TAG
+        private var logcatEnable: Boolean = LOGCAT_ENABLE
+        private var dataFormatterPattern: String = DEFAULT_PATTERN
 
         fun setDefaultTag(defaultTag: String) = apply { this.defaultTag = defaultTag }
         fun setLogcatEnable(logcatEnable: Boolean) = apply { this.logcatEnable = logcatEnable }
@@ -26,7 +30,7 @@ class Config private constructor(
                 .trim()
 
             if (pattern.isEmpty().or(pattern.contains("/"))) {
-                this.dataFormatterPattern = "dd-MM-yyyy-HH:mm:ss"
+                this.dataFormatterPattern = DEFAULT_PATTERN
             }
         }
 

diff --git a/filelogger/src/main/java/abbasi/android/filelogger/config/Constance.kt b/filelogger/src/main/java/abbasi/android/filelogger/config/Constance.kt
@@ -0,0 +1,16 @@
+/*
+*
+* Copyright (c) 2022 Abolfazl Abbasi
+*
+* */
+
+package abbasi.android.filelogger.config
+
+class Constance {
+    companion object {
+        const val DIRECTORY = "/fileLogs"
+        const val DEFAULT_TAG = "FileLogger"
+        const val DEFAULT_PATTERN = "dd-MM-yyyy-HH:mm:ss"
+        const val LOGCAT_ENABLE = true
+    }
+}
diff --git a/filelogger/src/main/java/abbasi/android/filelogger/file/FileWriter.kt b/filelogger/src/main/java/abbasi/android/filelogger/file/FileWriter.kt
@@ -6,6 +6,7 @@
 
 package abbasi.android.filelogger.file
 
+import abbasi.android.filelogger.config.Constance.Companion.DIRECTORY
 import abbasi.android.filelogger.time.FastDateFormat
 import android.util.Log
 import java.io.File
@@ -14,7 +15,7 @@ import java.io.OutputStreamWriter
 import java.util.*
 
 internal class FileWriter(
-    directory: String, dataFormatterPattern: String
+    private val directory: String, dataFormatterPattern: String
 ) {
     private var streamWriter: OutputStreamWriter? = null
     private var dateFormat: FastDateFormat? = null
@@ -24,13 +25,12 @@ internal class FileWriter(
         dateFormat = FastDateFormat.getInstance(dataFormatterPattern, Locale.US)
         try {
             val file = File(directory)
-            val logDir = File(file.absolutePath + "/fileLogs")
+            val logDir = File(file.absolutePath + DIRECTORY)
             if (logDir.exists().not()) {
                 logDir.mkdirs()
             }
 
-            logFile =
-                File(logDir, dateFormat?.format(System.currentTimeMillis()).toString() + ".txt")
+            logFile = File(logDir, "${dateFormat?.format(System.currentTimeMillis())}.txt")
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -58,7 +58,14 @@ internal class FileWriter(
         }
     }
 
-    fun deleteCurrentFile() {
+    fun deleteLogsDir() {
+        val currentFile = File(directory)
+        val logDir = File(currentFile.absolutePath + DIRECTORY)
 
+        logDir.listFiles()?.filter {
+            it.absolutePath != logFile?.absolutePath
+        }?.forEach {
+            it.delete()
+        }
     }
 }