Skip to content

Commit d80e6c3

Browse files
committed
[fix]: remove empty dirs
1 parent 94d654b commit d80e6c3

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

Sources/ScriptToolkit/FolderExtension.swift

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,12 @@ public extension Folder {
128128
}
129129
}
130130

131-
public func organizePhotos(inputDir: String) throws {
131+
public func organizePhotos() throws {
132132
print("📂 Organizing...")
133133

134-
let inputFolder = try Folder(path: inputDir)
135134
var folderRecords = [(Folder, [Int])]()
136135

137-
let sortedSubfolders = inputFolder
136+
let sortedSubfolders = self
138137
.subfolders
139138
.filter { !matches(for: "^\\d\\d\\d\\d-\\d\\d-\\d\\d.*$", in: $0.name).isEmpty }
140139
.sorted { $0.name < $1.name }
@@ -147,11 +146,11 @@ public extension Folder {
147146
folderRecords.append((dir, indexes))
148147
}
149148

150-
var originalFolders = inputFolder
149+
var originalFolders = self
151150
.subfolders
152151
.filter { matches(for: "^\\d\\d\\d\\d-\\d\\d-\\d\\d.*$", in: $0.name).isEmpty }
153152

154-
originalFolders.append(inputFolder)
153+
originalFolders.append(self)
155154

156155
for folder in originalFolders {
157156
for file in folder.makeFileSequence(recursive: true, includeHidden: true) {
@@ -163,14 +162,14 @@ public extension Folder {
163162
////////////////////////////////////////////////////////////////////////////////
164163
// MARK: - Remove Empty Directories
165164

166-
public func removeEmptyDirectories(in folder: Folder) throws {
167-
for subfolder in folder.subfolders {
168-
try removeEmptyDirectories(in: subfolder)
165+
public func removeEmptyDirectories() throws {
166+
for subfolder in subfolders {
167+
try subfolder.removeEmptyDirectories()
169168
}
170169

171-
if folder.subfolders.count == 0 && folder.files.count == 0 {
172-
print("removed: \(folder.path)")
173-
try folder.delete()
170+
if subfolders.count == 0 && files.count == 0 {
171+
print("removed: \(path)")
172+
try delete()
174173
}
175174
}
176175
}

0 commit comments

Comments
 (0)