Adopts debugPrint() everywhere

Piwigo · Oct 1, 2024 · 0d498b6 · 0d498b6
1 parent bf42ed9
commit 0d498b6
Show file tree

Hide file tree

Showing 84 changed files with 403 additions and 402 deletions.
diff --git a/piwigo/Album/AlbumCollection/AlbumRenaming.swift b/piwigo/Album/AlbumCollection/AlbumRenaming.swift
@@ -138,7 +138,7 @@ class AlbumRenaming: NSObject
                     do {
                         try mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save context, \(error.userInfo)")
+                        debugPrint("Could not save context, \(error.userInfo)")
                     }
 
                     // Hide HUD

diff --git a/piwigo/Album/AlbumNavigationController.swift b/piwigo/Album/AlbumNavigationController.swift
@@ -26,8 +26,8 @@ class AlbumNavigationController: UINavigationController
     // MARK: - View Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        print("============================================")
-        print("••> viewDidLoad in AlbumNavigationController")
+        debugPrint("============================================")
+        debugPrint("••> viewDidLoad in AlbumNavigationController")
 
         // Navigation bar
         navigationBar.accessibilityIdentifier = "AlbumImagesNav"
@@ -84,7 +84,7 @@ class AlbumNavigationController: UINavigationController
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        print("••> viewWillAppear in AlbumNavigationController")
+        debugPrint("••> viewWillAppear in AlbumNavigationController")
 
         // Set colors, fonts, etc.
         applyColorPalette()

diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Albums.swift
@@ -81,7 +81,7 @@ extension SelectCategoryViewController {
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not fetch \(error), \(error.userInfo)")
+                        debugPrint("Could not fetch \(error), \(error.userInfo)")
                     }
 
                     // Close HUD

diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController+Images.swift
@@ -25,7 +25,7 @@ extension SelectCategoryViewController {
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save copied images \(error), \(error.userInfo)")
+                    debugPrint("Could not save copied images \(error), \(error.userInfo)")
                 }
                 // Hide HUD and dismiss album selector
                 self.hideHUD(afterDelay: pwgDelayHUD) {
@@ -108,7 +108,7 @@ extension SelectCategoryViewController {
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save moved images \(error), \(error.userInfo)")
+                    debugPrint("Could not save moved images \(error), \(error.userInfo)")
                 }
 
                 // Hide HUD and dismiss album selector

diff --git a/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift b/piwigo/Album/AlbumSelector/SelectCategoryViewController.swift
@@ -269,7 +269,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             try recentAlbums.performFetch()
             try albums.performFetch()
         } catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
 
         // Button for returning to albums/images collections
@@ -582,7 +582,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
 
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "CategoryTableViewCell", for: indexPath) as? CategoryTableViewCell else {
-            print("Error: tableView.dequeueReusableCell does not return a CategoryTableViewCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a CategoryTableViewCell!")
             return CategoryTableViewCell()
         }
 
@@ -736,7 +736,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
         switch wantedAction {
         case .setDefaultAlbum:
             // The current default category is not selectable
-            print("••> albums: \(albumData.pwgID) and \(inputAlbum.pwgID)")
+            debugPrint("••> albums: \(albumData.pwgID) and \(inputAlbum.pwgID)")
             if albumData.pwgID == inputAlbum.pwgID {
                 return false
             }
@@ -1041,7 +1041,7 @@ class SelectCategoryViewController: UIViewController, UITableViewDataSource, UIT
             do {
                 try self.mainContext.save()
             } catch let error as NSError {
-                print("Could not fetch \(error), \(error.userInfo)")
+                debugPrint("Could not fetch \(error), \(error.userInfo)")
             }
             // Dismiss the view
             self.dismiss(animated: true, completion: {})

diff --git a/piwigo/Album/AlbumViewController.swift b/piwigo/Album/AlbumViewController.swift
@@ -229,8 +229,8 @@ class AlbumViewController: UIViewController
     // MARK: - View Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
-        print("--------------------------------------------------")
-        print("••> viewDidLoad in AlbumViewController: Album #\(categoryId)")
+        debugPrint("--------------------------------------------------")
+        debugPrint("••> viewDidLoad in AlbumViewController: Album #\(categoryId)")
 
         // Initialise data source
         do {
@@ -239,7 +239,7 @@ class AlbumViewController: UIViewController
             }
             try images.performFetch()
         } catch {
-            print("Error: \(error)")
+            debugPrint("Error: \(error)")
         }
 
         // Place search bar in navigation bar of root album
