kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-26 05:18:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

GlobalQueue Refactor

Browse Source
This commit is contained in:
Chris Li 2016-08-31 16:50:08 -04:00
parent 160bc2313a
commit 6a853c47e8
11 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kiwix-OSX/Controllers/LibraryController.swift
View File

@ -14,7 +14,7 @@ class LibraryController: NSViewController {
@IBOutlet weak var refresh: NSButton! @IBOutlet weak var refresh: NSButton!
@IBAction func refresh(sender: NSButton) { @IBAction func refresh(sender: NSButton) {
let operation = RefreshLibraryOperation(invokedAutomatically: false, completionHandler: nil) let operation = RefreshLibraryOperation(invokedAutomatically: false, completionHandler: nil)
GlobalOperationQueue.sharedInstance.addOperation(operation) GlobalQueue.shared.addOperation(operation)
} }
let managedObjectContext = NSApplication.appDelegate.managedObjectContext let managedObjectContext = NSApplication.appDelegate.managedObjectContext

2
Kiwix-iOS/AppDelegate.swift
View File

@ -157,7 +157,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
completionHandler(operation.hasUpdate ? .NewData : .NoData) completionHandler(operation.hasUpdate ? .NewData : .NoData)
}) })
GlobalOperationQueue.sharedInstance.addOperation(operation) GlobalQueue.shared.addOperation(operation)
} }
// MARK: - Core Data stack // MARK: - Core Data stack

2
Kiwix-iOS/Controller/BookmarkTBVC.swift
View File

@ -32,7 +32,7 @@ class BookmarkTBVC: UITableViewController, NSFetchedResultsControllerDelegate, D
func updateWidgetData() { func updateWidgetData() {
let operation = UpdateWidgetDataSourceOperation() let operation = UpdateWidgetDataSourceOperation()
GlobalOperationQueue.sharedInstance.addOperation(operation) GlobalQueue.shared.addOperation(operation)
} }
// MARK: - Empty table datasource & delegate // MARK: - Empty table datasource & delegate

2
Kiwix-iOS/Controller/Library/CloudBooksController.swift
View File

@ -96,7 +96,7 @@ class CloudBooksController: UITableViewController, NSFetchedResultsControllerDel
// guard error == ReachabilityCondition.Error.NotReachable else {return} // guard error == ReachabilityCondition.Error.NotReachable else {return}
// } // }
}) })
GlobalOperationQueue.sharedInstance.addOperation(operation) GlobalQueue.shared.addOperation(operation)
} }
// MARK: - LanguageFilterUpdating // MARK: - LanguageFilterUpdating

2
Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
View File

@ -30,7 +30,7 @@ extension MainController: LPTBarButtonItemDelegate, TableOfContentsDelegate, Zim
if article.snippet == nil {article.snippet = getSnippet(webView)} if article.snippet == nil {article.snippet = getSnippet(webView)}
let operation = UpdateWidgetDataSourceOperation() let operation = UpdateWidgetDataSourceOperation()
GlobalOperationQueue.sharedInstance.addOperation(operation) GlobalQueue.shared.addOperation(operation)
guard let controller = bookmarkController ?? UIStoryboard.main.initViewController("BookmarkController", type: BookmarkController.self) else {return} guard let controller = bookmarkController ?? UIStoryboard.main.initViewController("BookmarkController", type: BookmarkController.self) else {return}
bookmarkController = controller bookmarkController = controller

2
Kiwix-iOS/Controller/Main/MainControllerShowHide.swift
View File

@ -190,7 +190,7 @@ extension MainController {
func showGetStartedAlert() { func showGetStartedAlert() {
guard !Preference.hasShowGetStartedAlert else {return} guard !Preference.hasShowGetStartedAlert else {return}
let operation = GetStartedAlert(presentationContext: self) let operation = GetStartedAlert(presentationContext: self)
GlobalOperationQueue.sharedInstance.addOperation(operation) GlobalQueue.shared.addOperation(operation)
Preference.hasShowGetStartedAlert = true Preference.hasShowGetStartedAlert = true
} }
} }

