Commit: 0be998724ab378203f0039ba905f6095782ab769 - nlite (git)

Commit MetaInfo

• Revisión: 0be998724ab378203f0039ba905f6095782ab769 (tree)
• Tiempo: 2012-03-27 00:09:18
• Autor: qwerty2501 <qwerty2501@user...>
• Commiter: qwerty2501

Log Message

cookie取得処理完全実装

Cambiar Resumen

• modified: nlite.suo
• modified: nlite_common/bugreport.cpp
• modified: nlite_common/bugreport.h
• add: nlite_common/commanage.h
• modified: nlite_common/http.cpp
• modified: nlite_common/http.h
• modified: nlite_common/nexception.cpp
• modified: nlite_common/nlite_common.vcxproj
• modified: nlite_common/nlite_common.vcxproj.filters
• add: nlite_common/singleton.h
• modified: nlite_common/stdafx.h
• modified: nlite_common/unit_test.cpp
• modified: nlite_cookie/cookieGetResult.cpp
• modified: nlite_cookie/cookieGetResult.h
• modified: nlite_cookie/cookieGetter.h
• add: nlite_cookie/cookiemaster.cpp
• add: nlite_cookie/cookiemaster.h
• modified: nlite_cookie/ieapicookiegetter.h
• modified: nlite_cookie/iecomponentcookiegetter.cpp
• modified: nlite_cookie/iecookiegetter.cpp
• modified: nlite_cookie/nlite_cookie.vcxproj
• modified: nlite_cookie/nlite_cookie.vcxproj.filters
• modified: nlite_cookie/stdafx.h
• modified: nlite_cookie/unit_test.cpp
• modified: nlite_test/nlite_test.cpp

Diferencia incremental

Binary files a/nlite.suo and b/nlite.suo differ

--- a/nlite_common/bugreport.cpp
+++ b/nlite_common/bugreport.cpp
@@ -2,41 +2,64 @@
 #include "appinfo.h"
 #include "function.h"
 #include "bugreport.h"
-
+#include "commanage.h"
 
 #include "namespace_start.h"
 
 
