mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-21 01:24:21 +00:00
Code Activity

Windows: Fixed an issue in the conversion from URL to Windows UNC file paths and vice versa

Browse source
This commit is contained in:
hogliux 2018-04-12 10:29:13 +01:00
parent 4493b71fd9
commit 6dbb975c01
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/juce_core/network/juce_URL.cpp
View file

@ -148,6 +148,10 @@ URL::URL (File localFile)
if (localFile == File())
return;
#if JUCE_WINDOWS
bool isUncPath = localFile.getFullPathName().startsWith ("\\\\");
#endif
while (! localFile.isRoot())
{
url = "/" + addEscapeChars (localFile.getFileName(), false) + url;
@ -156,8 +160,18 @@ URL::URL (File localFile)
url = addEscapeChars (localFile.getFileName(), false) + url;
if (! url.startsWithChar (L'/'))
url = "/" + url;
#if JUCE_WINDOWS
if (isUncPath)
{
url = url.fromFirstOccurrenceOf ("/", false, false);
}
else
#endif
{
if (! url.startsWithChar (L'/'))
url = "/" + url;
}
url = "file://" + url;
@ -381,7 +395,9 @@ File URL::fileFromFileSchemeURL (const URL& fileURL)
auto path = removeEscapeChars (fileURL.getDomain()).replace ("+", "%2B");
#ifndef JUCE_WINDOWS
#ifdef JUCE_WINDOWS
bool isUncPath = (! fileURL.url.startsWith ("file:///"));
#else
path = File::getSeparatorString() + path;
#endif
@ -390,6 +406,11 @@ File URL::fileFromFileSchemeURL (const URL& fileURL)
for (auto urlElement : urlElements)
path += File::getSeparatorString() + removeEscapeChars (urlElement.replace ("+", "%2B"));
#ifdef JUCE_WINDOWS
if (isUncPath)
path = "\\\\" + path;
#endif
return path;
}