mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-06-12 05:34:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

#136: handling of Unicode paths with MSXML

Browse Source 
- when parsing nzb-files (option NzbDir);
- when parsing rss feeds (option TempDir).
This commit is contained in:
Andrey Prygunkov
2015-12-28 18:34:47 +01:00
parent 449a048304
commit d8a2d79240
3 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
daemon/queue/NzbFile.cpp
View File

@@ -495,7 +495,7 @@ bool NzbFile::Parse()
doc->put_validateOnParse(VARIANT_FALSE);
doc->put_async(VARIANT_FALSE);
_variant_t vFilename(*m_fileName);
_variant_t vFilename(*WString(*m_fileName));
// 1. first trying to load via filename without URL-encoding (certain charaters doesn't work when encoded)
VARIANT_BOOL success = doc->load(vFilename);
@@ -538,24 +538,23 @@ bool NzbFile::Parse()
void NzbFile::EncodeUrl(const char* filename, char* url, int bufLen)
{
BString<1024> utfFilename = filename;
WebUtil::AnsiToUtf8(utfFilename, utfFilename.Capacity());
WString widefilename(filename);
char* end = url + bufLen;
for (char* p = utfFilename; *p && url < end - 3; p++)
for (wchar_t* p = widefilename; *p && url < end - 3; p++)
{
char ch = *p;
wchar_t ch = *p;
if (('0' <= ch && ch <= '9') ||
('a' <= ch && ch <= 'z') ||
('A' <= ch && ch <= 'Z') ||
ch == '-' || ch == '.' || ch == '_' || ch == '~')
{
*url++ = ch;
*url++ = (char)ch;
}
else
{
*url++ = '%';
int a = (uchar)ch >> 4;
uint32 a = (uint32)ch >> 4;
*url++ = a > 9 ? a - 10 + 'A' : a + '0';
a = ch & 0xF;
*url++ = a > 9 ? a - 10 + 'A' : a + '0';