-Bool BugTransfer::Report(BugTransfer &bug){
+Bool BugTransfer::Report()const{
 
 	Bool rslt = false;
-	CWinHttpClient httpClient;
+	
 	NString userId;
 	GetnliteUserId(userId);
 	nstringstream bugmessage;
 
 	bugmessage << _T("version=") << CApplicationInfo::getProductVersion() << _T("&");
 	bugmessage << _T("nliteUserId=") << userId << _T("&");
-	bugmessage << _T("summary=") << bug.summary << _T("&");
-	bugmessage << _T("function=") << bug.function << _T("&");
-	bugmessage << _T("sourcefile=") << bug.sourcefile << _T("&");
-	bugmessage << _T("line=") << bug.line << _T("&");
-	bugmessage << _T("windowsErrorCode=") << bug.windowsErrorCode << _T("&");
-	bugmessage << _T("windowsErrorMessage=") << bug.windowsErrorMessage << _T("&");
+	bugmessage << _T("summary=") << summary << _T("&");
+	bugmessage << _T("function=") << function << _T("&");
+	bugmessage << _T("sourcefile=") << sourcefile << _T("&");
+	bugmessage << _T("line=") << line << _T("&");
+	bugmessage << _T("windowsErrorCode=") << windowsErrorCode << _T("&");
+	bugmessage << _T("windowsErrorMessage=") << windowsErrorMessage << _T("&");
 	bugmessage << _T("osVersion=") << GetWindowsVersion();
 
 
 	nregex reg(_T("[\r|\n]"));
 	NString message(std::regex_replace(bugmessage.str(),reg,NString(_T(""))));
 	
-	//MString mmessage;
-	//ToUTF8(mmessage,message);
+	CWinHttpClient httpClient;
 	httpClient->Open(_T("POST"),_T("http://nlite.sourceforge.jp/cgi-bin/bugreport.rb"));
 	httpClient->SetRequestHeader(_T("Content-Type"),_T("application/x-www-form-urlencoded"));
 	httpClient->Send(message.c_str());
-	std::wcout << message << std::endl;
 	return rslt;
 }
 
 
+CBugReporter::CBugReporter(){
+
+
+}
+
+CBugReporter::~CBugReporter(){
+
+	this->m_threadgroup.join_all();
+
+}
+
+Void CBugReporter::Report(const BugTransfer& bug){
+
+
+	
+	
+	m_threadgroup.create_thread([
+		bug](Void) -> Bool { 
+			CComManage commanage;
+			return bug.Report(); 
+		});
+
+	return;
+}
+
 #include "namespace_end.h"
\ No newline at end of file

--- a/nlite_common/bugreport.h
+++ b/nlite_common/bugreport.h
@@ -1,9 +1,13 @@
 #pragma once
-
+#include <boost\thread.hpp>
 #include "define.h"
 #include "http.h"
 #include "windowsAPI.h"
+#include "singleton.h"
+
+
 #include "namespace_start.h"
+
 struct BugTransfer{
 	NString summary;
 	NString line;
@@ -15,7 +19,28 @@ struct BugTransfer{
 
 
 public:
-	static Bool Report(BugTransfer &bug);
+	Bool Report()const;
+
+};
+
+
+
+class CBugReporter:public SingletonT<CBugReporter>{
+
+private:
+	boost::thread_group m_threadgroup;
+
+
+public:
+	CBugReporter();
+
+	~CBugReporter();
+
+
+
+public:
+	Void Report(const BugTransfer& bug);
+
 
 };
 

--- /dev/null
+++ b/nlite_common/commanage.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <Windows.h>
+#include "namespace_start.h"
+
+
+class CComManage{
+
+public:
+
+	CComManage(){
+		::CoInitialize(nullptr);
+	}
+
+	~CComManage(){
+
+		::CoUninitialize();
+	}
+
+
+};
+
+
+#include "namespace_end.h"
\ No newline at end of file

--- a/nlite_common/http.cpp
+++ b/nlite_common/http.cpp
@@ -1,9 +1,11 @@
 #include "stdafx.h"
 #include "http.h"
 
-
+#include "namespace_start.h"
 CWinHttpClient::CWinHttpClient(){
 
 	this->CreateInstance(WinHttp::CLSID_WinHttpRequest);
 
-}
\ No newline at end of file
+}
+
+#include "namespace_end.h"
\ No newline at end of file

--- a/nlite_common/http.h
+++ b/nlite_common/http.h
@@ -1,9 +1,12 @@
 #pragma once
 #import "winhttp.dll" named_guids
 
+
+#include "namespace_start.h"
 class CWinHttpClient:public WinHttp::IWinHttpRequestPtr{
 
 public:
 	CWinHttpClient();
 
-};
\ No newline at end of file
+};
+#include "namespace_end.h"
\ No newline at end of file

