File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -196,7 +196,7 @@ def insertupdatemount(self, addnew):
196196 data = {'isMounted' : False }
197197 data ['active' ] = active
198198 data ['ip' ] = ip
199- data ['sharename' ] = re_sub ("\W" , "" , sharename )
199+ data ['sharename' ] = re_sub ("\\ W" , "" , sharename )
200200 if sharedir .startswith ("/" ):
201201 data ['sharedir' ] = sharedir [1 :]
202202 else :
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ def render(self, request):
6666 port = config .OpenWebif .https_port .value
6767 proto = 'https'
6868 ourhost = request .getHeader ('host' )
69- m = re .match ('.+\:( \d+)$' , ourhost )
69+ m = re .match ('.+\\ :( \ \ d+)$' , ourhost )
7070 if m is not None :
7171 port = m .group (1 )
7272
Original file line number Diff line number Diff line change @@ -439,7 +439,7 @@ def getInfo(session=None, need_fullinfo=False):
439439 if not line .startswith ('#' ):
440440 # Replace escaped spaces that can appear inside credentials with underscores
441441 # Not elegant but we wouldn't want to expose credentials on the OWIF anyways
442- tmpline = line .replace ("\ " , "_" )
442+ tmpline = line .replace ("\\ " , "_" )
443443 tmp = tmpline .split ()
444444 if not len (tmp ) == 3 :
445445 continue
Original file line number Diff line number Diff line change @@ -189,15 +189,15 @@ def mediaPlayerCurrent(session):
189189
190190def mediaPlayerList (session , path , types ):
191191 if types == "video" :
192- mpattern = "(?i)^.*\.(ts|mts|m2ts|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|dat|flv|mov|dts)"
192+ mpattern = "(?i)^.*\\ .(ts|mts|m2ts|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|dat|flv|mov|dts)"
193193 mserviceref = True
194194 elif types == "audio" :
195195 mserviceref = True
196- mpattern = "(?i)^.*\.(mp2|mp3|ogg|wav|wave|m3u|pls|e2pls|m4a|flac)"
196+ mpattern = "(?i)^.*\\ .(mp2|mp3|ogg|wav|wave|m3u|pls|e2pls|m4a|flac)"
197197 elif types == "any" or types == "" :
198198 mserviceref = True
199199 # complete pattern from mediaplayer
200- mpattern = "(?i)^.*\.(mp2|mp3|ogg|ts|mts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|flv|mov|dts)"
200+ mpattern = "(?i)^.*\\ .(mp2|mp3|ogg|ts|mts|m2ts|wav|wave|m3u|pls|e2pls|mpg|vob|avi|divx|m4v|mkv|mp4|m4a|dat|flac|flv|mov|dts)"
201201 else :
202202 mserviceref = False
203203 mpattern = types
Original file line number Diff line number Diff line change @@ -415,7 +415,7 @@ def sortSatellites(satList):
415415 sortDict = {}
416416 i = 0
417417 for k in satList :
418- result = re .search ("[(]\s*satellitePosition\s*==\s*(\d+)\s*[)]" , k ["service" ], re .IGNORECASE )
418+ result = re .search ("[(]\\ s*satellitePosition\\ s*==\\ s*(\\ d+)\ \ s*[)]" , k ["service" ], re .IGNORECASE )
419419 if result is None :
420420 return satList
421421 orb = int (result .group (1 ))
Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ def getTS(self, request):
232232 portNumber = config .OpenWebif .https_port .value
233233 proto = 'https'
234234 ourhost = request .getHeader ('host' )
235- m = re .match ('.+\:( \d+)$' , ourhost )
235+ m = re .match ('.+\\ :( \ \ d+)$' , ourhost )
236236 if m is not None :
237237 portNumber = m .group (1 )
238238
Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ def whoami(request):
5757 port = comp_config .OpenWebif .https_port .value
5858 proto = 'https'
5959 ourhost = request .getHeader ('host' )
60- m = match ('.+\:( \d+)$' , ourhost )
60+ m = match ('.+\\ :( \ \ d+)$' , ourhost )
6161 if m is not None :
6262 port = m .group (1 )
6363 return {'proto' : proto , 'port' : port }
You can’t perform that action at this time.
0 commit comments