@@ -381,7 +381,7 @@ class AlbumViewController: UIViewController
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        print("••> viewWillAppear in AlbumViewController: Album #\(categoryId)")
+        debugPrint("••> viewWillAppear in AlbumViewController: Album #\(categoryId)")
 
         // For testing…
 //        timeCounter = CFAbsoluteTimeGetCurrent()
@@ -415,14 +415,14 @@ class AlbumViewController: UIViewController
 
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        print("••> viewDidAppear in AlbumViewController: Album #\(categoryId)")
+        debugPrint("••> viewDidAppear in AlbumViewController: Album #\(categoryId)")
 
         // Speed and memory measurements with iPad Pro 11" in debug mode
         /// Old method —> 0 photo: 527 ms, 24 photos: 583 ms, 3020 photos: 15 226 ms (memory crash after repeating tests)
         /// hasFavorites  cached —> a very little quicker but less memory impacting (-195 MB transcient allocations for 3020 photos)
         /// placeHolder & size cached —> 0 photo: 526 ms, 24 photos: 585 ms, 3020 photos: 14 586 ms i.e. -6% (memory crash after repeating tests)
 //        let duration = (CFAbsoluteTimeGetCurrent() - timeCounter)*1000
-//        print("••> completed in \(duration.rounded()) ms")
+//        debugPrint("••> completed in \(duration.rounded()) ms")
 
         // The user may have cleared the cached data
         // Display an empty root album in that case
@@ -635,7 +635,7 @@ class AlbumViewController: UIViewController
                 .value(forHTTPHeaderField: NetworkVars.HTTPCatID) == catIDstr })
             // Cancel remaining tasks related with this completed upload request
             tasksToCancel.forEach({
-                print("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel task \($0.taskIdentifier) related with album \(self.categoryId)")
+                debugPrint("\(DateFormatter.localizedString(from: Date(), dateStyle: .none, timeStyle: .medium)) > Cancel task \($0.taskIdentifier) related with album \(self.categoryId)")
                 $0.cancel()
             })
         }

diff --git a/piwigo/Album/Extensions/AlbumViewController+Delete.swift b/piwigo/Album/Extensions/AlbumViewController+Delete.swift
@@ -153,7 +153,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save moved images \(error), \(error.userInfo)")
+                        debugPrint("Could not save moved images \(error), \(error.userInfo)")
                     }
                     // Hide HUD and deselect images
                     navigationController?.hideHUD() { [self] in
@@ -227,7 +227,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save moved images \(error), \(error.userInfo)")
+                        debugPrint("Could not save moved images \(error), \(error.userInfo)")
                     }
                     // Hide HUD and update buttons
                     updateBarsInSelectMode()
@@ -246,7 +246,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save moved images \(error), \(error.userInfo)")
+                        debugPrint("Could not save moved images \(error), \(error.userInfo)")
                     }
                     // Hide HUD and update buttons
                     updateBarsInSelectMode()
@@ -262,7 +262,7 @@ extension AlbumViewController
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save deleted images \(error), \(error.userInfo)")
+                    debugPrint("Could not save deleted images \(error), \(error.userInfo)")
                 }
                 // Hide HUD and deselect images
                 navigationController?.hideHUD(afterDelay: pwgDelayHUD) { [self] in
@@ -297,7 +297,7 @@ extension AlbumViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save albums after image deletion \(error), \(error.userInfo)")
+                        debugPrint("Could not save albums after image deletion \(error), \(error.userInfo)")
                     }
 
                     // Delete upload requests of images deleted from the Piwigo server
@@ -338,7 +338,7 @@ extension AlbumViewController
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save moved images \(error), \(error.userInfo)")
+                    debugPrint("Could not save moved images \(error), \(error.userInfo)")
                 }
                 // Hide HUD and update buttons
                 navigationController?.hideHUD() { [self] in

diff --git a/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift b/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift
@@ -115,7 +115,7 @@ extension AlbumViewController: NSFetchedResultsControllerDelegate
                 selectedVideosIDs.remove(image.pwgID)
                 // Delete image
                 updateOperations.append( BlockOperation {  [weak self] in
-                    debugPrint("••> Delete image of album #\(self?.categoryId ?? Int32.min) at \(indexPath)")
+//                    debugPrint("••> Delete image of album #\(self?.categoryId ?? Int32.min) at \(indexPath)")
                     self?.collectionView?.deleteItems(at: [indexPath])
                 })
             case .move:

diff --git a/piwigo/Album/Extensions/AlbumViewController+Menu.swift b/piwigo/Album/Extensions/AlbumViewController+Menu.swift
@@ -356,7 +356,7 @@ extension AlbumViewController: ImageHeaderDelegate
             selectedSections[section] = .select
         }
 //        let diff = (CFAbsoluteTimeGetCurrent() - start)*1000
