Fix lint 🚀

chicio · Oct 12, 2024 · 75d0cc8 · 75d0cc8
1 parent 3e63627
commit 75d0cc8
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 59 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,5 +1,7 @@
 excluded: 
   - Demo/Demo Ubuntu/.build
+  - .build
+  - build
 
 type_name:
   min_length: 4

diff --git a/Demo/Demo watchOS/ContentView.swift b/Demo/Demo watchOS/ContentView.swift
@@ -10,23 +10,26 @@ import SwiftUI
 import ID3TagEditor
 
 struct ContentView: View {
-    @State private var tag: ID3Tag? = nil
-        
+    @State private var tag: ID3Tag?
+
     var body: some View {
         VStack {
             if let validTag = tag {
-                Image(uiImage: UIImage(data: (validTag.frames[.attachedPicture(.frontCover)] as! ID3FrameAttachedPicture).picture)!)
-                    .resizable()
-                    .frame(width: 50, height: 50)
-                Text((validTag.frames[.title] as! ID3FrameWithStringContent).content)
-                Text((validTag.frames[.album] as! ID3FrameWithStringContent).content)
-                Text((validTag.frames[.genre] as! ID3FrameGenre).description!)
+                if let data = (validTag.frames[.attachedPicture(.frontCover)] as? ID3FrameAttachedPicture)?.picture,
+                   let validImage = UIImage(data: data) {
+                    Image(uiImage: validImage)
+                        .resizable()
+                        .frame(width: 50, height: 50)
+                }
+                Text((validTag.frames[.title] as? ID3FrameWithStringContent)?.content ?? "")
+                Text((validTag.frames[.album] as? ID3FrameWithStringContent)?.content ?? "")
+                Text((validTag.frames[.genre] as? ID3FrameGenre)?.description ?? "")
             }
         }
         .padding()
         .onAppear {
             let id3TagEditor = ID3TagEditor()
-            tag = try! id3TagEditor.read(from: PathLoader().pathFor(name: "example", fileType: "mp3"))
+            tag = try? id3TagEditor.read(from: PathLoader().pathFor(name: "example", fileType: "mp3"))
         }
     }
 }

diff --git a/Demo/Demo watchOS/Demo_watchOSApp.swift → Demo/Demo watchOS/DemoWatchOSApp.swift b/Demo/Demo watchOS/Demo_watchOSApp.swift → Demo/Demo watchOS/DemoWatchOSApp.swift
@@ -1,15 +1,15 @@
 //
-//  Demo_watchOSApp.swift
+//  DemoWatchOSApp.swift
 //  Demo watchOS Watch App
 //
 //  Created by Fabrizio Duroni on 11.10.2024.
-//  Copyright © 2024 Fabrizio Duroni. All rights reserved.
+//  2024 Fabrizio Duroni.
 //
 
 import SwiftUI
 
 @main
-struct Demo_watchOS_Watch_AppApp: App {
+struct DemoWatchOSApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView()

diff --git a/Scripts/swiftlint.sh b/Scripts/swiftlint.sh
@@ -6,7 +6,7 @@ fi
 
 # Type a script or drag a script file from your workspace to insert its path.
 if which swiftlint >/dev/null; then
-  swiftlint
+  swiftlint lint --config .swiftlint.yml
 else
   echo "warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint"
 fi
diff --git a/Source/Create/ID3FrameCreatorsFactory.swift b/Source/Create/ID3FrameCreatorsFactory.swift
@@ -47,3 +47,5 @@ class ID3FrameCreatorsFactory {
         + ID3iTunesFrameCreatorsFactory.make()
     }
 }
+
+// swiftlint:enable line_length
diff --git a/Source/Create/ID3RecordingTimesFrameCreatorsFactory.swift b/Source/Create/ID3RecordingTimesFrameCreatorsFactory.swift
@@ -25,3 +25,5 @@ class ID3RecordingTimesFrameCreatorsFactory {
         ]
     }
 }
