Removed wxCurl code. Now using libcurl library directly.

src/AccelListBox.h

@@ -24,10 +24,10 @@
 
 #include "ItemListBox.h"
 
-class guLibPanel;
-
 namespace Guayadeque {
 
+class guLibPanel;
+
 // -------------------------------------------------------------------------------- //
 class guAccelListBox : public guListBox
 {

src/AcousticId.cpp

@@ -20,11 +20,11 @@
 #include "AcousticId.h"
 
 #include "EventCommandIds.h"
-#include "curl/http.h"
 #include "MusicBrainz.h"
 #include "Utils.h"
 #include "Version.h"
 
+#include <wx/sstream.h>
 #include <wx/uri.h>
 
 namespace Guayadeque {

src/AudioScrobble.cpp

@@ -24,7 +24,6 @@
 #include "PlayerPanel.h"
 #include "Utils.h"
 
-#include <wx/curl/http.h>
 #include <wx/tokenzr.h>
 
 namespace Guayadeque {
@@ -108,12 +107,11 @@ bool guAudioScrobbleSender::GetSessionId( void )
 
     //guLogMessage( wxT( "AudioScrobble:GetSesionId : " ) + AS_Url );
     char * Buffer = NULL;
-    wxCurlHTTP http;
-    http.AddHeader( wxT( "User-Agent: " ) guDEFAULT_BROWSER_USER_AGENT );
-    http.AddHeader( wxT( "Accept: text/html" ) );
-    http.AddHeader( wxT( "Accept-Charset: utf-8" ) );
-    http.SetOpt( CURLOPT_FOLLOWLOCATION, 1 );
-    http.Get( Buffer, AS_Url );
+    guHttp Http;
+    Http.AddHeader( wxT( "User-Agent" ), guDEFAULT_BROWSER_USER_AGENT );
+    Http.AddHeader( wxT( "Accept" ), wxT( "text/html" ) );
+    Http.AddHeader( wxT( "Accept-Charset" ), wxT( "utf-8" ) );
+    Http.Get( Buffer, AS_Url );
     if( Buffer )
     {
         Content = wxString( Buffer, wxConvUTF8 );
@@ -168,7 +166,7 @@ bool guAudioScrobbleSender::SubmitPlayedSongs( const guAS_SubmitInfoArray &Playe
     wxString    Artist;
     wxString    Album;
     wxString    Track;
-    wxCurlHTTP  http;
+    guHttp      Http;
 
     /*
         s=<sessionID>
@@ -243,11 +241,10 @@ bool guAudioScrobbleSender::SubmitPlayedSongs( const guAS_SubmitInfoArray &Playe
         PostData.RemoveLast( 1 ); // we remove the last & added
 
         //guLogMessage( wxT( "AudioScrobble::Played : %s" ), PostData.c_str() );
-        http.AddHeader( wxT( "Content-Type: application/x-www-form-urlencoded" ) );
-        http.SetOpt( CURLOPT_FOLLOWLOCATION, 1 );
-        if( http.Post( wxCURL_STRING2BUF( PostData ), PostData.Length(), m_SubmitUrl ) )
+        Http.AddHeader( wxT( "Content-Type" ), wxT( "application/x-www-form-urlencoded" ) );
+        if( Http.Post( PostData.ToAscii(), PostData.Length(), m_SubmitUrl ) )
         {
-            Content = http.GetResponseBody();
+            Content = Http.GetResData();
             if( !Content.IsEmpty() )
             {
                 //guLogMessage( wxT( "AudioScrobble::Response :\n%s" ), Content.c_str() );
@@ -272,7 +269,7 @@ bool guAudioScrobbleSender::SubmitPlayedSongs( const guAS_SubmitInfoArray &Playe
 // -------------------------------------------------------------------------------- //
 bool guAudioScrobbleSender::SubmitNowPlaying( const guAS_SubmitInfo * cursong )
 {
-    wxCurlHTTP  http;
+    guHttp      Http;
     wxString    PostData;
     wxString    Content;
     wxString    Artist;
@@ -302,11 +299,10 @@ bool guAudioScrobbleSender::SubmitNowPlaying( const guAS_SubmitInfo * cursong )
 
     //guLogMessage( wxT( "AudioScrobble::NowPlaying : " ) + m_NowPlayUrl + PostData );
 
-    http.AddHeader( wxT( "Content-Type: application/x-www-form-urlencoded" ) );
-    http.SetOpt( CURLOPT_FOLLOWLOCATION, 1 );
-    if( http.Post( wxCURL_STRING2BUF( PostData ), PostData.Length(), m_NowPlayUrl ) )
+    Http.AddHeader( wxT( "Content-Type" ), wxT( "application/x-www-form-urlencoded" ) );
+    if( Http.Post( PostData.ToAscii(), PostData.Length(), m_NowPlayUrl ) )
     {
-        Content = http.GetResponseBody();
+        Content = Http.GetResData();
         //guLogMessage( wxT( "%i : %s" ), http.GetResponseCode(), Content.c_str() );
         if( !Content.IsEmpty() )
         {

src/CMakeLists.txt

@@ -11,10 +11,9 @@ ENDIF( PROFILE )
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/wx
-        ${CMAKE_CURRENT_SOURCE_DIR}/wx/curl
         ${CMAKE_CURRENT_SOURCE_DIR}/dbus
         ${CMAKE_CURRENT_SOURCE_DIR}/hmac
+        ${CMAKE_CURRENT_SOURCE_DIR}/network
         ${GSTREAMER_INCLUDE_DIRS}
         ${GSTREAMER_CTRL_INCLUDE_DIRS}
         ${SQLITE3_INCLUDE_DIRS}
@@ -29,12 +28,6 @@ INCLUDE_DIRECTORIES(
         ${LIBAPPINDICATOR_INCLUDE_DIRS}
         ${LIBWXSQLITE3_INCLUDE_DIRS}
         ${LIBWXSQLITE330_INCLUDE_DIRS}
-
-)
-
-SET( CURL_SOURCES
-        curl/base.cpp
-        curl/http.cpp 
 )
 
 SET( DBUS_SOURCES
@@ -59,6 +52,13 @@ SET( HMAC_SHA2_SOURCES
         hmac/sha2.h
 )
 
+SET( NETWORK_SOURCES
+        network/Curl.cpp
+        network/Curl.h
+        network/Http.cpp
+        network/Http.h
+)
+
 ADD_EXECUTABLE( guayadeque
         AlListBox.cpp
         AlListBox.h
@@ -285,9 +285,9 @@ ADD_EXECUTABLE( guayadeque
         AcousticId.h
         MusicBrainz.cpp
         MusicBrainz.h
-        ${CURL_SOURCES}
         ${DBUS_SOURCES}
         ${HMAC_SHA2_SOURCES}
+        ${NETWORK_SOURCES}
 )
 
 TARGET_LINK_LIBRARIES( guayadeque

src/CoverEdit.cpp

@@ -33,7 +33,6 @@
 #include "Yahoo.h"
 
 #include <wx/arrimpl.cpp>
-#include <wx/curl/http.h>
 #include <wx/statline.h>
 
 #define MAX_COVERLINKS_ITEMS            30

src/Google.cpp

@@ -23,7 +23,6 @@
 #include "Utils.h"
 
 #include <wx/arrimpl.cpp>
-#include <wx/curl/http.h>
 #include <wx/statline.h>
 #include <wx/html/htmlpars.h>
 

src/LastFM.cpp

@@ -23,7 +23,7 @@
 #include "DbCache.h"
 #include "Utils.h"
 
-#include "curl/http.h"
+#include "Http.h"
 
 #include <wx/arrimpl.cpp>
 #include <wx/sstream.h>
@@ -98,7 +98,7 @@ wxString guLastFMRequest::DoRequest( const bool AddSign, const bool IsGetAction
     int         Index;
     int         Count;
     wxString    RetVal = wxEmptyString;
-    wxCurlHTTP  http;
+    guHttp      Http;
     char *      Buffer = NULL;
     wxString    UrlStr = wxEmptyString; // = LASTFM_API_ROOT;
 
@@ -131,12 +131,11 @@ wxString guLastFMRequest::DoRequest( const bool AddSign, const bool IsGetAction
         if( RetVal.IsEmpty() )
         {
             // Only with a UserAgent is accepted the Charset requested
-            http.AddHeader( wxT( "User-Agent: " ) guDEFAULT_BROWSER_USER_AGENT );
-            http.AddHeader( wxT( "Accept: text/html" ) );
-            http.AddHeader( wxT( "Accept-Charset: utf-8" ) );
+            Http.AddHeader( wxT( "User-Agent" ), guDEFAULT_BROWSER_USER_AGENT );
+            Http.AddHeader( wxT( "Accept" ), wxT( "text/html" ) );
+            Http.AddHeader( wxT( "Accept-Charset" ), wxT( "utf-8" ) );
             //guLogMessage( wxT( "LastFM.DoRequest %s\n" ), UrlStr.c_str() );
-            http.SetOpt( CURLOPT_FOLLOWLOCATION, 1 );
-            http.Get( Buffer, UrlStr );
+            Http.Get( Buffer, UrlStr );
 
             if( Buffer )
             {
@@ -160,7 +159,7 @@ wxString guLastFMRequest::DoRequest( const bool AddSign, const bool IsGetAction
     else
     {
         //guLogMessage( wxT( "LastFM.DoRequest POST %s\n" ), UrlStr.c_str() );
-        http.Post( UrlStr.Mid( 1 ).char_str(), UrlStr.Length() - 1, LASTFM_API_ROOT );
+        Http.Post( UrlStr.Mid( 1 ).char_str(), UrlStr.Length() - 1, LASTFM_API_ROOT );
     }
 
 //    else

src/LastFMPanel.cpp

@@ -20,7 +20,7 @@
 #include "LastFMPanel.h"
 
 #include "EventCommandIds.h"
-#include "curl/http.h"
+#include "Http.h"
 #include "Images.h"
 #include "MainApp.h"
 #include "Settings.h"

src/LyricsPanel.cpp

@@ -21,7 +21,6 @@
 
 #include "EventCommandIds.h"
 #include "Config.h"
-#include "curl/http.h"
 #include "Preferences.h"
 #include "Images.h"
 #include "ListView.h"
@@ -38,6 +37,7 @@
 #include <wx/txtstrm.h>
 #include <wx/xml/xml.h>
 #include <wx/regex.h>
+#include <wx/sstream.h>
 #include <wx/tokenzr.h>
 
 namespace Guayadeque {

src/MainApp.cpp

@@ -20,6 +20,7 @@
 #include "MainApp.h"
 
 #include "Config.h"
+#include "Curl.h"
 #include "Images.h"
 #include "MainFrame.h"
 #include "mpris.h"
@@ -28,7 +29,6 @@
 #include "Utils.h"
 
 #include "wx/clipbrd.h"
-#include <wx/curl/base.h>
 #include <wx/image.h>
 #include <wx/tooltip.h>
 #include <wx/stdpaths.h>
@@ -345,8 +345,8 @@ bool guMainApp::OnInit()
     // Use the primary clipboard which is shared with other applications
     wxTheClipboard->UsePrimarySelection( false );
 
-    // Init the wxCurl Lib
-    wxCurlBase::Init();
+    // Init the Curl Library
+    guCurl::CurlInit();
 
     int LangId = m_Config->ReadNum( wxT( "Language" ), wxLANGUAGE_DEFAULT, wxT( "general" ) );
     if( m_Locale.Init( LangId ) )
@@ -414,8 +414,8 @@ bool guMainApp::OnInit()
 // -------------------------------------------------------------------------------- //
 int guMainApp::OnExit()
 {
-    // Shutdown the wxCurl Lib
-    wxCurlBase::Shutdown();
+    // Free any resources used by Curl Library
+    guCurl::CurlDone();
 
     return 0;
 }

src/MainFrame.h

@@ -25,7 +25,7 @@
 #include "Config.h"
 #include "CoverPanel.h"
 #include "Collections.h"
-#include "curl/http.h"
+#include "Http.h"
 #include "dbus/gudbus.h"
 #include "dbus/mpris.h"
 #include "dbus/mpris2.h"

src/MusicBrainz.cpp

@@ -19,8 +19,8 @@
 // -------------------------------------------------------------------------------- //
 #include "MusicBrainz.h"
 
+//#include "Http.h"
 #include "Utils.h"
-#include "curl/http.h"
 
 #include <wx/arrimpl.cpp>
 #include <wx/sstream.h>

src/Podcasts.h

@@ -20,10 +20,9 @@
 #ifndef PODCASTS_H
 #define PODCASTS_H
 
-#include "curl/http.h"
-
 #include <wx/dynarray.h>
 #include <wx/xml/xml.h>
+#include <wx/event.h>
 
 namespace Guayadeque {
 

src/PodcastsPanel.cpp

@@ -29,7 +29,6 @@
 #include "NewChannel.h"
 #include "Utils.h"
 
-#include <wx/curl/http.h>
 #include <wx/regex.h>
 #include <wx/sstream.h>
 #include <wx/uri.h>

src/Shoutcast.cpp

@@ -80,6 +80,7 @@
 
 #include <wx/xml/xml.h>
 #include <wx/fileconf.h>
+#include <wx/sstream.h>
 
 namespace Guayadeque {
 

src/ShoutcastRadio.cpp

@@ -23,15 +23,14 @@
 #include "Config.h"
 #include "DbCache.h"
 #include "DbRadios.h"
+#include "Http.h"
 #include "Images.h"
 #include "MainFrame.h"
 #include "RadioPanel.h"
 #include "RadioEditor.h"
 #include "RadioGenreEditor.h"
 #include "StatusBar.h"
 
-#include "curl/http.h"
-
 #include <wx/wfstream.h>
 #include <wx/tokenzr.h>
 #include <wx/xml/xml.h>

src/TuneInRadio.cpp

@@ -22,14 +22,14 @@
 #include "Accelerators.h"
 #include "DbCache.h"
 #include "DbRadios.h"
+#include "Http.h"
 #include "Images.h"
 #include "RadioPanel.h"
 #include "RadioEditor.h"
 
-#include "curl/http.h"
-
-#include <wx/wfstream.h>
+#include <wx/sstream.h>
 #include <wx/tokenzr.h>
+#include <wx/wfstream.h>
 #include <wx/xml/xml.h>
 
 namespace Guayadeque {
@@ -166,16 +166,14 @@ wxString GetTuneInUrl( const wxString &url )
     if( Content.IsEmpty() )
     {
         char *      Buffer = NULL;
-        wxCurlHTTP  http;
+        guHttp      Http;
 
         // Only with a UserAgent is accepted the Charset requested
         //http.AddHeader( wxT( "User-Agent: " "Dalvik/1.6.0.(Linux;.U;.Android.4.1.1;.Galaxy.Nexus.Build/JRO03L)" ) );
-        http.AddHeader( wxT( "User-Agent: " ) guDEFAULT_BROWSER_USER_AGENT );
-        http.AddHeader( wxT( "Accept: text/html" ) );
-        http.AddHeader( wxT( "Accept-Charset: utf-8" ) );
-        http.SetOpt( CURLOPT_FOLLOWLOCATION, 1 );
-        http.Get( Buffer, url );
-
+        Http.AddHeader( wxT( "User-Agent" ), guDEFAULT_BROWSER_USER_AGENT );
+        Http.AddHeader( wxT( "Accept" ), wxT( "text/html" ) );
+        Http.AddHeader( wxT( "Accept-Charset" ), wxT( "utf-8" ) );
+        Http.Get( Buffer, url );
         if( Buffer )
         {
             Content = wxString( Buffer, wxConvUTF8 );