2
Kiwix-iOSWidgets/Bookmarks/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.7.2140</string> <string>1.7.2141</string>
<key>NSExtension</key> <key>NSExtension</key>
<dict> <dict>
<key>NSExtensionMainStoryboard</key> <key>NSExtensionMainStoryboard</key>

8
Kiwix.xcodeproj/project.pbxproj
View File

@ -113,7 +113,7 @@
97D452BE1D1723FF0033666F /* CollectionViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D452BD1D1723FF0033666F /* CollectionViewCells.swift */; }; 97D452BE1D1723FF0033666F /* CollectionViewCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D452BD1D1723FF0033666F /* CollectionViewCells.swift */; };
97D55EF61D2075180081B523 /* TableOfContentsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D55EF51D2075180081B523 /* TableOfContentsController.swift */; }; 97D55EF61D2075180081B523 /* TableOfContentsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D55EF51D2075180081B523 /* TableOfContentsController.swift */; };
97D6811B1D6E2A7100E5FA99 /* DownloadTasksController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811A1D6E2A7100E5FA99 /* DownloadTasksController.swift */; }; 97D6811B1D6E2A7100E5FA99 /* DownloadTasksController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811A1D6E2A7100E5FA99 /* DownloadTasksController.swift */; };
97D681231D6F70AC00E5FA99 /* GlobalOperationQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811C1D6F70AC00E5FA99 /* GlobalOperationQueue.swift */; }; 97D681231D6F70AC00E5FA99 /* GlobalQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811C1D6F70AC00E5FA99 /* GlobalQueue.swift */; };
97D681241D6F70AC00E5FA99 /* RefreshLibraryOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */; }; 97D681241D6F70AC00E5FA99 /* RefreshLibraryOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */; };
97D681251D6F70AC00E5FA99 /* ScanLocalBookOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */; }; 97D681251D6F70AC00E5FA99 /* ScanLocalBookOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */; };
97D681261D6F70AC00E5FA99 /* SearchOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */; }; 97D681261D6F70AC00E5FA99 /* SearchOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */; };
@ -337,7 +337,7 @@
97D452C11D1871E70033666F /* SearchTabController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SearchTabController.swift; path = "Kiwix-iOS/Controller/Search/SearchTabController.swift"; sourceTree = SOURCE_ROOT; }; 97D452C11D1871E70033666F /* SearchTabController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SearchTabController.swift; path = "Kiwix-iOS/Controller/Search/SearchTabController.swift"; sourceTree = SOURCE_ROOT; };
97D55EF51D2075180081B523 /* TableOfContentsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TableOfContentsController.swift; path = "Kiwix-iOS/Controller/TableOfContentsController.swift"; sourceTree = SOURCE_ROOT; }; 97D55EF51D2075180081B523 /* TableOfContentsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TableOfContentsController.swift; path = "Kiwix-iOS/Controller/TableOfContentsController.swift"; sourceTree = SOURCE_ROOT; };
97D6811A1D6E2A7100E5FA99 /* DownloadTasksController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadTasksController.swift; sourceTree = "<group>"; }; 97D6811A1D6E2A7100E5FA99 /* DownloadTasksController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadTasksController.swift; sourceTree = "<group>"; };
97D6811C1D6F70AC00E5FA99 /* GlobalOperationQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalOperationQueue.swift; sourceTree = "<group>"; }; 97D6811C1D6F70AC00E5FA99 /* GlobalQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GlobalQueue.swift; sourceTree = "<group>"; };
97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshLibraryOperation.swift; sourceTree = "<group>"; }; 97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RefreshLibraryOperation.swift; sourceTree = "<group>"; };
97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanLocalBookOperation.swift; sourceTree = "<group>"; }; 97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanLocalBookOperation.swift; sourceTree = "<group>"; };
97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchOperation.swift; sourceTree = "<group>"; }; 97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchOperation.swift; sourceTree = "<group>"; };
@ -973,7 +973,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
97DF259B1D6F7612001648A3 /* BookOperation.swift */, 97DF259B1D6F7612001648A3 /* BookOperation.swift */,
97D6811C1D6F70AC00E5FA99 /* GlobalOperationQueue.swift */, 97D6811C1D6F70AC00E5FA99 /* GlobalQueue.swift */,
97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */, 97D6811D1D6F70AC00E5FA99 /* RefreshLibraryOperation.swift */,
97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */, 97D6811E1D6F70AC00E5FA99 /* ScanLocalBookOperation.swift */,
97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */, 97D6811F1D6F70AC00E5FA99 /* SearchOperation.swift */,
@ -1519,7 +1519,7 @@
97D681421D6F712800E5FA99 /* Language+CoreDataProperties.swift in Sources */, 97D681421D6F712800E5FA99 /* Language+CoreDataProperties.swift in Sources */,
97D681371D6F711A00E5FA99 /* Article.swift in Sources */, 97D681371D6F711A00E5FA99 /* Article.swift in Sources */,
971A104A1D022CBE007FC62C /* SearchResultTBVC.swift in Sources */, 971A104A1D022CBE007FC62C /* SearchResultTBVC.swift in Sources */,
97D681231D6F70AC00E5FA99 /* GlobalOperationQueue.swift in Sources */, 97D681231D6F70AC00E5FA99 /* GlobalQueue.swift in Sources */,
97A1FD3B1D6F724E00A80EE2 /* stringTools.cpp in Sources */, 97A1FD3B1D6F724E00A80EE2 /* stringTools.cpp in Sources */,
97A1FD321D6F723D00A80EE2 /* resourceTools.cpp in Sources */, 97A1FD321D6F723D00A80EE2 /* resourceTools.cpp in Sources */,
971A10321D022AD5007FC62C /* SearchBar.swift in Sources */, 971A10321D022AD5007FC62C /* SearchBar.swift in Sources */,

