Skip to content

Windows: Escape special chars on xml file name #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kingio wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Windows: Escape special chars on xml file name #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c23e1c
Escape special chars on xml file name
kingio Aug 8, 2017
ac35387
Missing change
kingio Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/win32.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ connectionStateMap =
disconnected: "disconnected" # Win32 & Linux
associating: "connecting" # Win32

#
# urlify: Removes special chars from the given string
#
urlify = (a) ->
a.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '-').replace /^-+|-+$/g, ''

#
# win32WirelessProfileBuilder: This method generates the Windows wireless profile
# XML file corresponding to the ssid, security, and
Expand Down Expand Up @@ -182,7 +188,7 @@ module.exports =
# (3) Write xmlContent to XML wireless profile file.
#
try
fs.writeFileSync "#{_ap.ssid}.xml", xmlContent
fs.writeFileSync urlify(_ap.ssid) + ".xml", xmlContent
catch error
_msg = "Encountered an error connecting to AP: #{error}"
@WiFiLog _msg, true
Expand All @@ -195,7 +201,7 @@ module.exports =
# (4) Load new XML profile, and connect to SSID.
#
COMMANDS =
loadProfile: "netsh #{@WiFiControlSettings.iface} add profile filename=\"#{_ap.ssid}.xml\""
loadProfile: "netsh #{@WiFiControlSettings.iface} add profile filename=\"" + urlify(_ap.ssid) + ".xml\""
connect: "netsh #{@WiFiControlSettings.iface} connect ssid=\"#{_ap.ssid}\" name=\"#{_ap.ssid}\""
connectToAPChain = [ "loadProfile", "connect" ]

Expand All @@ -218,7 +224,7 @@ module.exports =
@WiFiLog "Success!"

@WiFiLog "Removing temporary WiFi config file..."
@execSync "del \".\\#{_ap.ssid}.xml\""
@execSync "del \".\\" + urlify(_ap.ssid) + ".xml\""

#
# In Windows, we are just disconnecting from the current network.
Expand Down