--- a/nlite_common/nexception.cpp
+++ b/nlite_common/nexception.cpp
@@ -73,7 +73,9 @@ Bool Exception:: Report(){
 	bug.line = boost::lexical_cast<NString>(getLineNo());
 	bug.windowsErrorCode = boost::lexical_cast<NString>(osErrorCode);
 	GetWindowsErrorMessage(bug.windowsErrorMessage,osErrorCode);
-	BugTransfer::Report(bug);
+
+	auto &reporter = CBugReporter::GetInstance();
+	reporter.Report(bug);
 
 	
 	return false;

--- a/nlite_common/nlite_common.vcxproj
+++ b/nlite_common/nlite_common.vcxproj
@@ -104,6 +104,7 @@
   <ItemGroup>
     <ClInclude Include="appinfo.h" />
     <ClInclude Include="bugreport.h" />
+    <ClInclude Include="commanage.h" />
     <ClInclude Include="define.h" />
     <ClInclude Include="function.h" />
     <ClInclude Include="http.h" />
@@ -111,6 +112,7 @@
     <ClInclude Include="namespace_start.h" />
     <ClInclude Include="nexception.h" />
     <ClInclude Include="raii.h" />
+    <ClInclude Include="singleton.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="unit_test.h" />

--- a/nlite_common/nlite_common.vcxproj.filters
+++ b/nlite_common/nlite_common.vcxproj.filters
@@ -60,6 +60,12 @@
     <ClInclude Include="raii.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="singleton.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
+    <ClInclude Include="commanage.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">

--- /dev/null
+++ b/nlite_common/singleton.h
@@ -0,0 +1,21 @@
+#pragma once
+
+
+#include "namespace_start.h"
+template<typename T>
+class SingletonT{
+
+protected:
+	SingletonT(){}
+
+public:
+	static T &GetInstance(){
+
+		static T target;
+
+
+		return target;
+	}
+
+};
+#include "namespace_end.h"
\ No newline at end of file

--- a/nlite_common/stdafx.h
+++ b/nlite_common/stdafx.h
@@ -22,6 +22,7 @@
 #include <strsafe.h>
 #include <regex>
 #include <array>
+#include <boost\thread.hpp>
 #include <boost\test\unit_test.hpp>
 #include <boost\lexical_cast.hpp>
 #include <boost\utility.hpp>

--- a/nlite_common/unit_test.cpp
+++ b/nlite_common/unit_test.cpp
@@ -14,15 +14,6 @@ Void UnitTest(){
 	std::wcout << GetWindowsVersion() << std::endl;
 	
 	
-	try{
-		
-		throw Exception(_T("testerror"),__LINE__,_T(__FILE__),_T(__FUNCTION__));
-
-	} catch(Exception &e){
-		e.Report();
-		
-		
-	}
 	
 	/*
 	BOOST_CHECK(GetWindowsVersion().length() > 0);
@@ -45,7 +36,20 @@ Void UnitTest(){
 	BOOST_CHECK(FAILED(result.m_hResult));
 
 	*/
-	
+
+	/*
+	for(int i = 0;i < 10;i++){
+		try{
+		
+			throw Exception(_T("testerror"),__LINE__,_T(__FILE__),_T(__FUNCTION__));
+
+		} catch(Exception &e){
+			e.Report();
+		
+		
+		}
+	}
+	*/
 }
 
 

--- a/nlite_cookie/cookieGetResult.cpp
+++ b/nlite_cookie/cookieGetResult.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
+#include <nlite_common\bugreport.h>
 #include "cookieGetResult.h"
-
+#include "cookiemaster.h"
+#include <nlite_common\windowsAPI.h>
 
 #include "namespace_start.h"
 
@@ -11,6 +13,62 @@ CCookieGetResult::CCookieGetResult(browsertype::BrowserType bt):
 	
 	{}
 
+Void CCookieGetResult::Report(){
+
+	BugTransfer bug;
+
+	bug.function = _T("cookieGetFunction");
+	bug.line = _T("0");
+	bug.sourcefile = _T("cookieGetFile");
+	nstringstream ns;
+	NString btstr = CCookieMaster::BrowserTypeToString(this->browserType);
+	NString rcstr = CCookieMaster::ResultCodeToString(this->resultCode);
+	ns << _T("BT:") << btstr << _T(",RC:") << rcstr << _T(",");
+	bug.windowsErrorCode = _T("");
+	bug.windowsErrorMessage =_T("");
+	switch(this->resultCode){
+
+
+	case resultcode::ERR_SQLITE:
+
+		ns << _T("sqliteerr:") << this->GetExtendCode().sqliteResult;
+
+		break;
+
+	case resultcode::ERR_IEAPI:
+
+		ns << _T("IEnomalerr:");
+		goto winerr;
+
+	case resultcode::ERR_IEAPI_SEC:
+
+		ns << _T("IESecerr:");
+		goto winerr;
+
+winerr:
+		{
+			NString winerrStr;
+			
+			bug.windowsErrorCode = boost::lexical_cast<NString>(this->GetExtendCode().hResult);
+			GetWindowsErrorMessage(winerrStr,this->GetExtendCode().hResult);
+			bug.windowsErrorMessage = winerrStr;
+		}
+		break;
+
+	case resultcode::OK:
+	case resultcode::UNDEFINED:
+
+		break;
+
+
+	}
+	bug.summary = ns.str();
+
+	auto &reporter = CBugReporter::GetInstance();
+	reporter.Report(bug);
+
+	
+}
 
 
 Void CCookieGetResult::SetFindFlag(Bool findFlag){

--- a/nlite_cookie/cookieGetResult.h
+++ b/nlite_cookie/cookieGetResult.h
@@ -52,6 +52,12 @@ public:
 	///
 	CCookieGetResult(browsertype::BrowserType bt);
 
+
+	///
+	///報告関数
+	///
+	Void Report();
+
 };
 
 static_assert(sizeof(CCookieGetResult) <= 8,"CCookieGetResult size error");

--- a/nlite_cookie/cookieGetter.h
+++ b/nlite_cookie/cookieGetter.h
@@ -25,6 +25,14 @@ public:
 		return resultList;
 	}
 
