Refactor and version bump

This commit is contained in:
Chris Li 2016-07-13 09:59:21 -04:00
parent 5c97a4337c
commit c1edab0f05
7 changed files with 31 additions and 8 deletions

View File

@ -32,11 +32,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.6</string>
<string>1.6.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1583</string>
<string>1</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

View File

@ -42,7 +42,7 @@ enum BuildStatus {
extension UIApplication {
class var buildStatus: BuildStatus {
get {
return .Release
return .Alpha
}
}
}

View File

@ -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 = "<group>"; };
973DD4201D34434C009D45DB /* SearchResult.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SearchResult.swift; path = ZimMultiReader/SearchResult.swift; sourceTree = "<group>"; };
973DD4221D3443A3009D45DB /* ExtensionAndTypealias.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ExtensionAndTypealias.swift; path = ZimMultiReader/ExtensionAndTypealias.swift; sourceTree = "<group>"; };
973DD4241D344558009D45DB /* ScanLocalBookOperation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ScanLocalBookOperation.swift; path = Operations/ScanLocalBookOperation.swift; sourceTree = "<group>"; };
97497B5A1D07487000ECD691 /* indexer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = indexer.h; path = "Kiwix/libkiwix/C&C++/indexer.h"; sourceTree = "<group>"; };
97497B5B1D07487000ECD691 /* resourceTools.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = resourceTools.h; path = "Kiwix/libkiwix/C&C++/resourceTools.h"; sourceTree = "<group>"; };
97497B5C1D074FB800ECD691 /* htmlparse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = htmlparse.h; path = "Kiwix/libkiwix/C&C++/xapian/htmlparse.h"; sourceTree = "<group>"; };
@ -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 */,

View File

@ -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)
}

View File

@ -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 {
}

View File

@ -10,7 +10,7 @@ import UIKit
class SearchResult: CustomStringConvertible {
let title: String
let path: String
let path: ArticlePath
let bookID: ZimID
let snippet: String?

View File

@ -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<NSURL>()