From c1edab0f054716ab963a702c8f67a669a5dc3fe7 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Wed, 13 Jul 2016 09:59:21 -0400 Subject: [PATCH] Refactor and version bump --- Kiwix-iOS/Info.plist | 4 ++-- Kiwix-iOS/iOSExtensions.swift | 2 +- Kiwix.xcodeproj/project.pbxproj | 4 ++++ Kiwix/FileManager.swift | 8 +++++++- Kiwix/Operations/ScanLocalBookOperation.swift | 13 +++++++++++++ Kiwix/ZimMultiReader/SearchResult.swift | 2 +- Kiwix/ZimMultiReader/ZimMultiReader.swift | 6 +++--- 7 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 Kiwix/Operations/ScanLocalBookOperation.swift diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index a95053fa..add263c7 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -32,11 +32,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.6 + 1.6.1 CFBundleSignature ???? CFBundleVersion - 1583 + 1 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOS/iOSExtensions.swift b/Kiwix-iOS/iOSExtensions.swift index ad200e57..34db4a4d 100644 --- a/Kiwix-iOS/iOSExtensions.swift +++ b/Kiwix-iOS/iOSExtensions.swift @@ -42,7 +42,7 @@ enum BuildStatus { extension UIApplication { class var buildStatus: BuildStatus { get { - return .Release + return .Alpha } } } diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index e1246ea4..cb900e51 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -117,6 +117,7 @@ 973DD41E1D34428F009D45DB /* ZimMultiReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973DD41B1D34428F009D45DB /* ZimMultiReader.swift */; }; 973DD4211D34434C009D45DB /* SearchResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973DD4201D34434C009D45DB /* SearchResult.swift */; }; 973DD4231D3443A3009D45DB /* ExtensionAndTypealias.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973DD4221D3443A3009D45DB /* ExtensionAndTypealias.swift */; }; + 973DD4251D344558009D45DB /* ScanLocalBookOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973DD4241D344558009D45DB /* ScanLocalBookOperation.swift */; }; 975227821D020560001D1DDE /* Indexer.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 975227811D020560001D1DDE /* Indexer.storyboard */; }; 975227991D020C00001D1DDE /* indexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 975227921D020C00001D1DDE /* indexer.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; 9752279B1D020C00001D1DDE /* otherTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 975227931D020C00001D1DDE /* otherTools.cpp */; }; @@ -364,6 +365,7 @@ 973DD41B1D34428F009D45DB /* ZimMultiReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ZimMultiReader.swift; path = ZimMultiReader/ZimMultiReader.swift; sourceTree = ""; }; 973DD4201D34434C009D45DB /* SearchResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SearchResult.swift; path = ZimMultiReader/SearchResult.swift; sourceTree = ""; }; 973DD4221D3443A3009D45DB /* ExtensionAndTypealias.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ExtensionAndTypealias.swift; path = ZimMultiReader/ExtensionAndTypealias.swift; sourceTree = ""; }; + 973DD4241D344558009D45DB /* ScanLocalBookOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ScanLocalBookOperation.swift; path = Operations/ScanLocalBookOperation.swift; sourceTree = ""; }; 97497B5A1D07487000ECD691 /* indexer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = indexer.h; path = "Kiwix/libkiwix/C&C++/indexer.h"; sourceTree = ""; }; 97497B5B1D07487000ECD691 /* resourceTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = resourceTools.h; path = "Kiwix/libkiwix/C&C++/resourceTools.h"; sourceTree = ""; }; 97497B5C1D074FB800ECD691 /* htmlparse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = htmlparse.h; path = "Kiwix/libkiwix/C&C++/xapian/htmlparse.h"; sourceTree = ""; }; @@ -1053,6 +1055,7 @@ 973DD4031D343F09009D45DB /* Basic */, 9779A1C31D34225E0071EFAB /* GlobalOperationQueue.swift */, 9779A1C51D34225E0071EFAB /* RefreshLibraryOperation.swift */, + 973DD4241D344558009D45DB /* ScanLocalBookOperation.swift */, 9779A1C61D34225E0071EFAB /* SearchOperation.swift */, 970C61961D34243600087758 /* URLSessionDownloadTaskOperation.swift */, ); @@ -1605,6 +1608,7 @@ 971046321D19B96E002141C0 /* XapianSearcher.mm in Sources */, 973C8D5C1C25F945007272F9 /* Preference.swift in Sources */, 975B90FE1CEB909100D13906 /* iOSExtensions.swift in Sources */, + 973DD4251D344558009D45DB /* ScanLocalBookOperation.swift in Sources */, 971A10521D022D9D007FC62C /* AppDelegate.swift in Sources */, 977998781C1E0B7900B1DD5E /* Language+CoreDataProperties.swift in Sources */, 97D452BE1D1723FF0033666F /* CollectionViewCells.swift in Sources */, diff --git a/Kiwix/FileManager.swift b/Kiwix/FileManager.swift index a0ac52a7..0e9a7749 100644 --- a/Kiwix/FileManager.swift +++ b/Kiwix/FileManager.swift @@ -72,9 +72,15 @@ class FileManager { } } + // MARK: - Contents of Doc Folder + + class var zimFileURLsInDocDir: [NSURL] { + return [NSURL]() + } + // MARK: - Item Operations - class func fileExistAtURL(url: NSURL) -> Bool { + class func itemExistAtURL(url: NSURL) -> Bool { guard let path = url.path else {return false} return NSFileManager.defaultManager().fileExistsAtPath(path) } diff --git a/Kiwix/Operations/ScanLocalBookOperation.swift b/Kiwix/Operations/ScanLocalBookOperation.swift new file mode 100644 index 00000000..4bf4a524 --- /dev/null +++ b/Kiwix/Operations/ScanLocalBookOperation.swift @@ -0,0 +1,13 @@ +// +// ScanLocalBookOperation.swift +// Kiwix +// +// Created by Chris Li on 7/11/16. +// Copyright © 2016 Chris. All rights reserved. +// + +import UIKit + +class ScanLocalBookOperation: NSObject { + +} diff --git a/Kiwix/ZimMultiReader/SearchResult.swift b/Kiwix/ZimMultiReader/SearchResult.swift index e9c9af85..39ab4693 100644 --- a/Kiwix/ZimMultiReader/SearchResult.swift +++ b/Kiwix/ZimMultiReader/SearchResult.swift @@ -10,7 +10,7 @@ import UIKit class SearchResult: CustomStringConvertible { let title: String - let path: String + let path: ArticlePath let bookID: ZimID let snippet: String? diff --git a/Kiwix/ZimMultiReader/ZimMultiReader.swift b/Kiwix/ZimMultiReader/ZimMultiReader.swift index 6b6cfb73..450aaa94 100644 --- a/Kiwix/ZimMultiReader/ZimMultiReader.swift +++ b/Kiwix/ZimMultiReader/ZimMultiReader.swift @@ -10,8 +10,10 @@ import CoreData import PSOperations class ZimMultiReader: NSObject, DirectoryMonitorDelegate { - static let sharedInstance = ZimMultiReader() + let searchQueue = OperationQueue() + weak var delegate: ZimMultiReaderDelegate? + private(set) var readers = [ZimID: ZimReader]() { didSet { if readers.count == 1 { @@ -20,8 +22,6 @@ class ZimMultiReader: NSObject, DirectoryMonitorDelegate { } } } - let searchQueue = OperationQueue() - weak var delegate: ZimMultiReaderDelegate? private let monitor = DirectoryMonitor(URL: FileManager.docDirURL) private var zimURLs = Set()