From 30eed46b4f0d94f731c99bb04e37b2174be8fb87 Mon Sep 17 00:00:00 2001
From: Petr Bena <benapetr@gmail.com>
Date: Sun, 25 May 2014 14:44:45 +0200
Subject: [PATCH] some improvements

---
 README.md                  | 12 ++++++++++++
 stikkit/configuration.cpp  |  1 +
 stikkit/configuration.hpp  |  1 +
 stikkit/main.cpp           |  9 +++++++++
 stikkit/terminalparser.cpp |  5 ++++-
 5 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 49b5f48..5bb5deb 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,15 @@ make
 ```
 
 NOTE: you need to have libcurl-dev installed in your system
+
+Usage
+=====
+
+./stikkit -b <url>
+# now type text and hit ctrl+d to exit
+
+cat <file> | stikkit -b <url>
+
+<url> is an url to stikked server for example, if your server is http://something.blah/stikked and your api is http://something.blah/stikked/api then use http://something.blah/stikked as parameter to -b
+
+The url parameter can be stored to configuration file (stikkit will ask you in case there is none in config file)
diff --git a/stikkit/configuration.cpp b/stikkit/configuration.cpp
index cf1e5c3..e083ce3 100644
--- a/stikkit/configuration.cpp
+++ b/stikkit/configuration.cpp
@@ -22,6 +22,7 @@ unsigned int Configuration::Verbosity = 0;
 string Configuration::Source = "";
 string Configuration::URL = "";
 string Configuration::Expiry = "60";
+bool Configuration::Private = false;
 string Configuration::Author = "";
 string Configuration::Version = "1.0.0";
 string Configuration::Title = "";
diff --git a/stikkit/configuration.hpp b/stikkit/configuration.hpp
index 499cf5e..bfefb10 100644
--- a/stikkit/configuration.hpp
+++ b/stikkit/configuration.hpp
@@ -31,6 +31,7 @@ namespace Stikkit
             static string Version;
             static string Expiry;
             static string DefaultURL;
+            static bool Private;
             static string Home;
     };
 }
diff --git a/stikkit/main.cpp b/stikkit/main.cpp
index 6cb8fca..ee25a46 100644
--- a/stikkit/main.cpp
+++ b/stikkit/main.cpp
@@ -91,6 +91,15 @@ int main(int argc, char *argv[])
         post += curl_easy_escape(curl, Stikkit::Configuration::Source.c_str(), Stikkit::Configuration::Source.length());
         post += "&name=";
         post += curl_easy_escape(curl, Stikkit::Configuration::Author.c_str(), Stikkit::Configuration::Author.length());
+        if (Stikkit::Configuration::Title.length() > 0)
+        {
+            post += "&title=";
+            post += curl_easy_escape(curl, Stikkit::Configuration::Title.c_str(), Stikkit::Configuration::Title.length());
+        }
+        if (Stikkit::Configuration::Private)
+            post += "&private=1";
+        if (Stikkit::Configuration::Expiry != "0")
+            post += "&expire=" + Stikkit::Configuration::Expiry;
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
         curl_easy_setopt(curl, CURLOPT_URL, Stikkit::Configuration::URL.c_str());
         curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post.c_str());
diff --git a/stikkit/terminalparser.cpp b/stikkit/terminalparser.cpp
index 3b59f00..231f57f 100644
--- a/stikkit/terminalparser.cpp
+++ b/stikkit/terminalparser.cpp
@@ -106,9 +106,12 @@ void TerminalParser::DisplayHelp()
 
     cout << "Stikkit - open source pastebin uploader for Stikked\n\n"\
             "Parameters:\n"\
-            "  -a <name>:       Specify author name\n"\
+            "  -a <name>:       Specify author name by default the current OS username is used\n"\
             "  -b <url>:        Specify URL of Stikked server\n"\
             "  -v:              Increases verbosity\n"\
+            "  -t <title>:      Set a title for a paste\n"\
+            "  -p:              Mark a paste as private (not visible in recent pastes)\n"\
+            "  -e <minutes>:    Set expiry in minutes, parameter needs to be a number\n"\
             "  --version:       Display a version\n"\
             "  -h | --help:     Display this help\n\n"\
             "Note: every argument in [brackets] is optional\n"\