+
+// swiftlint:enable line_length
diff --git a/Source/Create/ID3iTunesFrameCreatorsFactory.swift b/Source/Create/ID3iTunesFrameCreatorsFactory.swift
@@ -28,3 +28,5 @@ class ID3iTunesFrameCreatorsFactory {
         ]
     }
 }
+
+// swiftlint:enable line_length
diff --git a/Source/Frame/FrameName.swift b/Source/Frame/FrameName.swift
@@ -15,7 +15,7 @@ struct FrameNamesWithLocalizedContent {
             FrameType.comment: enumerateLocalizedFrameName(frameName: FrameName.comment)
         ]
     }
-    
+
     private func enumerateLocalizedFrameName(frameName: (ID3FrameContentLanguage) -> FrameName) -> [FrameName] {
         return ID3FrameContentLanguage.allCases.map({ frameName($0) })
     }

diff --git a/Source/Frame/ID3FrameContentLanguage.swift b/Source/Frame/ID3FrameContentLanguage.swift
@@ -1036,3 +1036,6 @@ public enum ID3FrameContentLanguage: String, Equatable, Hashable, CaseIterable {
     /// Invalid/Unknown language.
     case unknown
 }
+
+// swiftlint:enable type_body_length
+// swiftlint:enable file_length
diff --git a/Source/Parse/ID3FrameContentParsingOperationFactory.swift b/Source/Parse/ID3FrameContentParsingOperationFactory.swift
@@ -52,3 +52,5 @@ class ID3FrameContentParsingOperationFactory {
         ]
     }
 }
+
+// swiftlint:enable line_length
diff --git a/Source/Parse/ID3FrameStringContentParser.swift b/Source/Parse/ID3FrameStringContentParser.swift
@@ -30,7 +30,7 @@ class ID3FrameStringContentParser {
 
         let frameContent = frame.subdata(in: frameContentRangeStart..<frame.count)
         let encoding = stringEncodingDetector.detect(frame: frame, version: version)
-                
+
         if let frameContentAsString = String(data: frameContent, encoding: encoding) {
             return paddingRemover.removeFrom(string: frameContentAsString)
         } else {
@@ -39,10 +39,10 @@ class ID3FrameStringContentParser {
              Given the compatibility between iso latin 1 and utf-8 (the latter is a unicode super set of the first one)
              we try as last resot to convert to utf-8 and get the result. If it fails, return nil.
              */
-            if let fallbackUtf8Content = String(data: frameContent, encoding: .utf8)  {
+            if let fallbackUtf8Content = String(data: frameContent, encoding: .utf8) {
                 return paddingRemover.removeFrom(string: fallbackUtf8Content)
             }
-            
+
             return nil
         }
     }

diff --git a/Source/Tag/ID3TagToStringAdapter.swift b/Source/Tag/ID3TagToStringAdapter.swift
@@ -7,7 +7,6 @@
 //
 
 // swiftlint:disable line_length
-// swiftlint:disable function_body_length
 
 import Foundation
 
@@ -75,3 +74,5 @@ class ID3TagToStringAdapter {
         })
     }
 }
+
+// swiftlint:enable line_length
diff --git a/Tests/Acceptance/ID3TagEditorAcceptanceTest.swift b/Tests/Acceptance/ID3TagEditorAcceptanceTest.swift
@@ -56,7 +56,7 @@ struct ID3TagEditorAcceptanceTest {
         let path = PathLoader().pathFor(name: "example-cover-png", fileType: "png")
         let cover = try Data(contentsOf: URL(fileURLWithPath: path))
         let id3Tag = try id3TagEditor.read(from: PathLoader().pathFor(name: "example-v23", fileType: "mp3"))
-            
+
         #expect(id3Tag?.properties.version == .version3)
         #expect((id3Tag?.frames[.title] as? ID3FrameWithStringContent)?.content == "A title")
         #expect((id3Tag?.frames[.album] as? ID3FrameWithStringContent)?.content == "An album")
@@ -182,7 +182,7 @@ struct ID3TagEditorAcceptanceTest {
         let mp3 = try Data(
             contentsOf: URL(fileURLWithPath: PathLoader().pathFor(name: "example-v3-corrupted", fileType: "mp3"))
         )
-        
+
         #expect(throws: ID3TagEditorError.corruptedFile.self) {
             try id3TagEditor.read(mp3: mp3)
         }
@@ -373,8 +373,8 @@ struct ID3TagEditorAcceptanceTest {
             )
         }
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -405,8 +405,8 @@ struct ID3TagEditorAcceptanceTest {
         }
 
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -435,10 +435,10 @@ struct ID3TagEditorAcceptanceTest {
                 andSaveTo: pathMp3Generated
             )
         }
