Skip to content

Commit

Permalink
Merge pull request #442 from dashpay/feature/swift-format
Browse files Browse the repository at this point in the history
chore: Format swift code
  • Loading branch information
pankcuf authored Nov 28, 2022
2 parents bd6383e + ef7bf45 commit e0ec9af
Show file tree
Hide file tree
Showing 67 changed files with 2,477 additions and 2,139 deletions.
114 changes: 84 additions & 30 deletions .swiftformat
Original file line number Diff line number Diff line change
@@ -1,34 +1,88 @@
# format options
# options
--swiftversion 5.7
--self remove # redundantSelf
--importgrouping testable-bottom # sortedImports
--commas always # trailingCommas
--trimwhitespace always # trailingSpace
--indent 4 #indent
--ifdef no-indent #indent
--indentstrings true #indent

--allman false
--binarygrouping 4,8
--commas always
--comments indent
--decimalgrouping 3,6
--elseposition next-line
--empty void
--exponentcase lowercase
--exponentgrouping disabled
--fractiongrouping disabled
--header ignore
--hexgrouping 4,8
--hexliteralcase uppercase
--ifdef indent
--indent 4
--indentcase false
--importgrouping testable-bottom
--linebreaks lf
--octalgrouping 4,8
--operatorfunc spaced
--patternlet hoist
--ranges spaced
--self remove
--semicolons never
--trimwhitespace always
--wraparguments preserve
--wrapcollections preserve
--wraparguments after-first # wrapArguments
--wrapparameters after-first # wrapArguments
--wrapcollections before-first # wrapArguments
--wrapconditions after-first # wrapArguments
--wrapreturntype if-multiline #wrapArguments
--closingparen same-line # wrapArguments
--wraptypealiases before-first # wrapArguments
--funcattributes same-line # wrapAttributes
--typeattributes prev-line # wrapAttributes
--wrapternary before-operators # wraprations
--extensionacl on-declarations # extensionAccessControl
--patternlet inline # hoistPatternLet
--redundanttype inferred # redundantType
--typeblanklines preserve # blankLinesAtStartOfScope, blankLinesAtEndOfScope
--emptybraces spaced # emptyBraces
--someAny disabled # opaqueGenericParameters

# We recommend a max width of 100 but _strictly enforce_ a max width of 130
--maxwidth 130 # wrap
--maxwidth 130 # wrapArguments

--stripunusedargs closure-only #unusedArguments

# rules
--rules anyObjectProtocol
--rules blankLinesBetweenScopes
--rules consecutiveSpaces
--rules duplicateImports
--rules extensionAccessControl
--rules hoistPatternLet
--rules indent
--rules markTypes
--rules redundantParens
--rules redundantReturn
--rules redundantSelf
--rules redundantType
--rules redundantPattern
--rules redundantGet
--rules redundantFileprivate
--rules redundantRawValues
--rules sortedImports
--rules sortDeclarations
--rules strongifiedSelf
--rules trailingCommas
--rules trailingSpace
--rules typeSugar
--rules wrap
--rules wrapArguments
--rules wrapAttributes
--rules braces
--rules redundantClosure
--rules redundantInit
--rules redundantVoidReturnType
--rules redundantOptionalBinding
--rules unusedArguments
--rules spaceInsideBrackets
--rules spaceInsideBraces
--rules spaceAroundBraces
--rules spaceInsideParens
--rules spaceAroundParens
--rules enumNamespaces
--rules blockComments
--rules spaceAroundComments
--rules spaceInsideComments
--rules blankLinesAtStartOfScope
--rules blankLinesAtEndOfScope
--rules emptyBraces
--rules opaqueGenericParameters
--rules genericExtensions
--rules trailingClosures


--disable andOperator,unusedArguments
--enable isEmpty
--rules anyObjectProtocol
--rules assertionFailures
--rules blankLineAfterImports
--rules isEmpty
--rules leadingDelimiters
--rules wrapEnumCases
2 changes: 1 addition & 1 deletion DashWallet/Sources/Categories/FileManager+DashWallet.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// Created by Pavel Tikhonenko
// Copyright © 2022 Dash Core Group. All rights reserved.
//
Expand Down
6 changes: 3 additions & 3 deletions DashWallet/Sources/Categories/Foundation+Bitcoin.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// Created by Pavel Tikhonenko
// Copyright © 2022 Dash Core Group. All rights reserved.
//
Expand All @@ -22,9 +22,9 @@ extension Data {
let rawValue: Int
static let upperCase = HexEncodingOptions(rawValue: 1 << 0)
}

func hexEncodedString(options: HexEncodingOptions = []) -> String {
let format = options.contains(.upperCase) ? "%02hhX" : "%02hhx"
return self.map { String(format: format, $0) }.joined()
return map { String(format: format, $0) }.joined()
}
}
44 changes: 23 additions & 21 deletions DashWallet/Sources/Infrastructure/Database/DatabaseConnection.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//
//
// Created by Pavel Tikhonenko
// Copyright © 2022 Dash Core Group. All rights reserved.
//
Expand All @@ -19,65 +19,67 @@ import Foundation
import SQLite
import SQLiteMigrationManager

private let kDatabaseName: String = "store.db"
private let kDatabaseName = "store.db"

// MARK: - DatabaseConnection

@objc class DatabaseConnection: NSObject {
@objc
class DatabaseConnection: NSObject {
var db: Connection!
var migrationManager: SQLiteMigrationManager!

override init() {
print("SQLite: ", DatabaseConnection.storeURL().absoluteString)
do {
self.db = try Connection(DatabaseConnection.storeURL().absoluteString)
self.migrationManager = SQLiteMigrationManager(db: self.db,
migrations: DatabaseConnection.migrations(),
bundle: DatabaseConnection.migrationsBundle())
}catch{
db = try Connection(DatabaseConnection.storeURL().absoluteString)
migrationManager = SQLiteMigrationManager(db: db,
migrations: DatabaseConnection.migrations(),
bundle: DatabaseConnection.migrationsBundle())
} catch {
print("DatabaseConnection", error)

}

super.init()
}

@objc func migrateIfNeeded() throws {
if !migrationManager.hasMigrationsTable() {
try migrationManager.createMigrationsTable()
}

if migrationManager.needsMigration() {
try migrationManager.migrateDatabase()
}
}
@objc static let shared: DatabaseConnection = DatabaseConnection()

@objc static let shared = DatabaseConnection()
}

extension DatabaseConnection {

static func storeURL() -> URL {
let dirPaths = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)
let docsDir = dirPaths[0] as String

guard let documentsURL = URL(string: docsDir) else {
fatalError("could not get user documents directory URL")
}

return documentsURL.appendingPathComponent(kDatabaseName)
}

static func migrations() -> [Migration] {
return [ SeedDB() ]
[SeedDB()]
}

static func migrationsBundle() -> Bundle {
guard let bundleURL = Bundle.main.url(forResource: "Migrations", withExtension: "bundle") else {
fatalError("could not find migrations bundle")
}
guard let bundle = Bundle(url: bundleURL) else {
fatalError("could not load migrations bundle")
}

return bundle
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import Foundation
import SQLiteMigrationManager
import SQLite
import SQLiteMigrationManager

struct SeedDB: Migration {
var version: Int64 = 20220713105051
var version: Int64 = 20220713105051

func migrateDatabase(_ db: Connection) throws {
}
func migrateDatabase(_ db: Connection) throws { }
}
Loading

0 comments on commit e0ec9af

Please sign in to comment.