move http files to a separate directory

libgrive/CMakeLists.txt

@@ -34,6 +34,7 @@ file (GLOB XML_HEADERS
 
 file (GLOB LIBGRIVE_SRC
 	src/drive/*.cc
+	src/http/*.cc
 	src/protocol/*.cc
 	src/util/*.cc
 	src/xml/*.cc

libgrive/src/drive/Drive.cc

@@ -21,7 +21,7 @@
 
 #include "File.hh"
 
-#include "protocol/HTTP.hh"
+#include "http/HTTP.hh"
 #include "protocol/Json.hh"
 #include "protocol/JsonResponse.hh"
 #include "protocol/OAuth2.hh"

libgrive/src/drive/File.cc

@@ -19,10 +19,10 @@
 
 #include "File.hh"
 
-#include "protocol/Download.hh"
+#include "http/Download.hh"
+#include "http/StringResponse.hh"
 #include "protocol/Json.hh"
 #include "protocol/OAuth2.hh"
-#include "protocol/StringResponse.hh"
 #include "util/OS.hh"
 #include "util/Path.hh"
 

libgrive/src/drive/File.hh

@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "protocol/HTTP.hh"
+#include "http/HTTP.hh"
 #include "util/DateTime.hh"
 
 #include <iosfwd>

libgrive/src/protocol/JsonResponse.cc

@@ -19,7 +19,7 @@
 
 #include "JsonResponse.hh"
 
-#include "Json.hh"
+#include "protocol/Json.hh"
 
 namespace gr { namespace http {
 

libgrive/src/protocol/JsonResponse.hh

@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "Receivable.hh"
-#include "StringResponse.hh"
+#include "http/Receivable.hh"
+#include "http/StringResponse.hh"
 
 namespace gr
 {

libgrive/src/protocol/OAuth2.cc

@@ -19,9 +19,10 @@
 
 #include "OAuth2.hh"
 
-#include "protocol/HTTP.hh"
-#include "protocol/Json.hh"
-#include "protocol/JsonResponse.hh"
+#include "JsonResponse.hh"
+#include "Json.hh"
+
+#include "http/HTTP.hh"
 
 // for debugging
 #include <iostream>
@@ -99,10 +100,8 @@ void OAuth2::Refresh( )
 	http::Agent			http ;
 
 	http.Post( token_url, post, &resp ) ;
-std::cout << "here" << std::endl ;
 
-	Json jresp	= resp.Response() ;
-	m_access	= jresp["access_token"].As<std::string>() ;
+	m_access	= resp.Response()["access_token"].As<std::string>() ;
 }
 
 std::string OAuth2::RefreshToken( ) const