1 files changed, 44 insertions, 9 deletions

diff --git a/src/Client/UserListCommands.cpp b/src/Client/UserListCommands.cpp
index d602579..581b060 100644
--- a/src/Client/UserListCommands.cpp
+++ b/src/Client/UserListCommands.cpp
@@ -24,6 +24,7 @@
 #include "Requests/UserLists/UserListListRequest.h"
 #include "Requests/UserLists/UserListDownloadRequest.h"
 #include "Requests/UserLists/UserListDiffListRequest.h"
+#include "Requests/UserLists/UserListUploadRequest.h"
 
 #include <Common/RequestManager.h>
 #include <Common/UserLists/UserList.h>
@@ -188,7 +189,7 @@ void UserListCommands::showListCommand(CommandParser *commandParser, const std::
   }
 }
 
-void UserListCommands::importCommand(CommandParser* /*commandParser*/, const std::vector<Core::String> &args) {
+void UserListCommands::importCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
   if(args.size() < 3) {
     std::cerr << args[0] << " " << args[1] << ": No filename given." << std::endl;
     printUsage("import");
@@ -238,9 +239,9 @@ void UserListCommands::importCommand(CommandParser* /*commandParser*/, const std
       std::cout << std::endl << std::endl;
       std::cout << "Does the first line of the worksheet contain the column names? (Y/n) " << std::flush;
 
-      std::string input;
-      std::getline(std::cin, input);
-      if(input.empty() || (input[0] != 'n' && input[0] != 'N')) {
+      Core::String input = Core::String::getline(std::cin);
+      input.toLower();
+      if(input.isEmpty() || input[0] != 'n') {
         (*sheet)->useFirstRowAsColumnNames(true);
       }
 
@@ -248,7 +249,7 @@ void UserListCommands::importCommand(CommandParser* /*commandParser*/, const std
       printSheet(**sheet, 10);
       std::cout << std::endl << std ::endl;
 
-      Common::UserLists::UserList userList;
+      boost::shared_ptr<Common::UserLists::UserList> userList(new Common::UserLists::UserList);
       const std::vector<XLSSheet::RowType> &rows = (*sheet)->getRows();
       unsigned id = 1;
 
@@ -264,11 +265,45 @@ void UserListCommands::importCommand(CommandParser* /*commandParser*/, const std
           entry.setDetail((*sheet)->getColumnName(col), row[col]);
         }
 
-        userList.addUser(entry);
+        userList->addUser(entry);
       }
 
-      printUserList(userList);
-      std::cout << std::endl << std ::endl;
+      bool overwrite = false;
+      Core::String name;
+
+      while(true) {
+        if(!overwrite) {
+          std::cout << "Save the user list as: " << std::flush;
+          name = Core::String::getline(std::cin);
+        }
+
+        boost::shared_ptr<UserLists::UserListUploadRequest> request(new UserLists::UserListUploadRequest(
+            commandParser->application, name, userList, overwrite));
+        commandParser->application->getRequestManager()->sendRequest(commandParser->connection, request);
+        request->wait();
+
+        std::pair<boost::shared_ptr<const Common::XmlData>, Core::Exception> result = request->getResult();
+        if(result.second) {
+          if(!overwrite && result.second.getErrorCode() == Core::Exception::DUPLICATE_ENTRY) {
+            std::cout << "There is already a user list stored under that name. Overwrite? (y/N) " << std::flush;
+            input = Core::String::getline(std::cin);
+            std::cout << std::endl;
+
+            input.toLower();
+            if(!input.isEmpty() && input[0] == 'y')
+              overwrite = true;
+
+            continue;
+          }
+
+          std::cerr << "An error occurred during your request: " << result.second.what() << "." << std::endl;
+          return;
+        }
+
+        break;
+      }
+
+      std::cout << "User list stored." << std::endl << std::endl;
     }
     catch(Core::Exception e) {
       std::cerr << "The file can't be read: " << e.what() << "." << std::endl;
@@ -416,7 +451,7 @@ void UserListCommands::printPadded(const Core::String &str, boost::int32_t lengt
 }
 
 void UserListCommands::printDelimiter(boost::int32_t length) {
-  printPadded(Core::String(std::string(length, '-').c_str()), length);
+  printPadded(Core::String::fromString(std::string(length, '-')), length);
 }