Skip to content
This repository was archived by the owner on Sep 1, 2019. It is now read-only.

Removed files in “.Trash/” from visualizations #23

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion LocalStorage/Local Storage/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ struct LocalizedTypeNames {
static var code = NSLocalizedString("type-code", value: "Code", comment: "Name of type")
static var archives = NSLocalizedString("type-archives", value: "Archives", comment: "Name of type")
static var other = NSLocalizedString("type-other", value: "Other", comment: "Name of type")
static var trash = NSLocalizedString("type-trash", value: "Trash", comment: "Name of type")
}


Expand All @@ -229,7 +230,8 @@ struct AppState {
TypeInfo(name: LocalizedTypeNames.images, color: UIColor(named: "ColorTypeImages")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.code, color: UIColor(named: "ColorTypeCode")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.archives, color: UIColor(named: "ColorTypeArchives")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.other, color: UIColor(named: "ColorTypeOther")!, size: 0, number: 0, paths: [], sizes: [])
TypeInfo(name: LocalizedTypeNames.other, color: UIColor(named: "ColorTypeOther")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.trash, color: UIColor.magenta, size: 0, number: 0, paths: [], sizes: [])
]

struct files {
Expand Down
35 changes: 23 additions & 12 deletions LocalStorage/Local Storage/Common.swift
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,9 @@ func resetStats() {
TypeInfo(name: LocalizedTypeNames.images, color: UIColor(named: "ColorTypeImages")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.code, color: UIColor(named: "ColorTypeCode")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.archives, color: UIColor(named: "ColorTypeArchives")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.other, color: UIColor(named: "ColorTypeOther")!, size: 0, number: 0, paths: [], sizes: [])]
TypeInfo(name: LocalizedTypeNames.other, color: UIColor(named: "ColorTypeOther")!, size: 0, number: 0, paths: [], sizes: []),
TypeInfo(name: LocalizedTypeNames.trash, color: UIColor.magenta, size: 0, number: 0, paths: [], sizes: [])
]

AppState.files.allValues = []
AppState.files.fileInfos = []
Expand All @@ -254,14 +256,21 @@ func addToType(name: String, size: Int64, path: String) {
let documentsPathEndIndex = path.index(AppState.documentsPath.endIndex, offsetBy: 1)
let filePath = String(path[documentsPathEndIndex...])

AppState.types[n].size += size
AppState.types[n].number += 1
AppState.types[n].paths.append(filePath)
AppState.types[n].sizes.append(size)

AppState.files.allValues.append(Double(size))
AppState.files.fileInfos.append(FileInfo(name: filePath, type: type_info.name))

if !filePath.contains(".Trash/") {
AppState.types[n].size += size
AppState.types[n].number += 1
AppState.types[n].paths.append(filePath)
AppState.types[n].sizes.append(size)

AppState.files.allValues.append(Double(size))
AppState.files.fileInfos.append(FileInfo(name: filePath, type: type_info.name))
} else {
AppState.types[n].size += size
AppState.types[n].number += 1
AppState.types[n].paths.append(filePath)
AppState.types[n].sizes.append(size)
}

break
}
}
Expand Down Expand Up @@ -368,7 +377,9 @@ func getStats() {
}

if let fileType: String = elementURL.typeIdentifier {
if UtiLookup.audio.contains(fileType) {
if elementURL.absoluteString.contains(".Trash/") {
addToType(name: LocalizedTypeNames.trash, size: fileSize, path: elementURL.path)
} else if UtiLookup.audio.contains(fileType) {
addToType(name: LocalizedTypeNames.audio, size: fileSize, path: elementURL.path)
} else if UtiLookup.videos.contains(fileType) {
addToType(name: LocalizedTypeNames.videos, size: fileSize, path: elementURL.path)
Expand All @@ -382,7 +393,7 @@ func getStats() {
addToType(name: LocalizedTypeNames.archives, size: fileSize, path: elementURL.path)
} else if UtiLookup.other.contains(fileType) {
addToType(name: LocalizedTypeNames.other, size: fileSize, path: elementURL.path)
} else {
} else {
if fileType.starts(with: "dyn.") {
// No UTI available for this file, use extension based lookup. Less stable but whatever.

Expand All @@ -400,7 +411,7 @@ func getStats() {
addToType(name: LocalizedTypeNames.code, size: fileSize, path: elementURL.path)
} else if FileExtensionLookup.archives.contains(fileExtension) {
addToType(name: LocalizedTypeNames.archives, size: fileSize, path: elementURL.path)
} else {
} else if elementURL.absoluteString.contains(".Trash/") {
addToType(name: LocalizedTypeNames.other, size: fileSize, path: elementURL.path)
}
} else {
Expand Down
Loading