-        
+
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -555,10 +555,10 @@ struct ID3TagEditorAcceptanceTest {
                 andSaveTo: NSHomeDirectory() + "/example-v3-additional-data.mp3"
             )
         }
-        
+
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -597,7 +597,7 @@ struct ID3TagEditorAcceptanceTest {
 
         #expect(
             newMp3 ==
-            (try! Data(contentsOf: URL(fileURLWithPath: PathLoader().pathFor(name: "example-v3-additional-data",
+            (try? Data(contentsOf: URL(fileURLWithPath: PathLoader().pathFor(name: "example-v3-additional-data",
                                                                             fileType: "mp3"))))
         )
     }
@@ -625,8 +625,8 @@ struct ID3TagEditorAcceptanceTest {
         }
 
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -657,8 +657,8 @@ struct ID3TagEditorAcceptanceTest {
         }
 
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -682,7 +682,7 @@ struct ID3TagEditorAcceptanceTest {
                 .subtitle: ID3FrameWithStringContent(content: "Subtitle V2")
             ]
         )
-        
+
         #expect(throws: Never.self) {
             try id3TagEditor.write(
                 tag: id3Tag,
@@ -692,8 +692,8 @@ struct ID3TagEditorAcceptanceTest {
         }
 
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -735,8 +735,8 @@ struct ID3TagEditorAcceptanceTest {
             )
         }
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -779,8 +779,8 @@ struct ID3TagEditorAcceptanceTest {
         }
 
         #expect(
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
-            (try! Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3Generated))) ==
+            (try? Data(contentsOf: URL(fileURLWithPath: pathMp3ToCompare)))
         )
     }
 
@@ -801,12 +801,11 @@ struct ID3TagEditorAcceptanceTest {
         #expect(throws: Never.self) {
             try id3TagEditor.write(
                 tag: id3Tag,
-                to: PathLoader().pathFor(name: "frames-after-attached-picture",fileType: "mp3"),
+                to: PathLoader().pathFor(name: "frames-after-attached-picture", fileType: "mp3"),
                 andSaveTo: pathMp3Generated
             )
         }
 
-
         let tag = try id3TagEditor.read(from: pathMp3Generated)
         #expect((tag?.frames[.discPosition] as? ID3FramePartOfTotal)?.part == 1)
         #expect((tag?.frames[.discPosition] as? ID3FramePartOfTotal)?.total == 3)
@@ -924,3 +923,8 @@ struct ID3TagEditorAcceptanceTest {
         ("testCommentWithUTF8EncodingAndNoContentDescription", testCommentWithUTF8EncodingAndNoContentDescription)
     ]
 }
+
+// swiftlint:enable type_body_length
+// swiftlint:enable function_body_length
+// swiftlint:enable line_length
+// swiftlint:enable file_length
diff --git a/Tests/Acceptance/ID3TagEditorWriteReadAcceptanceTest.swift b/Tests/Acceptance/ID3TagEditorWriteReadAcceptanceTest.swift
@@ -509,3 +509,8 @@ struct ID3TagEditorWriteReadAcceptanceTest {
         ("testReadWritev4", testReadWritev4)
     ]
 }
