imacat/obasync
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed the argument order so that no argument is required for simplest situation. Library name is taken from the directory name in such a case. Added -r in additional to --run. Fixed to load the library first before checking out the modules.

Browse Source
This commit is contained in:
依瑪貓 2016-09-08 17:16:56 +08:00
parent 864099bc33
commit a58e060d8a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oobsync.py
View File

@ -33,19 +33,25 @@ def parse_args():
global args global args
parser = argparse.ArgumentParser(description="Synchronize the local Basic scripts with OpenOffice Basic.") parser = argparse.ArgumentParser(description="Synchronize the local Basic scripts with OpenOffice Basic.")
parser.add_argument("library", metavar="Library",
help="The Library to upload/download the macros.")
parser.add_argument("projdir", metavar="dir", nargs="?", parser.add_argument("projdir", metavar="dir", nargs="?",
default=os.getcwd(), default=os.getcwd(),
help="The project source directory (default to the current directory).") help="The project source directory (default to the current directory).")
parser.add_argument("library", metavar="Library", nargs="?",
help="The Library to upload/download the macros (default to the name of the directory).")
parser.add_argument("--get", action="store_true", parser.add_argument("--get", action="store_true",
help="Downloads the macros instead of upload.") help="Downloads the macros instead of upload.")
parser.add_argument("--run", metavar="Module.Macro", parser.add_argument("-r", "--run", metavar="Module.Macro",
help="The macro to run after the upload, if any.") help="The macro to run after the upload, if any.")
parser.add_argument("-v", "--version", parser.add_argument("-v", "--version",
action="version", version="%(prog)s 1.0") action="version", version="%(prog)s 0.1")
args = parser.parse_args() args = parser.parse_args()
# Obtains the absolute path
args.projdir = os.path.abspath(args.projdir)
# Obtains the library name from the path
if args.library == None:
args.library = os.path.basename(args.projdir)
return return
def sync_macros(oo): def sync_macros(oo):
@ -125,6 +131,7 @@ def read_basic_modules(libraries, libname):
modules = {} modules = {}
if not libraries.hasByName(libname): if not libraries.hasByName(libname):
return modules return modules
libraries.loadLibrary(libname)
library = libraries.getByName(libname) library = libraries.getByName(libname)
for modname in library.getElementNames(): for modname in library.getElementNames():
modules[modname] = library.getByName(modname).encode("utf-8") modules[modname] = library.getByName(modname).encode("utf-8")
@ -140,6 +147,7 @@ def update_basic_modules(libraries, libname, modules):
library.insertByName(modname, modules[modname]) library.insertByName(modname, modules[modname])
print >> sys.stderr, "Module " + modname + " added." print >> sys.stderr, "Module " + modname + " added."
else: else:
libraries.loadLibrary(libname)
library = libraries.getByName(libname) library = libraries.getByName(libname)
curmods = sorted(library.getElementNames()) curmods = sorted(library.getElementNames())
for modname in sorted(modules.keys()): for modname in sorted(modules.keys()):