-//        print("=> Select/Deselect \(localImagesCollection.numberOfItems(inSection: section)) images of section \(section) took \(diff) ms")
+//        debugPrint("=> Select/Deselect \(localImagesCollection.numberOfItems(inSection: section)) images of section \(section) took \(diff) ms")
 
         // Update navigation bar and toolbar
         updateBarsInSelectMode()

diff --git a/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift b/piwigo/Album/Extensions/AlbumViewController+Prefetching.swift
@@ -14,7 +14,7 @@ import piwigoKit
 extension AlbumViewController: UICollectionViewDataSourcePrefetching
 {
     func collectionView(_ collectionView: UICollectionView, prefetchItemsAt indexPaths: [IndexPath]) {
-//        print("••> prefetchingItemsAt \(indexPaths.debugDescription)")
+//        debugPrint("••> prefetchingItemsAt \(indexPaths.debugDescription)")
         let scale = self.traitCollection.displayScale
         for indexPath in indexPaths {
             switch indexPath.section {
@@ -51,7 +51,7 @@ extension AlbumViewController: UICollectionViewDataSourcePrefetching
     }
 
     func collectionView(_ collectionView: UICollectionView, cancelPrefetchingForItemsAt indexPaths: [IndexPath]) {
-//        print("••> cancelPrefetchingForItemsAt \(indexPaths.debugDescription)")
+//        debugPrint("••> cancelPrefetchingForItemsAt \(indexPaths.debugDescription)")
         for indexPath in indexPaths {
             switch indexPath.section {
             case 0 /* Albums (see XIB file) */:

diff --git a/piwigo/Album/Extensions/AlbumViewController+Share.swift b/piwigo/Album/Extensions/AlbumViewController+Share.swift
@@ -95,7 +95,7 @@ extension AlbumViewController
             }
         }
 //        let duration = (CFAbsoluteTimeGetCurrent() - timeCounter)*1000
-//        print("••> completed in \(duration.rounded()) ms")
+//        debugPrint("••> completed in \(duration.rounded()) ms")
 
         // Close HUD if needed
         DispatchQueue.main.async {

diff --git a/piwigo/Album/TagSelector/TagSelectorViewController.swift b/piwigo/Album/TagSelector/TagSelectorViewController.swift
@@ -194,7 +194,7 @@ class TagSelectorViewController: UITableViewController {
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell
     {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "TagSelectorCell", for: indexPath) as? TagSelectorCell else {
-            print("Error: tableView.dequeueReusableCell does not return a TagSelectorCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a TagSelectorCell!")
             return TagSelectorCell()
         }
         cell.configure(with: tags.object(at: indexPath))

diff --git a/piwigo/Image/Extensions/ImageViewController+Delete.swift b/piwigo/Image/Extensions/ImageViewController+Delete.swift
@@ -111,7 +111,7 @@ extension ImageViewController
                     do {
                         try self.mainContext.save()
                     } catch let error as NSError {
-                        print("Could not save copied images \(error), \(error.userInfo)")
+                        debugPrint("Could not save copied images \(error), \(error.userInfo)")
                     }
                 }
 
@@ -191,7 +191,7 @@ extension ImageViewController
                 do {
                     try self.mainContext.save()
                 } catch let error as NSError {
-                    print("Could not save albums after image deletion \(error), \(error.userInfo)")
+                    debugPrint("Could not save albums after image deletion \(error), \(error.userInfo)")
                 }
 
                 // If this image was uploaded with the iOS app,

diff --git a/piwigo/Image/ImageViewController.swift b/piwigo/Image/ImageViewController.swift
@@ -241,7 +241,7 @@ class ImageViewController: UIViewController {
     }
 
     deinit {
-        print("••> ImageViewController is being deinitialized.")
+//        debugPrint("••> ImageViewController is being deinitialized.")
         // Unregister all observers
         NotificationCenter.default.removeObserver(self)
     }
@@ -723,7 +723,7 @@ class ImageViewController: UIViewController {
     // Buttons are disabled (greyed) when retrieving image data
     // They are also disabled during an action
     func setEnableStateOfButtons(_ state: Bool) {
-        print("••> \(state ? "Enable" : "Disable") buttons")
+//        debugPrint("••> \(state ? "Enable" : "Disable") buttons")
         actionBarButton?.isEnabled = state
         shareBarButton.isEnabled = state
         moveBarButton.isEnabled = state
@@ -883,7 +883,7 @@ extension ImageViewController: UIPageViewControllerDelegate
         }
 
         // Set title and buttons
-        print("••> Did finish animating page view controller for image at index \(indexPath)")
+//        debugPrint("••> Did finish animating page view controller for image at index \(indexPath)")
         setTitleViewFromImageData()
         updateNavBar()
         setEnableStateOfButtons(imageData.fileSize != Int64.zero)
@@ -910,7 +910,7 @@ extension ImageViewController: UIPageViewControllerDataSource
 {
     // Create view controller for presenting the image at the provided index
     func imageDetailViewController(ofImage imageData: Image, atIndexPath indexPath: IndexPath) -> ImageDetailViewController? {
-        print("••> Create page view controller for image #\(imageData.pwgID) at index \(indexPath)")
+//        debugPrint("••> Create page view controller for image #\(imageData.pwgID) at index \(indexPath)")
         guard let imageDVC = storyboard?.instantiateViewController(withIdentifier: "ImageDetailViewController") as? ImageDetailViewController
         else { return nil }
 
@@ -922,7 +922,7 @@ extension ImageViewController: UIPageViewControllerDataSource
 
     // Create view controller for presenting the video at the provided index
     func videoDetailViewController(ofImage imageData: Image, atIndexPath indexPath: IndexPath) -> VideoDetailViewController? {
-        debugPrint("••> Create page view controller for video #\(imageData.pwgID) at index \(indexPath)")
+//        debugPrint("••> Create page view controller for video #\(imageData.pwgID) at index \(indexPath)")
         guard let videoDVC = storyboard?.instantiateViewController(withIdentifier: "VideoDetailViewController") as? VideoDetailViewController
         else { return nil }
 

diff --git a/piwigo/Image/Parameters/Cells/EditImageDatePickerTableViewCell.swift b/piwigo/Image/Parameters/Cells/EditImageDatePickerTableViewCell.swift
@@ -325,7 +325,7 @@ extension EditImageDatePickerTableViewCell: UIPickerViewDelegate
 //        var rightPaneWidth = sepDay / 2 + 5 * separatorWidth + 3 * time + 2 * sepTime
 //        rightPaneWidth += is24hFormat ? 0.0 : separatorWidth + ampm + separatorWidth + rightMargin
 //        let remainingSpace = pickerView.bounds.size.width - leftPaneWidth - rightPaneWidth
-//        print("=> left:\(leftPaneWidth), right:\(rightPaneWidth), width:\(pickerView.bounds.size.width) (remaining:\(remainingSpace))")
+//        debugPrint("=> left:\(leftPaneWidth), right:\(rightPaneWidth), width:\(pickerView.bounds.size.width) (remaining:\(remainingSpace))")
         // iPhone SE, iOS 11 => left:136, right:179, width:318 (remaining:3)
         // iPhone Xs, iOS 12 => left:131, right:174, width:373 (remaining:68)
 

diff --git a/piwigo/Image/Parameters/Cells/EditImageThumbTableViewCell.swift b/piwigo/Image/Parameters/Cells/EditImageThumbTableViewCell.swift
@@ -65,7 +65,7 @@ extension EditImageThumbTableViewCell: UICollectionViewDataSource
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "EditImageThumbCollectionViewCell", for: indexPath) as? EditImageThumbCollectionViewCell else {
-            print("Error: collectionView.dequeueReusableCell does not return a EditImageThumbCollectionViewCell!")
+            debugPrint("Error: collectionView.dequeueReusableCell does not return a EditImageThumbCollectionViewCell!")
             return EditImageThumbCollectionViewCell()
         }
         cell.config(withImage: images?[indexPath.row], removeOption: ((images?.count ?? 0) > 1))

diff --git a/piwigo/Image/Parameters/Extensions/EditImageParamsViewController+ThumbnailCell.swift b/piwigo/Image/Parameters/Extensions/EditImageParamsViewController+ThumbnailCell.swift
@@ -43,7 +43,7 @@ extension EditImageParamsViewController: EditImageThumbnailCellDelegate
         do {
             try mainContext.save()
         } catch let error as NSError {
-            print("Could not fetch \(error), \(error.userInfo)")
+            debugPrint("Could not fetch \(error), \(error.userInfo)")
         }
 
         // Update parent image view

diff --git a/piwigo/Image/Parameters/Tags/TagsViewController.swift b/piwigo/Image/Parameters/Tags/TagsViewController.swift
@@ -265,7 +265,7 @@ class TagsViewController: UITableViewController {
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: "TagTableViewCell", for: indexPath) as? TagTableViewCell else {
-            print("Error: tableView.dequeueReusableCell does not return a TagTableViewCell!")
+            debugPrint("Error: tableView.dequeueReusableCell does not return a TagTableViewCell!")
             return TagTableViewCell()
         }
         switch indexPath.section {