Kaydet (Commit) d1dc850c authored tarafından Miklos Vajna's avatar Miklos Vajna

scripting: s/pathes/paths and s/Pathes/Paths

Change-Id: I58d8e8dc9c6a6864206d923165d075114368c866
üst bb82f5c1
...@@ -320,7 +320,7 @@ class ProviderContext: ...@@ -320,7 +320,7 @@ class ProviderContext:
def removePackageByUrl( self, url ): def removePackageByUrl( self, url ):
items = self.mapPackageName2Path.items() items = self.mapPackageName2Path.items()
for i in items: for i in items:
if url in i[1].pathes: if url in i[1].paths:
self.mapPackageName2Path.pop(i[0]) self.mapPackageName2Path.pop(i[0])
break break
...@@ -330,7 +330,7 @@ class ProviderContext: ...@@ -330,7 +330,7 @@ class ProviderContext:
log.isDebugLevel() and log.debug( "addPackageByUrl : " + packageName + ", " + transientPart + "("+url+")" + ", rootUrl="+self.rootUrl ) log.isDebugLevel() and log.debug( "addPackageByUrl : " + packageName + ", " + transientPart + "("+url+")" + ", rootUrl="+self.rootUrl )
if packageName in self.mapPackageName2Path: if packageName in self.mapPackageName2Path:
package = self.mapPackageName2Path[ packageName ] package = self.mapPackageName2Path[ packageName ]
package.pathes = package.pathes + (url, ) package.paths = package.paths + (url, )
else: else:
package = Package( (url,), transientPart) package = Package( (url,), transientPart)
self.mapPackageName2Path[ packageName ] = package self.mapPackageName2Path[ packageName ] = package
...@@ -338,8 +338,8 @@ class ProviderContext: ...@@ -338,8 +338,8 @@ class ProviderContext:
def isUrlInPackage( self, url ): def isUrlInPackage( self, url ):
values = self.mapPackageName2Path.values() values = self.mapPackageName2Path.values()
for i in values: for i in values:
# print ("checking " + url + " in " + str(i.pathes)) # print ("checking " + url + " in " + str(i.paths))
if url in i.pathes: if url in i.paths:
return True return True
# print ("false") # print ("false")
return False return False
...@@ -686,7 +686,7 @@ def isPyFileInPath( sfa, path ): ...@@ -686,7 +686,7 @@ def isPyFileInPath( sfa, path ):
return ret return ret
# extracts META-INF directory from # extracts META-INF directory from
def getPathesFromPackage( rootUrl, sfa ): def getPathsFromPackage( rootUrl, sfa ):
ret = () ret = ()
try: try:
fileUrl = rootUrl + "/META-INF/manifest.xml" fileUrl = rootUrl + "/META-INF/manifest.xml"
...@@ -701,14 +701,14 @@ def getPathesFromPackage( rootUrl, sfa ): ...@@ -701,14 +701,14 @@ def getPathesFromPackage( rootUrl, sfa ):
ret = tuple( handler.urlList ) ret = tuple( handler.urlList )
except UnoException: except UnoException:
text = lastException2String() text = lastException2String()
log.debug( "getPathesFromPackage " + fileUrl + " Exception: " +text ) log.debug( "getPathsFromPackage " + fileUrl + " Exception: " +text )
pass pass
return ret return ret
class Package: class Package:
def __init__( self, pathes, transientPathElement ): def __init__( self, paths, transientPathElement ):
self.pathes = pathes self.paths = paths
self.transientPathElement = transientPathElement self.transientPathElement = transientPathElement
class DummyInteractionHandler( unohelper.Base, XInteractionHandler ): class DummyInteractionHandler( unohelper.Base, XInteractionHandler ):
...@@ -770,11 +770,11 @@ def getPackageName2PathMap( sfa, storageType ): ...@@ -770,11 +770,11 @@ def getPackageName2PathMap( sfa, storageType ):
log.isDebugLevel() and log.debug( "inspecting package " + i.Name + "("+i.Identifier.Value+")" ) log.isDebugLevel() and log.debug( "inspecting package " + i.Name + "("+i.Identifier.Value+")" )
transientPathElement = penultimateElement( i.URL ) transientPathElement = penultimateElement( i.URL )
j = expandUri( i.URL ) j = expandUri( i.URL )
pathes = getPathesFromPackage( j, sfa ) paths = getPathsFromPackage( j, sfa )
if len( pathes ) > 0: if len( paths ) > 0:
# map package name to url, we need this later # map package name to url, we need this later
log.isErrorLevel() and log.error( "adding Package " + transientPathElement + " " + str( pathes ) ) log.isErrorLevel() and log.error( "adding Package " + transientPathElement + " " + str( paths ) )
ret[ lastElement( j ) ] = Package( pathes, transientPathElement ) ret[ lastElement( j ) ] = Package( paths, transientPathElement )
return ret return ret
def penultimateElement( aStr ): def penultimateElement( aStr ):
...@@ -798,11 +798,11 @@ class PackageBrowseNode( unohelper.Base, XBrowseNode ): ...@@ -798,11 +798,11 @@ class PackageBrowseNode( unohelper.Base, XBrowseNode ):
items = self.provCtx.mapPackageName2Path.items() items = self.provCtx.mapPackageName2Path.items()
browseNodeList = [] browseNodeList = []
for i in items: for i in items:
if len( i[1].pathes ) == 1: if len( i[1].paths ) == 1:
browseNodeList.append( browseNodeList.append(
DirBrowseNode( self.provCtx, i[0], i[1].pathes[0] )) DirBrowseNode( self.provCtx, i[0], i[1].paths[0] ))
else: else:
for j in i[1].pathes: for j in i[1].paths:
browseNodeList.append( browseNodeList.append(
DirBrowseNode( self.provCtx, i[0]+"."+lastElement(j), j ) ) DirBrowseNode( self.provCtx, i[0]+"."+lastElement(j), j ) )
return tuple( browseNodeList ) return tuple( browseNodeList )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment