Skip to content

Commit

Permalink
Fix backup
Browse files Browse the repository at this point in the history
  • Loading branch information
nekohasekai committed Sep 20, 2020
1 parent 6c58ee6 commit 664f4d6
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
30 changes: 17 additions & 13 deletions bot/src/main/java/io/nekohasekai/pm/TdPmBot.kt
Expand Up @@ -162,18 +162,20 @@ open class TdPmBot(tag: String = "main", name: String = "TdPmBot") : TdCli(tag,

var backupTo: File

backupTo = File(value?.replace("\$id",tag
backupTo = File(value?.replace("\$id", tag
.replace(" ", " ")
.replace(" ", "-")
.replace("_", "-")) ?: ".")

if (backupTo.isDirectory) {

@Suppress("SpellCheckingInspection")
backupTo = File(backupTo, "td-pm-${tag
.replace(" ", " ")
.replace(" ", "-")
.replace("_", "-")}-backup-${DateUtil.format(Date(), "yyyyMMdd-HHmmss")}.tar.xz")
backupTo = File(backupTo, "td-pm-${
tag
.replace(" ", " ")
.replace(" ", "-")
.replace("_", "-")
}-backup-${DateUtil.format(Date(), "yyyyMMdd-HHmmss")}.tar.xz")

} else if (!backupTo.name.endsWith(".tar.xz")) {

Expand All @@ -187,29 +189,31 @@ open class TdPmBot(tag: String = "main", name: String = "TdPmBot") : TdCli(tag,

val output = FileUtil.touch(backupTo).tarXz()

output.writeFile("pm.conf")
output.writeFile("pm.yml", configFile)

// 数据目录

output.writeDirectories(File(options.databaseDirectory))
output.writeDirectory("data/")

// 数据库

output.writeFile("${options.databaseDirectory}/pm_data.db")
val originDatabaseDirectory = File(options.databaseDirectory)

output.writeFile("${options.databaseDirectory}/td.binlog")
output.writeFile("data/pm_data.db", File(originDatabaseDirectory, "pm_data.db"))

val pmBots = File("${options.databaseDirectory}/pm").listFiles()
output.writeFile("data/td.binlog", File(originDatabaseDirectory, "td.binlog"))

val pmBots = File(originDatabaseDirectory, "pm").listFiles()

if (!pmBots.isNullOrEmpty()) {

output.writeDirectory("${options.databaseDirectory}/pm/")
output.writeDirectory("data/pm/")

pmBots.forEach {

output.writeDirectory("${options.databaseDirectory}/pm/${it.name}/")
output.writeDirectory("data/pm/${it.name}/")

output.writeFile("${options.databaseDirectory}/pm/${it.name}/td.binlog")
output.writeFile("data/pm/${it.name}/td.binlog", File(it, "td.binlog"))

}

Expand Down
2 changes: 1 addition & 1 deletion ktlib
Submodule ktlib updated from bafdcf to 62da8a

0 comments on commit 664f4d6

Please sign in to comment.