Fixes

oolxg · Feb 6, 2023 · bfb11a9 · bfb11a9
1 parent 2ee5167
commit bfb11a9
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 42 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -101,3 +101,6 @@ trailing_whitespace:
 
 vertical_whitespace:
   max_empty_lines: 2
+
+analyzer_rules:
+- explicit_self
diff --git a/Hanami.xcodeproj/project.pbxproj b/Hanami.xcodeproj/project.pbxproj
@@ -1235,7 +1235,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.23.1;
+				MARKETING_VERSION = 0.23.2;
 				PRODUCT_BUNDLE_IDENTIFIER = moe.mkpwnz.Hanami;
 				PRODUCT_NAME = "Hanami - Manga Reader";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1276,7 +1276,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.23.1;
+				MARKETING_VERSION = 0.23.2;
 				PRODUCT_BUNDLE_IDENTIFIER = moe.mkpwnz.Hanami;
 				PRODUCT_NAME = "Hanami - Manga Reader";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Hanami.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Hanami.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kean/Nuke",
       "state" : {
-        "revision" : "2e9337168d08acccf72c039bf9324be24a1cf7d7",
-        "version" : "11.5.3"
+        "revision" : "df6cfba3f49aa6777b8c1084cb7778899ca166d3",
+        "version" : "11.6.0"
       }
     },
     {

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/oolxg.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/oolxg.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Hanami.xcodeproj/xcuserdata/oolxg.xcuserdatad/xcschemes/xcschememanagement.plist b/Hanami.xcodeproj/xcuserdata/oolxg.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -17,128 +17,135 @@
 		<key>SimpleStorage (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>4</integer>
 		</dict>
 		<key>SimpleStorage (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>5</integer>
 		</dict>
 		<key>SimpleStorage (Playground) 3.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>7</integer>
 		</dict>
 		<key>SimpleStorage (Playground) 4.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>9</integer>
 		</dict>
 		<key>SimpleStorage (Playground) 5.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>10</integer>
 		</dict>
 		<key>SimpleStorage (Playground) 6.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>14</integer>
 		</dict>
 		<key>SimpleStorage (Playground) 7.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>15</integer>
 		</dict>
 		<key>SimpleStorage (Playground) 8.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>16</integer>
 		</dict>
 		<key>SimpleStorage (Playground).xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>3</integer>
 		</dict>
 		<key>Storage (Playground) 1.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>7</integer>
 		</dict>
 		<key>Storage (Playground) 2.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Storage (Playground) 3.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>11</integer>
 		</dict>
 		<key>Storage (Playground) 4.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>12</integer>
 		</dict>
 		<key>Storage (Playground) 5.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>13</integer>
 		</dict>
 		<key>Storage (Playground) 6.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>17</integer>
 		</dict>
 		<key>Storage (Playground) 7.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>18</integer>
 		</dict>
 		<key>Storage (Playground) 8.xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
 			<integer>19</integer>
 		</dict>
 		<key>Storage (Playground).xcscheme</key>
 		<dict>
 			<key>isShown</key>
-			<false />
+			<false/>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
+		</dict>
+		<key>Tools for plug-in “RswiftGenerateResourcesCommand”.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>8</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/Hanami/App/Core/Manga/Pages/VolumeTab/Chapter/ChapterLoaderFeature.swift b/Hanami/App/Core/Manga/Pages/VolumeTab/Chapter/ChapterLoaderFeature.swift
@@ -9,7 +9,6 @@ import Foundation
 import class SwiftUI.UIImage
 import ComposableArchitecture
 
-// swiftlint:disable:next type_body_length
 struct ChapterLoaderFeature: ReducerProtocol {
     struct State: Equatable {
         let parentManga: Manga

diff --git a/Hanami/App/Core/Search/Filter/FiltersFeature.swift b/Hanami/App/Core/Search/Filter/FiltersFeature.swift
@@ -63,7 +63,7 @@ struct FiltersFeature: ReducerProtocol {
     @Dependency(\.logger) private var logger
     @Dependency(\.mainQueue) private var mainQueue
 
-    // swiftlint:disable:next cyclomatic_complexity
+    // swiftlint:disable:next cyclomatic_complexity function_body_length
     func reduce(into state: inout State, action: Action) -> EffectPublisher<Action, Never> {
         switch action {
         case .fetchFilterTagsIfNeeded:

diff --git a/Hanami/Clients/CacheClient.swift b/Hanami/Clients/CacheClient.swift
@@ -55,12 +55,12 @@ struct CacheClient {
     /// - Parameter image: `UIImaga` to be cached
     /// - Parameter imageName: `imageName` name of the image
     /// - Returns: ` EffectTask<Never>`
-    let cacheImage: (_ image: UIImage, _ imageName: String) ->  EffectTask<Never>
+    let cacheImage: (_ image: UIImage, _ imageName: String) -> EffectTask<Never>
     /// Removes image with `imageName` from disk
     ///
     /// - Parameter imageName: `imageName` name of the image to be removed
     /// - Returns: ` EffectTask<Never>`
-    let removeImage: (String) ->  EffectTask<Never>
+    let removeImage: (String) -> EffectTask<Never>
     /// Checks whether image is cached on disk or not
     ///
     /// - Parameter imageName: name of the image to be checked
@@ -71,13 +71,13 @@ struct CacheClient {
     /// - Note: Doesn't affect Nuke cache
     ///
     /// - Returns: ` EffectTask<Never>`
-    let clearCache: () ->  EffectTask<Never>
+    let clearCache: () -> EffectTask<Never>
     /// Computes cache for all save on disk images
     ///
     /// - Note: Doesn't compute Nuke cache
     ///
     /// - Returns: `EffectTask<Swift.Result<Double, AppError>>`: `Double` - cached size in Megabytes
-    let computeCacheSize: () ->  EffectTask<Swift.Result<Double, AppError>>
+    let computeCacheSize: () -> EffectTask<Swift.Result<Double, AppError>>
     /// Returns path for image with given `imageName`
     ///
     /// - Note: Doesn't affect cached images in Nuke

diff --git a/Hanami/Clients/MangaClient.swift b/Hanami/Clients/MangaClient.swift
@@ -73,10 +73,10 @@ struct MangaClient {
     let computePreviousChapterIndex: (_ currentChapterIndex: Double?, _ chapters: [Chapter]?) -> Int?
     let findDidReadChapterOnMangaPage: (_ chapterIndex: Double?, IdentifiedArrayOf<VolumeTabFeature.State>) -> (volumeID: UUID, chapterID: UUID)?
 
-    let saveCoverArt: (_ coverArt: UIImage, _ mangaID: UUID, _ cacheClient: CacheClient) ->  EffectTask<Never>
-    let deleteCoverArt: (_ mangaID: UUID, _ cacheClient: CacheClient) ->  EffectTask<Never>
-    let saveChapterPage: (_ chapterPage: UIImage, _ chapterPageIndex: Int, _ chapterID: UUID, _ cacheClient: CacheClient) ->  EffectTask<Never>
-    let removeCachedPagesForChapter: (_ chapterID: UUID, _ pagesCount: Int, _ cacheClient: CacheClient) ->  EffectTask<Never>
+    let saveCoverArt: (_ coverArt: UIImage, _ mangaID: UUID, _ cacheClient: CacheClient) -> EffectTask<Never>
+    let deleteCoverArt: (_ mangaID: UUID, _ cacheClient: CacheClient) -> EffectTask<Never>
+    let saveChapterPage: (_ chapterPage: UIImage, _ chapterPageIndex: Int, _ chapterID: UUID, _ cacheClient: CacheClient) -> EffectTask<Never>
+    let removeCachedPagesForChapter: (_ chapterID: UUID, _ pagesCount: Int, _ cacheClient: CacheClient) -> EffectTask<Never>
     /// Check whether cover art for manga cached or not
     ///
     /// - Parameter mangaID: ID of manga, whose cover art need to be checked

diff --git a/Hanami/Database/CoreDataGenerated+Extension/ChapterDetailsMO+CoreDataClass.swift b/Hanami/Database/CoreDataGenerated+Extension/ChapterDetailsMO+CoreDataClass.swift
@@ -8,8 +8,7 @@
 
 import CoreData
 
-@objc(ChapterDetailsMO)
-public class ChapterDetailsMO: NSManagedObject { }
+@objc(ChapterDetailsMO) public class ChapterDetailsMO: NSManagedObject { }
 
 extension ChapterDetailsMO: IdentifiableMO { }
 

diff --git a/Hanami/Database/CoreDataGenerated+Extension/MangaMO+CoreDataClass.swift b/Hanami/Database/CoreDataGenerated+Extension/MangaMO+CoreDataClass.swift
@@ -8,8 +8,7 @@
 
 import CoreData
 
-@objc(MangaMO)
-public class MangaMO: NSManagedObject { }
+@objc(MangaMO) public class MangaMO: NSManagedObject { }
 
 extension MangaMO: IdentifiableMO { }
 

diff --git a/xcodebuild.log b/xcodebuild.log
@@ -0,0 +1,6 @@
+Command line invocation:
+    /Applications/Xcode.app/Contents/Developer/usr/bin/xcodebuild -workspace Hanami.xcworkspace -scheme Hanami
+
+User defaults from command line:
+    IDEPackageSupportUseBuiltinSCM = YES
+