Skip to content

C
core
Kaydet (Commit) 7a6cc8bb authored tarafından Pedro Giffuni's avatar Pedro Giffuni Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: #i55055# Simplify pythonscript.py code 

author:	hanya
(cherry picked from commit e945b491)

Conflicts:
	scripting/source/pyprov/pythonscript.py

Change-Id: Ia019a737c5f80d3af9fc50aefcda6f5b00987513
üst a591f0dd
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
scripting/source/pyprov/pythonscript.py
Dosyayı görüntüle @ 7a6cc8bb
...@@ -177,7 +177,7 @@ class MyUriHelper: ...@@ -177,7 +177,7 @@ class MyUriHelper:
else: else:
self.m_baseUri = expandUri( self.s_UriMap[location] ) self.m_baseUri = expandUri( self.s_UriMap[location] )
self.m_scriptUriLocation = location self.m_scriptUriLocation = location
log.isDebugLevel() and log.debug( "initialized urihelper with baseUri="+self.m_baseUri + ",m_scriptUriLocation="+self.m_scriptUriLocation ) log.debug( "initialized urihelper with baseUri="+self.m_baseUri + ",m_scriptUriLocation="+self.m_scriptUriLocation )
def getRootStorageURI( self ): def getRootStorageURI( self ):
return self.m_baseUri return self.m_baseUri
...@@ -191,20 +191,20 @@ class MyUriHelper: ...@@ -191,20 +191,20 @@ class MyUriHelper:
def storageURI2ScriptUri( self, storageURI ): def storageURI2ScriptUri( self, storageURI ):
if not storageURI.startswith( self.m_baseUri ): if not storageURI.startswith( self.m_baseUri ):
message = "pythonscript: storage uri '" + storageURI + "' not in base uri '" + self.m_baseUri + "'" message = "pythonscript: storage uri '" + storageURI + "' not in base uri '" + self.m_baseUri + "'"
log.isDebugLevel() and log.debug( message ) log.debug( message )
raise RuntimeException( message ) raise RuntimeException( message )
ret = "vnd.sun.star.script:" + \ ret = "vnd.sun.star.script:" + \
storageURI[len(self.m_baseUri)+1:].replace("/","|") + \ storageURI[len(self.m_baseUri)+1:].replace("/","|") + \
"?language=" + LANGUAGENAME + "&location=" + self.m_scriptUriLocation "?language=" + LANGUAGENAME + "&location=" + self.m_scriptUriLocation
log.isDebugLevel() and log.debug( "converting storageURI="+storageURI + " to scriptURI=" + ret ) log.debug( "converting storageURI="+storageURI + " to scriptURI=" + ret )
return ret return ret
def scriptURI2StorageUri( self, scriptURI ): def scriptURI2StorageUri( self, scriptURI ):
try: try:
myUri = self.m_uriRefFac.parse(scriptURI) myUri = self.m_uriRefFac.parse(scriptURI)
ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" ) ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" )
log.isDebugLevel() and log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret ) log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret )
return ret return ret
except UnoException as e: except UnoException as e:
log.error( "error during converting scriptURI="+scriptURI + ": " + e.Message) log.error( "error during converting scriptURI="+scriptURI + ": " + e.Message)
...@@ -285,12 +285,12 @@ class ScriptContext(unohelper.Base): ...@@ -285,12 +285,12 @@ class ScriptContext(unohelper.Base):
# lastRead = sfa.getDateTimeModified( url ) # lastRead = sfa.getDateTimeModified( url )
# if entry: # if entry:
# if hasChanged( entry.lastRead, lastRead ): # if hasChanged( entry.lastRead, lastRead ):
# log.isDebugLevel() and log.debug("file " + url + " has changed, reloading") # log.debug("file " + url + " has changed, reloading")
# else: # else:
# load = False # load = False
# #
# if load: # if load:
# log.isDebugLevel() and log.debug( "opening >" + url + "<" ) # log.debug( "opening >" + url + "<" )
# #
# code = readTextFromStream( sfa.openFileRead( url ) ) # code = readTextFromStream( sfa.openFileRead( url ) )
...@@ -300,7 +300,7 @@ class ScriptContext(unohelper.Base): ...@@ -300,7 +300,7 @@ class ScriptContext(unohelper.Base):
# entry.module.__file__ = url # entry.module.__file__ = url
# exec code in entry.module.__dict__ # exec code in entry.module.__dict__
# g_modules[ url ] = entry # g_modules[ url ] = entry
# log.isDebugLevel() and log.debug( "mapped " + url + " to " + str( entry.module ) ) # log.debug( "mapped " + url + " to " + str( entry.module ) )
# return entry.module # return entry.module
class ProviderContext: class ProviderContext:
...@@ -333,7 +333,7 @@ class ProviderContext: ...@@ -333,7 +333,7 @@ class ProviderContext:
def addPackageByUrl( self, url ): def addPackageByUrl( self, url ):
packageName = self.getPackageNameFromUrl( url ) packageName = self.getPackageNameFromUrl( url )
transientPart = self.getTransientPartFromUrl( url ) transientPart = self.getTransientPartFromUrl( url )
log.isDebugLevel() and log.debug( "addPackageByUrl : " + packageName + ", " + transientPart + "("+url+")" + ", rootUrl="+self.rootUrl ) 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.paths = package.paths + (url, ) package.paths = package.paths + (url, )
...@@ -360,7 +360,7 @@ class ProviderContext: ...@@ -360,7 +360,7 @@ class ProviderContext:
if self.rootUrl: if self.rootUrl:
pos = len( self.rootUrl) +1 pos = len( self.rootUrl) +1
ret = url[0:pos]+url[url.find("/",pos)+1:len(url)] ret = url[0:pos]+url[url.find("/",pos)+1:len(url)]
log.isDebugLevel() and log.debug( "getPersistentUrlFromStorageUrl " + url + " -> "+ ret) log.debug( "getPersistentUrlFromStorageUrl " + url + " -> "+ ret)
return ret return ret
def getStorageUrlFromPersistentUrl( self, url): def getStorageUrlFromPersistentUrl( self, url):
...@@ -370,7 +370,7 @@ class ProviderContext: ...@@ -370,7 +370,7 @@ class ProviderContext:
packageName = url[pos:url.find("/",pos+1)] packageName = url[pos:url.find("/",pos+1)]
package = self.mapPackageName2Path[ packageName ] package = self.mapPackageName2Path[ packageName ]
ret = url[0:pos]+ package.transientPathElement + "/" + url[pos:len(url)] ret = url[0:pos]+ package.transientPathElement + "/" + url[pos:len(url)]
log.isDebugLevel() and log.debug( "getStorageUrlFromPersistentUrl " + url + " -> "+ ret) log.debug( "getStorageUrlFromPersistentUrl " + url + " -> "+ ret)
return ret return ret
def getFuncsByUrl( self, url ): def getFuncsByUrl( self, url ):
...@@ -420,12 +420,12 @@ class ProviderContext: ...@@ -420,12 +420,12 @@ class ProviderContext:
lastRead = self.sfa.getDateTimeModified( url ) lastRead = self.sfa.getDateTimeModified( url )
if entry: if entry:
if hasChanged( entry.lastRead, lastRead ): if hasChanged( entry.lastRead, lastRead ):
log.isDebugLevel() and log.debug( "file " + url + " has changed, reloading" ) log.debug( "file " + url + " has changed, reloading" )
else: else:
load = False load = False
if load: if load:
log.isDebugLevel() and log.debug( "opening >" + url + "<" ) log.debug( "opening >" + url + "<" )
src = readTextFromStream( self.sfa.openFileRead( url ) ) src = readTextFromStream( self.sfa.openFileRead( url ) )
checkForPythonPathBesideScript( url[0:url.rfind('/')] ) checkForPythonPathBesideScript( url[0:url.rfind('/')] )
...@@ -443,7 +443,7 @@ class ProviderContext: ...@@ -443,7 +443,7 @@ class ProviderContext:
exec(code, entry.module.__dict__) exec(code, entry.module.__dict__)
entry.module.__file__ = url entry.module.__file__ = url
self.modules[ url ] = entry self.modules[ url ] = entry
log.isDebugLevel() and log.debug( "mapped " + url + " to " + str( entry.module ) ) log.debug( "mapped " + url + " to " + str( entry.module ) )
return entry.module return entry.module
#-------------------------------------------------- #--------------------------------------------------
...@@ -482,16 +482,16 @@ class ScriptBrowseNode( unohelper.Base, XBrowseNode , XPropertySet, XInvocation, ...@@ -482,16 +482,16 @@ class ScriptBrowseNode( unohelper.Base, XBrowseNode , XPropertySet, XInvocation,
elif name == "Editable" and ENABLE_EDIT_DIALOG: elif name == "Editable" and ENABLE_EDIT_DIALOG:
ret = not self.provCtx.sfa.isReadOnly( self.uri ) ret = not self.provCtx.sfa.isReadOnly( self.uri )
log.isDebugLevel() and log.debug( "ScriptBrowseNode.getPropertyValue called for " + name + ", returning " + str(ret) ) log.debug( "ScriptBrowseNode.getPropertyValue called for " + name + ", returning " + str(ret) )
except: except:
log.error( "ScriptBrowseNode.getPropertyValue error " + lastException2String()) log.error( "ScriptBrowseNode.getPropertyValue error " + lastException2String())
raise raise
return ret return ret
def setPropertyValue( self, name, value ): def setPropertyValue( self, name, value ):
log.isDebugLevel() and log.debug( "ScriptBrowseNode.setPropertyValue called " + name + "=" +str(value ) ) log.debug( "ScriptBrowseNode.setPropertyValue called " + name + "=" +str(value ) )
def getPropertySetInfo( self ): def getPropertySetInfo( self ):
log.isDebugLevel() and log.debug( "ScriptBrowseNode.getPropertySetInfo called " ) log.debug( "ScriptBrowseNode.getPropertySetInfo called " )
return None return None
def getIntrospection( self ): def getIntrospection( self ):
...@@ -549,9 +549,9 @@ class ScriptBrowseNode( unohelper.Base, XBrowseNode , XPropertySet, XInvocation, ...@@ -549,9 +549,9 @@ class ScriptBrowseNode( unohelper.Base, XBrowseNode , XPropertySet, XInvocation,
out.writeBytes( toWrite ) out.writeBytes( toWrite )
out.close() out.close()
self.provCtx.sfa.kill( copyUrl ) self.provCtx.sfa.kill( copyUrl )
# log.isDebugLevel() and log.debug("Save is not implemented yet") # log.debug("Save is not implemented yet")
# text = self.editor.getControl("EditorTextField").getText() # text = self.editor.getControl("EditorTextField").getText()
# log.isDebugLevel() and log.debug("Would save: " + text) # log.debug("Would save: " + text)
except: except:
# TODO: add an error box here ! # TODO: add an error box here !
log.error( lastException2String() ) log.error( lastException2String() )
...@@ -592,7 +592,7 @@ class FileBrowseNode( unohelper.Base, XBrowseNode ): ...@@ -592,7 +592,7 @@ class FileBrowseNode( unohelper.Base, XBrowseNode ):
ScriptBrowseNode( ScriptBrowseNode(
self.provCtx, self.uri, self.name, i )) self.provCtx, self.uri, self.name, i ))
ret = tuple( scriptNodeList ) ret = tuple( scriptNodeList )
log.isDebugLevel() and log.debug( "returning " +str(len(ret)) + " ScriptChildNodes on " + self.uri ) log.debug( "returning " +str(len(ret)) + " ScriptChildNodes on " + self.uri )
except: except:
text = lastException2String() text = lastException2String()
log.error( "Error while evaluating " + self.uri + ":" + text ) log.error( "Error while evaluating " + self.uri + ":" + text )
...@@ -621,16 +621,16 @@ class DirBrowseNode( unohelper.Base, XBrowseNode ): ...@@ -621,16 +621,16 @@ class DirBrowseNode( unohelper.Base, XBrowseNode ):
def getChildNodes( self ): def getChildNodes( self ):
try: try:
log.isDebugLevel() and log.debug( "DirBrowseNode.getChildNodes called for " + self.rootUrl ) log.debug( "DirBrowseNode.getChildNodes called for " + self.rootUrl )
contents = self.provCtx.sfa.getFolderContents( self.rootUrl, True ) contents = self.provCtx.sfa.getFolderContents( self.rootUrl, True )
browseNodeList = [] browseNodeList = []
for i in contents: for i in contents:
if i.endswith( ".py" ): if i.endswith( ".py" ):
log.isDebugLevel() and log.debug( "adding filenode " + i ) log.debug( "adding filenode " + i )
browseNodeList.append( browseNodeList.append(
FileBrowseNode( self.provCtx, i, i[i.rfind("/")+1:len(i)-3] ) ) FileBrowseNode( self.provCtx, i, i[i.rfind("/")+1:len(i)-3] ) )
elif self.provCtx.sfa.isFolder( i ) and not i.endswith("/pythonpath"): elif self.provCtx.sfa.isFolder( i ) and not i.endswith("/pythonpath"):
log.isDebugLevel() and log.debug( "adding DirBrowseNode " + i ) log.debug( "adding DirBrowseNode " + i )
browseNodeList.append( DirBrowseNode( self.provCtx, i[i.rfind("/")+1:len(i)],i)) browseNodeList.append( DirBrowseNode( self.provCtx, i[i.rfind("/")+1:len(i)],i))
return tuple( browseNodeList ) return tuple( browseNodeList )
except Exception as e: except Exception as e:
...@@ -721,18 +721,18 @@ class DummyInteractionHandler( unohelper.Base, XInteractionHandler ): ...@@ -721,18 +721,18 @@ class DummyInteractionHandler( unohelper.Base, XInteractionHandler ):
def __init__( self ): def __init__( self ):
pass pass
def handle( self, event): def handle( self, event):
log.isDebugLevel() and log.debug( "pythonscript: DummyInteractionHandler.handle " + str( event ) ) log.debug( "pythonscript: DummyInteractionHandler.handle " + str( event ) )
class DummyProgressHandler( unohelper.Base, XProgressHandler ): class DummyProgressHandler( unohelper.Base, XProgressHandler ):
def __init__( self ): def __init__( self ):
pass pass
def push( self,status ): def push( self,status ):
log.isDebugLevel() and log.debug( "pythonscript: DummyProgressHandler.push " + str( status ) ) log.debug( "pythonscript: DummyProgressHandler.push " + str( status ) )
def update( self,status ): def update( self,status ):
log.isDebugLevel() and log.debug( "pythonscript: DummyProgressHandler.update " + str( status ) ) log.debug( "pythonscript: DummyProgressHandler.update " + str( status ) )
def pop( self, event ): def pop( self, event ):
log.isDebugLevel() and log.debug( "pythonscript: DummyProgressHandler.push " + str( event ) ) log.debug( "pythonscript: DummyProgressHandler.push " + str( event ) )
class CommandEnvironment(unohelper.Base, XCommandEnvironment): class CommandEnvironment(unohelper.Base, XCommandEnvironment):
def __init__( self ): def __init__( self ):
...@@ -748,9 +748,9 @@ class CommandEnvironment(unohelper.Base, XCommandEnvironment): ...@@ -748,9 +748,9 @@ class CommandEnvironment(unohelper.Base, XCommandEnvironment):
# def __init__( self ): # def __init__( self ):
# pass # pass
# def modified( self, event ): # def modified( self, event ):
# log.isDebugLevel() and log.debug( "pythonscript: ModifyListener.modified " + str( event ) ) # log.debug( "pythonscript: ModifyListener.modified " + str( event ) )
# def disposing( self, event ): # def disposing( self, event ):
# log.isDebugLevel() and log.debug( "pythonscript: ModifyListener.disposing " + str( event ) ) # log.debug( "pythonscript: ModifyListener.disposing " + str( event ) )
def getModelFromDocUrl(ctx, url): def getModelFromDocUrl(ctx, url):
"""Get document model from document url.""" """Get document model from document url."""
...@@ -792,13 +792,13 @@ def getPackageName2PathMap( sfa, storageType ): ...@@ -792,13 +792,13 @@ def getPackageName2PathMap( sfa, storageType ):
packageManager = packageManagerFactory.getPackageManager( packageManager = packageManagerFactory.getPackageManager(
mapStorageType2PackageContext(storageType)) mapStorageType2PackageContext(storageType))
# packageManager.addModifyListener( ModifyListener() ) # packageManager.addModifyListener( ModifyListener() )
log.isDebugLevel() and log.debug( "pythonscript: getPackageName2PathMap start getDeployedPackages" ) log.debug( "pythonscript: getPackageName2PathMap start getDeployedPackages" )
packages = packageManager.getDeployedPackages( packages = packageManager.getDeployedPackages(
packageManager.createAbortChannel(), CommandEnvironment( ) ) packageManager.createAbortChannel(), CommandEnvironment( ) )
log.isDebugLevel() and log.debug( "pythonscript: getPackageName2PathMap end getDeployedPackages (" + str(len(packages))+")" ) log.debug( "pythonscript: getPackageName2PathMap end getDeployedPackages (" + str(len(packages))+")" )
for i in packages: for i in packages:
log.isDebugLevel() and log.debug( "inspecting package " + i.Name + "("+i.Identifier.Value+")" ) 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 )
paths = getPathsFromPackage( j, sfa ) paths = getPathsFromPackage( j, sfa )
...@@ -856,7 +856,7 @@ class PythonScript( unohelper.Base, XScript ): ...@@ -856,7 +856,7 @@ class PythonScript( unohelper.Base, XScript ):
self.func = func self.func = func
self.mod = mod self.mod = mod
def invoke(self, args, out, outindex ): def invoke(self, args, out, outindex ):
log.isDebugLevel() and log.debug( "PythonScript.invoke " + str( args ) ) log.debug( "PythonScript.invoke " + str( args ) )
try: try:
ret = self.func( *args ) ret = self.func( *args )
except UnoException as e: except UnoException as e:
...@@ -865,7 +865,7 @@ class PythonScript( unohelper.Base, XScript ): ...@@ -865,7 +865,7 @@ class PythonScript( unohelper.Base, XScript ):
complete = "Error during invoking function " + \ complete = "Error during invoking function " + \
str(self.func.__name__) + " in module " + \ str(self.func.__name__) + " in module " + \
self.mod.__file__ + " (" + text + ")" self.mod.__file__ + " (" + text + ")"
log.isDebugLevel() and log.debug( complete ) log.debug( complete )
# some people may beat me up for modifying the exception text, # some people may beat me up for modifying the exception text,
# but otherwise office just shows # but otherwise office just shows
# the type name and message text with no more information, # the type name and message text with no more information,
...@@ -878,9 +878,9 @@ class PythonScript( unohelper.Base, XScript ): ...@@ -878,9 +878,9 @@ class PythonScript( unohelper.Base, XScript ):
complete = "Error during invoking function " + \ complete = "Error during invoking function " + \
str(self.func.__name__) + " in module " + \ str(self.func.__name__) + " in module " + \
self.mod.__file__ + " (" + text + ")" self.mod.__file__ + " (" + text + ")"
log.isDebugLevel() and log.debug( complete ) log.debug( complete )
raise RuntimeException( complete , self ) raise RuntimeException( complete , self )
log.isDebugLevel() and log.debug( "PythonScript.invoke ret = " + str( ret ) ) log.debug( "PythonScript.invoke ret = " + str( ret ) )
return ret, (), () return ret, (), ()
def expandUri( uri ): def expandUri( uri ):
...@@ -929,10 +929,10 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, XScriptProvider, XNameC ...@@ -929,10 +929,10 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, XScriptProvider, XNameC
# urlHelper = ctx.ServiceManager.createInstanceWithArgumentsAndContext( # urlHelper = ctx.ServiceManager.createInstanceWithArgumentsAndContext(
# "com.sun.star.script.provider.ScriptURIHelper", (LANGUAGENAME, storageType), ctx) # "com.sun.star.script.provider.ScriptURIHelper", (LANGUAGENAME, storageType), ctx)
urlHelper = MyUriHelper( ctx, storageType ) urlHelper = MyUriHelper( ctx, storageType )
log.isDebugLevel() and log.debug( "got urlHelper " + str( urlHelper ) ) log.debug( "got urlHelper " + str( urlHelper ) )
rootUrl = expandUri( urlHelper.getRootStorageURI() ) rootUrl = expandUri( urlHelper.getRootStorageURI() )
log.isDebugLevel() and log.debug( storageType + " transformed to " + rootUrl ) log.debug( storageType + " transformed to " + rootUrl )
ucbService = "com.sun.star.ucb.SimpleFileAccess" ucbService = "com.sun.star.ucb.SimpleFileAccess"
sfa = ctx.ServiceManager.createInstanceWithContext( ucbService, ctx ) sfa = ctx.ServiceManager.createInstanceWithContext( ucbService, ctx )
...@@ -973,20 +973,20 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, XScriptProvider, XNameC ...@@ -973,20 +973,20 @@ class PythonScriptProvider( unohelper.Base, XBrowseNode, XScriptProvider, XNameC
def getScript( self, scriptUri ): def getScript( self, scriptUri ):
try: try:
log.isDebugLevel() and log.debug( "getScript " + scriptUri + " invoked") log.debug( "getScript " + scriptUri + " invoked")
storageUri = self.provCtx.getStorageUrlFromPersistentUrl( storageUri = self.provCtx.getStorageUrlFromPersistentUrl(
self.provCtx.uriHelper.getStorageURI(scriptUri) ); self.provCtx.uriHelper.getStorageURI(scriptUri) );
log.isDebugLevel() and log.debug( "getScript: storageUri = " + storageUri) log.debug( "getScript: storageUri = " + storageUri)
fileUri = storageUri[0:storageUri.find( "$" )] fileUri = storageUri[0:storageUri.find( "$" )]
funcName = storageUri[storageUri.find( "$" )+1:len(storageUri)] funcName = storageUri[storageUri.find( "$" )+1:len(storageUri)]
mod = self.provCtx.getModuleByUrl( fileUri ) mod = self.provCtx.getModuleByUrl( fileUri )
log.isDebugLevel() and log.debug( " got mod " + str(mod) ) log.debug( " got mod " + str(mod) )
func = mod.__dict__[ funcName ] func = mod.__dict__[ funcName ]
log.isDebugLevel() and log.debug( "got func " + str( func ) ) log.debug( "got func " + str( func ) )
return PythonScript( func, mod ) return PythonScript( func, mod )
except: except:
text = lastException2String() text = lastException2String()
......
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