+
+// swiftlint:enable type_body_length
+// swiftlint:enable function_body_length
+// swiftlint:enable line_length
+// swiftlint:enable file_length
diff --git a/Tests/Create/ID3FrameHeaderCreatorTest.swift b/Tests/Create/ID3FrameHeaderCreatorTest.swift
@@ -19,7 +19,7 @@ struct ID3FrameHeaderCreatorTest {
 
         #expect(header == [UInt8]("USLT".utf8) + [0x11, 0x00])
     }
-    
+
     static let allTests = [
         ("create", create)
     ]

diff --git a/Tests/Create/ID3TagCreatorTest.swift b/Tests/Create/ID3TagCreatorTest.swift
@@ -34,15 +34,15 @@ struct ID3TagCreatorTest {
         }
     }
 
-    @Test func testGenerateValidData() {
+    @Test func testGenerateValidData() throws {
         let id3FrameCreators = [MockID3FrameCreatorsChain(frames: [0x22, 0x33])]
         let id3FramesCreator = ID3FramesCreator(id3FrameCreators: id3FrameCreators)
         let id3TagHeaderCreator = ID3TagHeaderCreator(uInt32ToByteArrayAdapter: MockUInt32ToByteArrayAdapter(),
                                                       id3TagConfiguration: ID3TagConfiguration())
         let id3TagCreator = ID3TagCreator(id3FramesCreator: id3FramesCreator, id3TagHeaderCreator: id3TagHeaderCreator)
 
         #expect(
-                try! id3TagCreator.create(id3Tag: ID32v3TagBuilder().build()) ==
+                try id3TagCreator.create(id3Tag: ID32v3TagBuilder().build()) ==
                 Data(ID3TagConfiguration().headerFor(version: .version3)
                         + [0x0, 0x3, 0x2, 0x22, 0x33] + [UInt8](repeating: 0x0, count: 2048)
                 )

diff --git a/Tests/Parse/ID3AttachedPictureFrameContentParsingOperationTest.swift b/Tests/Parse/ID3AttachedPictureFrameContentParsingOperationTest.swift
@@ -16,7 +16,7 @@ struct ID3AttachedPictureFrameContentParsingOperationTest {
                 id3FrameConfiguration: ID3FrameConfiguration(),
                 pictureTypeAdapter: MockPictureTypeAdapter()
         )
-        
+
         await confirmation("attached picture") { parsed in
             attachedPictureFrameContentParsingOperation.parse(
                 frame: Data([0x89, 0x50, 0x4E, 0x47, 0x11, 0x11]),

diff --git a/Tests/Parse/ID3LocalizedFrameParsingOperationTest.swift b/Tests/Parse/ID3LocalizedFrameParsingOperationTest.swift
@@ -13,7 +13,9 @@ import Testing
 
 struct ID3LocalizedFrameParsingOperationTest {
     @Test func testParsingValidFrame() async {
-        let lyricsOperation = ID3LocalizedFrameContentParsingOperationFactory.make(frameName: FrameName.unsynchronizedLyrics)
+        let lyricsOperation = ID3LocalizedFrameContentParsingOperationFactory.make(
+            frameName: FrameName.unsynchronizedLyrics
+        )
 
         await confirmation("unsynchronised lyrics") { fulfill in
             lyricsOperation.parse(frame: frameV3Valid(), version: .version3) { (_, frame) in
@@ -26,7 +28,9 @@ struct ID3LocalizedFrameParsingOperationTest {
     }
 
     @Test func testParsingInvalidLanguage() async {
-        let lyricsOperation = ID3LocalizedFrameContentParsingOperationFactory.make(frameName: FrameName.unsynchronizedLyrics)
+        let lyricsOperation = ID3LocalizedFrameContentParsingOperationFactory.make(
+            frameName: FrameName.unsynchronizedLyrics
+        )
 
         await confirmation("unsynchronised lyrics") { fulfill in
             lyricsOperation.parse(frame: frameV3InvalidLanguage(), version: .version3) { (_, frame) in
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,3 +47,5 @@ class ID3FrameCreatorsFactory { @@
             + ID3iTunesFrameCreatorsFactory.make()
         }
     }
+    // swiftlint:enable line_length