6
Kiwix/Operations/GlobalOperationQueue.swift → Kiwix/Operations/GlobalQueue.swift
View File

@ -1,5 +1,5 @@
// //
// GlobalOperationQueue.swift // GlobalQueue.swift
// Kiwix // Kiwix
// //
// Created by Chris Li on 5/14/16. // Created by Chris Li on 5/14/16.
@ -8,8 +8,8 @@
import Operations import Operations
class GlobalOperationQueue: OperationQueue { class GlobalQueue: OperationQueue {
static let sharedInstance = GlobalOperationQueue() static let shared = GlobalQueue()
} }
public enum OperationErrorCode: Int { public enum OperationErrorCode: Int {

2
Kiwix/Operations/UIOperations.swift
View File

@ -90,7 +90,7 @@ class GetStartedAlert: AlertOperation<MainController> {
} }
addActionWithTitle(NSLocalizedString("Import", comment: comment), style: .Default) { (alert) in addActionWithTitle(NSLocalizedString("Import", comment: comment), style: .Default) { (alert) in
let operation = ShowHelpPageOperation(type: .ImportBookLearnMore, presentationContext: mainController) let operation = ShowHelpPageOperation(type: .ImportBookLearnMore, presentationContext: mainController)
GlobalOperationQueue.sharedInstance.addOperation(operation) GlobalQueue.shared.addOperation(operation)
} }
addActionWithTitle(NSLocalizedString("Dismiss", comment: comment)) addActionWithTitle(NSLocalizedString("Dismiss", comment: comment))
} }

2
Kiwix/ZimMultiReader/ZimMultiReader.swift
View File

@ -45,7 +45,7 @@ class ZimMultiReader: NSObject, DirectoryMonitorDelegate {
self.delegate?.firstBookAdded() self.delegate?.firstBookAdded()
} }
} }
GlobalOperationQueue.sharedInstance.addOperation(scanOperation) GlobalQueue.shared.addOperation(scanOperation)
self.scanOperation = scanOperation self.scanOperation = scanOperation
} }