lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Polish the code about "about repository"

Browse source 
- Move something to PasswordStore.swift
This commit is contained in:
Yishi Lin 2017-03-24 22:05:09 +08:00
parent c1bdc152c5
commit a36bb13004
2 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pass/Controllers/AboutRepositoryTableViewController.swift
View file

@ -10,12 +10,12 @@ import UIKit
class AboutRepositoryTableViewController: BasicStaticTableViewController { class AboutRepositoryTableViewController: BasicStaticTableViewController {
var needRefresh = false private var needRefresh = false
var indicator: UIActivityIndicatorView = { private var indicator: UIActivityIndicatorView = {
let indicator = UIActivityIndicatorView(activityIndicatorStyle: .gray) let indicator = UIActivityIndicatorView(activityIndicatorStyle: .gray)
return indicator return indicator
}() }()
let passwordStore = PasswordStore.shared private let passwordStore = PasswordStore.shared
override func viewDidLoad() { override func viewDidLoad() {
navigationItemTitle = "About Repository" navigationItemTitle = "About Repository"
@ -49,31 +49,19 @@ class AboutRepositoryTableViewController: BasicStaticTableViewController {
DispatchQueue.global(qos: .userInitiated).async { DispatchQueue.global(qos: .userInitiated).async {
let numberFormatter = NumberFormatter() let numberFormatter = NumberFormatter()
numberFormatter.numberStyle = NumberFormatter.Style.decimal numberFormatter.numberStyle = NumberFormatter.Style.decimal
let fm = FileManager.default
let passwordEntities = self.passwordStore.fetchPasswordEntityCoreData(withDir: false) let numberOfPasswordsString = numberFormatter.string(from: NSNumber(value: self.passwordStore.numberOfPasswords))!
let numberOfPasswords = numberFormatter.string(from: NSNumber(value: passwordEntities.count))! let sizeOfRepositoryString = ByteCountFormatter.string(fromByteCount: Int64(self.passwordStore.sizeOfRepositoryByteCount), countStyle: ByteCountFormatter.CountStyle.file)
var size = UInt64(0)
do {
if fm.fileExists(atPath: self.passwordStore.storeURL.path) {
size = try fm.allocatedSizeOfDirectoryAtURL(directoryURL: self.passwordStore.storeURL)
}
} catch {
print(error)
}
let sizeOfRepository = ByteCountFormatter.string(fromByteCount: Int64(size), countStyle: ByteCountFormatter.CountStyle.file)
let numberOfCommits = self.passwordStore.storeRepository?.numberOfCommits(inCurrentBranch: NSErrorPointer(nilLiteral: ())) ?? 0 let numberOfCommits = self.passwordStore.storeRepository?.numberOfCommits(inCurrentBranch: NSErrorPointer(nilLiteral: ())) ?? 0
let numberOfCommitsString = numberFormatter.string(from: NSNumber(value: numberOfCommits))! let numberOfCommitsString = numberFormatter.string(from: NSNumber(value: numberOfCommits))!
DispatchQueue.main.async { [weak self] in DispatchQueue.main.async { [weak self] in
let type = UITableViewCellAccessoryType.none let type = UITableViewCellAccessoryType.none
self?.tableData = [ self?.tableData = [
// section 0 // section 0
[[.style: CellDataStyle.value1, .accessoryType: type, .title: "Passwords", .detailText: numberOfPasswords], [[.style: CellDataStyle.value1, .accessoryType: type, .title: "Passwords", .detailText: numberOfPasswordsString],
[.style: CellDataStyle.value1, .accessoryType: type, .title: "Size", .detailText: sizeOfRepository], [.style: CellDataStyle.value1, .accessoryType: type, .title: "Size", .detailText: sizeOfRepositoryString],
[.style: CellDataStyle.value1, .accessoryType: type, .title: "Local Commits", .detailText: String(self?.passwordStore.numberOfLocalCommits() ?? 0)], [.style: CellDataStyle.value1, .accessoryType: type, .title: "Local Commits", .detailText: String(self?.passwordStore.numberOfLocalCommits() ?? 0)],
[.style: CellDataStyle.value1, .accessoryType: type, .title: "Last Synced", .detailText: Utils.getLastUpdatedTimeString()], [.style: CellDataStyle.value1, .accessoryType: type, .title: "Last Synced", .detailText: Utils.getLastUpdatedTimeString()],
[.style: CellDataStyle.value1, .accessoryType: type, .title: "Commits", .detailText: numberOfCommitsString], [.style: CellDataStyle.value1, .accessoryType: type, .title: "Commits", .detailText: numberOfCommitsString],

17
pass/Models/PasswordStore.swift
View file

@ -137,6 +137,23 @@ class PasswordStore {
let context = (UIApplication.shared.delegate as! AppDelegate).persistentContainer.viewContext let context = (UIApplication.shared.delegate as! AppDelegate).persistentContainer.viewContext
var numberOfPasswords : Int {
return self.fetchPasswordEntityCoreData(withDir: false).count
}
var sizeOfRepositoryByteCount : UInt64 {
let fm = FileManager.default
var size = UInt64(0)
do {
if fm.fileExists(atPath: self.storeURL.path) {
size = try fm.allocatedSizeOfDirectoryAtURL(directoryURL: self.storeURL)
}
} catch {
print(error)
}
return size
}
private init() { private init() {
do { do {