Skip to content

[FIX] 쓰레드 스위칭이 필요한 코드에만 변경하도록 수정 #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dongglehada merged 1 commit into from
Jun 9, 2025
Merged

[FIX] 쓰레드 스위칭이 필요한 코드에만 변경하도록 수정 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 7 additions & 24 deletions Poppool/CoreLayer/Infrastructure/Infrastructure/Extension/UIImageView+.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,16 @@ public extension UIImageView {
// 현재 이미지 URL을 업데이트
currentImageURL = encodedURL

// 먼저 메모리 캐시 확인
if let cachedImage = MemoryStorage.shared.fetchImage(url: encodedURL) {
self.image = cachedImage
completion?()
return
}

// 다음으로 디스크 캐시 확인
if let diskImage = DiskStorage.shared.fetchImage(url: encodedURL) {
MemoryStorage.shared.store(image: diskImage, url: encodedURL)
self.image = diskImage
completion?()
return
}

ImageLoader.shared.loadImage(with: encodedURL, defaultImage: placeholderImage, imageQuality: .origin) { [weak self] image in
guard let self else { return }
defer { completion?() }
DispatchQueue.main.async {
// 현재 요청 ID와 캡처된 ID가 일치하는지 확인 (다른 이미지로 변경되었으면 무시)
if self.currentImageURL == encodedURL {
if let image = image {
self.image = image
} else if self.image == nil {
// 이미지 로드 실패 시 기본 이미지 표시
self.image = self.placeholderImage
}
// 현재 요청 ID와 캡처된 ID가 일치하는지 확인 (다른 이미지로 변경되었으면 무시)
if self.currentImageURL == encodedURL {
if let image = image {
self.image = image
} else if self.image == nil {
// 이미지 로드 실패 시 기본 이미지 표시
self.image = self.placeholderImage
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions Poppool/CoreLayer/Infrastructure/Infrastructure/ImageLoader/ImageLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,14 @@ private extension ImageLoader {
if let data = data, let image = UIImage(data: data) {
MemoryStorage.shared.store(image: image, url: stringURL)
DiskStorage.shared.store(image: image, url: stringURL)
completion(.success(image))
DispatchQueue.main.async { completion(.success(image)) }
} else {
completion(.failure(ImageLoaderError.convertError(description: "Failed to convert data to UIImage")))
DispatchQueue.main.async {
completion(.failure(ImageLoaderError.convertError(description: "Failed to convert data to UIImage")))
}
}
case .failure(let error):
completion(.failure(error))
DispatchQueue.main.async { completion(.failure(error)) }
}
}
}
Expand Down