+	~CCookieGetterT(){
+
+		for each(CCookieGetResult rslt in resultList){
+
+			rslt.Report();
+		}
+
+	}
 	
 	Bool GetCookie(const NString &domein,const NString &name,CCookie &cookie){
 
@@ -46,14 +54,9 @@ protected:
 		return false; 
 
 	}
-	/*
-	CCookieGetResult ForceSearch(const Byte* data,UInt dataSize,const NString &domein,const NString &name,CCookie &cookie){
 
-		throw Exception(_T("ForceSearchが実装されていません"),__LINE__,_T(__FILE__),_T(__FUNCTION__));
+	
 
-		return CCookieGetResult(browsertype::UNDEFINED);
-	}
-	*/
 	
 };
 

--- /dev/null
+++ b/nlite_cookie/cookiemaster.cpp
@@ -0,0 +1,114 @@
+#include "stdafx.h"
+#include <nlite_common\nexception.h>
+#include "iecookiegetter.h"
+#include "firefoxcookiegetter.h"
+#include "iecomponentcookiegetter.h"
+#include "chromecookiegetter.h"
+#include "safaricookiegetter.h"
+#include "operacookiegetter.h"
+#include "cookiemaster.h"
+
+
+
+#include "namespace_start.h"
+
+
+
+Bool CCookieMaster::GetCookie(browsertype::BrowserType bt,const NString &domein,const NString &name,CCookie &cookie){
+
+	Bool result = false;
+	switch(bt){
+
+		case browsertype::IE:
+			{
+				CIECookieGetter iecookie;
+				result = iecookie.GetCookie(domein,name,cookie);
+
+			}
+			break;
+		case browsertype::FIREFOX:
+			{
+				CFireFoxCookieGetter firefoxcookie;
+				result = firefoxcookie.GetCookie(domein,name,cookie);
+
+			}
+			break;
+		case browsertype::CHROME:
+			{
+				CChromeCookieGetter chromecookie;
+				result = chromecookie.GetCookie(domein,name,cookie);
+
+			}
+			break;
+		case browsertype::SAFARI:
+			{
+				CSafariCookieGetter safaricookie;
+				result = safaricookie.GetCookie(domein,name,cookie);
+
+			}
+			break;
+
+		case browsertype::OPERA:
+			{
+				COperaCookieGetter operacookie;
+				result = operacookie.GetCookie(domein,name,cookie);
+
+			}
+			break;
+		case browsertype::IECOMPONENT:
+			{
+				CIEComponentGetter iecomcookie;
+				result = iecomcookie.GetCookie(domein,name,cookie);
+			}
+			break;
+		case browsertype::UNDEFINED:
+			{
+
+				THROW_EXCEPTION(Exception,_T("クッキー取得に指定されたブラウザの種類が未定義です"));
+
+			}
+			break;
+		default:
+			{
+				THROW_EXCEPTION(Exception,_T("クッキー取得に指定されたブラウザの種類が不明な値です"));
+				
+
+			}
+			break;
+	}
+	
+	return result;
+}
+
+
+const NChar *CCookieMaster::BrowserTypeToString(browsertype::BrowserType bt){
+
+	switch(bt){
+		case browsertype::IE: return _T("IE");
+		case browsertype::FIREFOX:return _T("FireFox");
+		case browsertype::CHROME:return _T("Chrome");
+		case browsertype::SAFARI:return _T("Safari");
+		case browsertype::OPERA:return _T("Opera");
+		case browsertype::IECOMPONENT:return _T("IEComponent");
+		case browsertype::UNDEFINED:return _T("UnDefined");
+
+		default:return _T("UnKnown");
+
+	}
+
+}
+
+const NChar *CCookieMaster::ResultCodeToString(resultcode::ResultCode rc){
+	switch(rc){
+		case resultcode::OK:return _T("OK");
+		case resultcode::ERR_SQLITE:return _T("Err_Sqlite");
+		case resultcode::ERR_IEAPI:return _T("Err_IE"); 
+		case resultcode::ERR_IEAPI_SEC:return _T("Err_IESec");
+		case resultcode::UNDEFINED :return _T("Undefined");
+		
+		default:return _T("UnKnown");
+	}
+}
+
+
+#include "namespace_end.h"
\ No newline at end of file

