swift: Fix incorrect default rootDir
The default rootDir directory was using absoluteString instead of path
on a file NSURL, which resulted in file://path instead of the path
itself.
Change-Id: I322bfc49c3e606ad2818cb1ad9bfab7fe6d708de
diff --git a/Syncbase/Source/Syncbase.swift b/Syncbase/Source/Syncbase.swift
index 7d02ad2..bcb9898 100644
--- a/Syncbase/Source/Syncbase.swift
+++ b/Syncbase/Source/Syncbase.swift
@@ -75,7 +75,7 @@
rootDir: String = NSFileManager.defaultManager()
.URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask)[0]
.URLByAppendingPathComponent("Syncbase")
- .absoluteString,
+ .path!,
mountPoints: [String] = ["/ns.dev.v.io:8101/tmp/todos/users/"],
defaultBlessingStringPrefix: String = "dev.v.io:o:608941808256-43vtfndets79kf5hac8ieujto8837660.apps.googleusercontent.com:",
disableSyncgroupPublishing: Bool = false,
diff --git a/Syncbase/Tests/BasicDatabaseTests.swift b/Syncbase/Tests/BasicDatabaseTests.swift
index eba0109..2a3f191 100644
--- a/Syncbase/Tests/BasicDatabaseTests.swift
+++ b/Syncbase/Tests/BasicDatabaseTests.swift
@@ -15,7 +15,7 @@
let rootDir = NSFileManager.defaultManager()
.URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask)[0]
.URLByAppendingPathComponent("SyncbaseUnitTest")
- .absoluteString
+ .path!
// TODO(zinman): Once we have create-and-join implemented don't always set
// disableUserdataSyncgroup to true.
try! Syncbase.configure(
diff --git a/SyncbaseCore/Source/Syncbase.swift b/SyncbaseCore/Source/Syncbase.swift
index bbdbfcf..25a151e 100644
--- a/SyncbaseCore/Source/Syncbase.swift
+++ b/SyncbaseCore/Source/Syncbase.swift
@@ -17,7 +17,7 @@
rootDir rootDir: String = NSFileManager.defaultManager()
.URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask)[0]
.URLByAppendingPathComponent("Syncbase")
- .absoluteString,
+ .path!,
queue: dispatch_queue_t = dispatch_get_main_queue()) throws {
if didInit {
throw SyncbaseError.AlreadyConfigured
diff --git a/SyncbaseCore/Tests/BasicDatabaseTests.swift b/SyncbaseCore/Tests/BasicDatabaseTests.swift
index 1ae4913..7523c3c 100644
--- a/SyncbaseCore/Tests/BasicDatabaseTests.swift
+++ b/SyncbaseCore/Tests/BasicDatabaseTests.swift
@@ -19,7 +19,7 @@
let rootDir = NSFileManager.defaultManager()
.URLsForDirectory(.ApplicationSupportDirectory, inDomains: .UserDomainMask)[0]
.URLByAppendingPathComponent("SyncbaseUnitTest")
- .absoluteString
+ .path!
try! Syncbase.configure(rootDir: rootDir, queue: testQueue)
let semaphore = dispatch_semaphore_create(0)
Syncbase.login(EmptyCredentials(), callback: { err in
