diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index cae4aa3..64d589c 100644 Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 1771a8c..9f2bbcc 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,11 +10,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "500531783.995661" + timestampString = "500766163.891715" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "584" - endingLineNumber = "584" + startingLineNumber = "611" + endingLineNumber = "611" landmarkName = "publishItem(_:)" landmarkType = "5"> @@ -186,7 +186,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift" - timestampString = "500698081.826394" + timestampString = "500945316.10311" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "570" @@ -201,7 +201,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift" - timestampString = "500698081.826488" + timestampString = "500945316.10327" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "572" @@ -323,5 +323,259 @@ landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Vendoo/CategoriesTableViewController.swift b/Vendoo/CategoriesTableViewController.swift index cf4c1d3..50f38d9 100644 --- a/Vendoo/CategoriesTableViewController.swift +++ b/Vendoo/CategoriesTableViewController.swift @@ -41,7 +41,7 @@ class CategoriesTableViewController: UIViewController, UITableViewDelegate, UITa "Consumer Electronics", "Crafts", "Crochet", - "Dolls & Miniatures", + "Dolls & Bears", "DVDs & Movies", "Entertainment Memorabilia", "Everything Else", @@ -628,7 +628,7 @@ class CategoriesTableViewController: UIViewController, UITableViewDelegate, UITa case "Crafts": self.selectedCategory = "Crafts" break - case "Dolls & Miniatures": + case "Dolls & Bears": self.selectedCategory = "Dolls and Bears" self.potentialEtsy = true break diff --git a/Vendoo/ListingPreviewViewController.swift b/Vendoo/ListingPreviewViewController.swift index 8eff47a..eaa9ac5 100644 --- a/Vendoo/ListingPreviewViewController.swift +++ b/Vendoo/ListingPreviewViewController.swift @@ -328,7 +328,7 @@ extension ListingPreviewViewController { case "Crochet": categoryCode = EtsyRESTAPIManager.settingsDictionary["categories"]!["crochet"] as! Int break - case "Dolls & Miniatures": + case "Dolls and Bears": categoryCode = EtsyRESTAPIManager.settingsDictionary["categories"]!["dolls_and_miniatures"] as! Int break case "Everything Else": @@ -417,7 +417,7 @@ extension ListingPreviewViewController { networkIDs["etsy"] = results["listing_id"] as? Int self.newInProgressListing["networkIDs"] = networkIDs - let tmpDirURL = NSURL.fileURLWithPath(NSTemporaryDirectory(), isDirectory: true) + /*let tmpDirURL = NSURL.fileURLWithPath(NSTemporaryDirectory(), isDirectory: true) let fileURL = tmpDirURL.URLByAppendingPathComponent("main").URLByAppendingPathExtension("jpg") print("FilePath: \(fileURL.path!)") do { @@ -425,16 +425,43 @@ extension ListingPreviewViewController { }catch{ (error) print(error) + }*/ + + var imageBody: [String: AnyObject] = ["listing_id": networkIDs["etsy"] as! Int, + "type":"image/jpg"] + + for i in 0...(self.itemListingDictionary["pictures"] as! [UIImageView]).count - 1 { + switch (i) { + case 0: + imageBody["imageMain"] = UIImageJPEGRepresentation(self.itemPictureMain.image!, 0.45)! + imageBody["imgCount"] = 1 + break + case 1: + imageBody["image1"] = UIImageJPEGRepresentation(self.itemPictureSup1.image!, 0.45)! + imageBody["imgCount"] = 2 + break + case 2: + imageBody["image2"] = UIImageJPEGRepresentation(self.itemPictureSup2.image!, 0.45)! + imageBody["imgCount"] = 3 + break + case 3: + imageBody["image3"] = UIImageJPEGRepresentation(self.itemPictureMain.image!, 0.45)! + imageBody["imgCount"] = 4 + break + case 4: + imageBody["image4"] = UIImageJPEGRepresentation(self.itemPictureSup4.image!, 0.45)! + imageBody["imgCount"] = 5 + break + default: + break + } } - let imageBody = ["listing_id": networkIDs["etsy"] as! Int, - "type":"image/jpg", - "image": UIImageJPEGRepresentation(self.itemPictureMain.image!, 0.45)!] dispatch_group_leave(postingGroup) //@FIXME: Need to make etsy work with pictures - /* - self.etsyManager.sendPOSTRequest(("/private/listings/\(networkIDs["etsy"] as! Int)/images"), body: imageBody, onCompletion: { + + /*self.etsyManager.sendPOSTRequest(("/private/listings/\(networkIDs["etsy"] as! Int)/images"), body: imageBody, onCompletion: { (dict, error) -> Void in dispatch_group_leave(postingGroup)