Public-Mirror/Textractor
1
0
Fork 1
mirror of https://github.com/Artikash/Textractor.git synced 2024-12-23 17:04:12 +08:00
Code Issues Projects Releases Wiki Activity

small refactor

Browse Source
This commit is contained in:
Akash Mozumdar 2019-02-12 23:54:33 -05:00
parent e494ebc077
commit 551d5ba49d
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/bingtranslate.cpp
View File

@ -130,7 +130,7 @@ bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
TEST( TEST(
{ {
std::wstring test = L"こんにちは"; std::wstring test = L"こんにちは";
ProcessSentence(test, SentenceInfo{ SentenceInfo::DUMMY }); ProcessSentence(test, { SentenceInfo::DUMMY });
assert(test.find(L"Hello") != std::wstring::npos); assert(test.find(L"Hello") != std::wstring::npos);
} }
); );

2
extensions/googletranslate.cpp
View File

@ -166,7 +166,7 @@ bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
TEST( TEST(
{ {
std::wstring test = L"こんにちは"; std::wstring test = L"こんにちは";
ProcessSentence(test, SentenceInfo{ SentenceInfo::DUMMY }); ProcessSentence(test, { SentenceInfo::DUMMY });
assert(test.find(L"Hello") != std::wstring::npos); assert(test.find(L"Hello") != std::wstring::npos);
} }
); );

6
extensions/network.h
View File

@ -5,7 +5,7 @@
using InternetHandle = AutoHandle<Functor<WinHttpCloseHandle>>; using InternetHandle = AutoHandle<Functor<WinHttpCloseHandle>>;
std::optional<std::wstring> ReceiveHttpRequest(HINTERNET request) inline std::optional<std::wstring> ReceiveHttpRequest(HINTERNET request)
{ {
WinHttpReceiveResponse(request, NULL); WinHttpReceiveResponse(request, NULL);
std::string data; std::string data;
@ -17,14 +17,14 @@ std::optional<std::wstring> ReceiveHttpRequest(HINTERNET request)
if (!dwSize) break; if (!dwSize) break;
std::vector<char> buffer(dwSize); std::vector<char> buffer(dwSize);
WinHttpReadData(request, buffer.data(), dwSize, &dwDownloaded); WinHttpReadData(request, buffer.data(), dwSize, &dwDownloaded);
data += std::string(buffer.data(), dwDownloaded); data.append(buffer.data(), dwDownloaded);
} while (dwSize > 0); } while (dwSize > 0);
if (data.empty()) return {}; if (data.empty()) return {};
return StringToWideString(data); return StringToWideString(data);
} }
void Escape(std::wstring& text) inline void Escape(std::wstring& text)
{ {
for (int i = 0; i < text.size(); ++i) for (int i = 0; i < text.size(); ++i)
{ {

7
extensions/removerepeat.cpp
View File

@ -61,11 +61,10 @@ TEST(
RemoveCyclicRepeats(cyclicRepeats); RemoveCyclicRepeats(cyclicRepeats);
assert(cyclicRepeats == L"abcdefg"); assert(cyclicRepeats == L"abcdefg");
InfoForExtension tester{ "hook address", 0 };
std::wstring empty = L"", one = L" ", normal = L"This is a normal sentence. はい"; std::wstring empty = L"", one = L" ", normal = L"This is a normal sentence. はい";
ProcessSentence(empty, { &tester }); ProcessSentence(empty, { SentenceInfo::DUMMY });
ProcessSentence(one, { &tester }); ProcessSentence(one, { SentenceInfo::DUMMY });
ProcessSentence(normal, { &tester }); ProcessSentence(normal, { SentenceInfo::DUMMY });
assert(empty == L"" && one == L" " && normal == L"This is a normal sentence. はい"); assert(empty == L"" && one == L" " && normal == L"This is a normal sentence. はい");
} }
); );