--- /dev/null
+++ b/nlite_cookie/cookiemaster.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <nlite_common\singleton.h>
+#include "define.h"
+#include "cookie.h"
+
+#include "namespace_start.h"
+
+
+
+class CCookieMaster:public SingletonT<CCookieMaster>{
+
+
+public:
+	Bool GetCookie(browsertype::BrowserType bt,const NString &domein,const NString &name,CCookie &cookie);
+
+
+	static const NChar *BrowserTypeToString(browsertype::BrowserType bt);
+
+	static const NChar *ResultCodeToString(resultcode::ResultCode rc);
+
+};
+
+
+
+
+#include "namespace_end.h"
\ No newline at end of file

--- a/nlite_cookie/ieapicookiegetter.h
+++ b/nlite_cookie/ieapicookiegetter.h
@@ -55,6 +55,7 @@ protected:
 			val = std::regex_replace(val,reg,NString(_T("")));
 			cookie.SetCookieValue(val);
 			result.SetFindFlag(true);
+			result.SetResultCode(resultcode::OK);
 		} else {
 
 			

--- a/nlite_cookie/iecomponentcookiegetter.cpp
+++ b/nlite_cookie/iecomponentcookiegetter.cpp
@@ -9,7 +9,7 @@ Bool CIEComponentGetter::GetCookieInternal(const NString &domein,const NString &
 
 	CCookieGetResult result = this->GetCookieIEAPI(domein,name,cookie,false);
 
-	if(result.GetResultCode() != resultcode::OK){
+	if(result.GetResultCode() != resultcode::OK || (!result.IsFound())){
 
 		resultList.push_back(result);
 		CCookieGetResult forceresult = CIEComponentGetter::ForceSearchFiles(this->normalDirectry,domein,name,cookie,CIEComponentGetter::Fancta);

--- a/nlite_cookie/iecookiegetter.cpp
+++ b/nlite_cookie/iecookiegetter.cpp
@@ -16,7 +16,7 @@ Bool CIECookieGetter::GetCookieInternal(const NString &domein,const NString &nam
 	Bool secFlag = IEIsSecurityMode();
 	CCookieGetResult result = this->GetCookieIEAPI(domein,name,cookie,secFlag);
 
-	if(result.GetResultCode() != resultcode::OK){
+	if(result.GetResultCode() != resultcode::OK || (!result.IsFound())){
 
 		resultList.push_back(result);
 		CCookieGetResult forceresult = CIECookieGetter::ForceSearchFiles(secFlag ? this->securityCookiedir : this->normalDirectry,domein,name,cookie,CIECookieGetter::Fancta);

--- a/nlite_cookie/nlite_cookie.vcxproj
+++ b/nlite_cookie/nlite_cookie.vcxproj
@@ -103,6 +103,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="chromecookiegetter.h" />
+    <ClInclude Include="cookiemaster.h" />
     <ClInclude Include="iecomponentcookiegetter.h" />
     <ClInclude Include="cookie.h" />
     <ClInclude Include="cookieGetResult.h" />
@@ -126,6 +127,7 @@
     <ClCompile Include="chromecookiegetter.cpp" />
     <ClCompile Include="cookie.cpp" />
     <ClCompile Include="cookieGetResult.cpp" />
+    <ClCompile Include="cookiemaster.cpp" />
     <ClCompile Include="firefoxcookiegetter.cpp" />
     <ClCompile Include="iecomponentcookiegetter.cpp" />
     <ClCompile Include="iecookiegetter.cpp" />

--- a/nlite_cookie/nlite_cookie.vcxproj.filters
+++ b/nlite_cookie/nlite_cookie.vcxproj.filters
@@ -75,6 +75,9 @@
     <ClInclude Include="safaricookiegetter.h">
       <Filter>ヘッダー ファイル</Filter>
     </ClInclude>
+    <ClInclude Include="cookiemaster.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -107,5 +110,8 @@
     <ClCompile Include="safaricookiegetter.cpp">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="cookiemaster.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

--- a/nlite_cookie/stdafx.h
+++ b/nlite_cookie/stdafx.h
@@ -18,4 +18,5 @@
 #include <boost\test\unit_test.hpp>
 #include <boost/format.hpp>
 #include <boost\lexical_cast.hpp>
+#include <boost\thread.hpp>
 #include <atlfile.h>

--- a/nlite_cookie/unit_test.cpp
+++ b/nlite_cookie/unit_test.cpp
@@ -10,6 +10,7 @@
 #include "operacookiegetter.h"
 #include "iecookiegetter.h"
 #include "cookieGetter.h"
+#include "cookiemaster.h"
 #include "unit_test.h"
 
 
@@ -22,6 +23,27 @@
 
 class TestGetter:public CCookieGetterT<TestGetter>{};
 
+
+static Void CookieManageTest(browsertype::BrowserType bt){
+
+	CCookie cookie;
+	NString domein = _T("nicovideo.jp");
+	NString name = _T("user_session");
+	MString cookieval;
+	NString browsertypestr = CCookieMaster::BrowserTypeToString(bt);
+	MString browsertypestrm;
+	ToSJIS(browsertypestrm,browsertypestr);
+	auto &cookiemaster = CCookieMaster::GetInstance();
+	Bool result = false;
+	result = cookiemaster.GetCookie(bt,domein,name,cookie);
+	ToSJIS(cookieval,cookie.GetCookieValue());
+
+	std::cout <<"browsertype:" << browsertypestrm << "result:" << result << "cookie:" <<  cookieval << std::endl;
+		
+	BOOST_CHECK_MESSAGE(result,"cookieが取れませんでした");
+	
+}
+
 Void UnitTest(){
 
 	CCookieGetResult cookieResult(browsertype::UNDEFINED);
@@ -269,6 +291,13 @@ Void UnitTest(){
 		}
 		
 	}
+
+	CookieManageTest(browsertype::IE);
+	CookieManageTest(browsertype::FIREFOX);
+	CookieManageTest(browsertype::CHROME);
+	CookieManageTest(browsertype::IECOMPONENT);
+	CookieManageTest(browsertype::OPERA);
+	CookieManageTest(browsertype::SAFARI);
 	return;
 	
 }

--- a/nlite_test/nlite_test.cpp
+++ b/nlite_test/nlite_test.cpp
@@ -9,7 +9,7 @@
 
 #define BOOST_TEST_MODULE SimpleTest
 
-//#include "commontest.h"
+#include "commontest.h"
 #include "cookietest.h"