Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reincarnation of Imports

Browse Source 
svn: r1500
This commit is contained in:
Alex Roitman 2003-05-06 15:16:04 +00:00
parent 64f34ccfec
commit 5232d9066d
3 changed files with 16 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gramps2/src/ReadXML.py
View File

@ -29,6 +29,7 @@
#-------------------------------------------------------------------------
import string
import os
import shutil
from xml.parsers.expat import ExpatError
#-------------------------------------------------------------------------
@ -54,8 +55,8 @@ except:
#-------------------------------------------------------------------------
#
# Initialization function for the module. Called to start the reading
# of data.
# Importing data into the currently open database.
# Must takes care of renaming media files according to their new IDs.
#
#-------------------------------------------------------------------------
def importData(database, filename, callback):
@ -115,19 +116,16 @@ def importData(database, filename, callback):
# Rename media files if they were conflicting with existing ones
ObjectMap = parser.db.getObjectMap()
MediaFileMapKeys = parser.MediaFileMap.keys()
MediaFileMapKeys.sort()
MediaFileMapKeys.reverse()
for OldMediaID in MediaFileMapKeys:
newpath = database.getSavePath()
for OldMediaID in parser.MediaFileMap.keys():
NewMediaID = parser.MediaFileMap[OldMediaID]
if NewMediaID != OldMediaID:
oldfile = ObjectMap[NewMediaID].getPath()
oldpath = os.path.dirname(oldfile)
(junk,oldext) = os.path.splitext(os.path.basename(oldfile))
oldfile = os.path.join( basefile, OldMediaID + oldext )
newfile = os.path.join( basefile, NewMediaID + oldext )
os.rename(oldfile,newfile)
ObjectMap[NewMediaID].setPath(os.path.join(oldpath,NewMediaID+oldext))
oldfile = os.path.join(basefile,OldMediaID+oldext)
newfile = os.path.join(newpath,NewMediaID+oldext)
shutil.copy2(oldfile,newfile)
ObjectMap[NewMediaID].setPath(os.path.join(newfile))
ObjectMap[NewMediaID].setLocal(1)
return 1

47
gramps2/src/plugins/ReadNative.py
View File

@ -30,7 +30,6 @@ from intl import gettext as _
import gtk
import const
import os
import shutil
#-------------------------------------------------------------------------
#
@ -80,35 +79,7 @@ class ReadNative:
Utils.destroy_passed_object(self.top)
self.show_display()
# Create tempdir, if it does not exist, then check for writability
tmpdir_path = os.path.expanduser("~/.gramps/tmp" )
if not os.path.isdir(tmpdir_path):
try:
os.mkdir(tmpdir_path,0700)
except:
ErrorDialog( _("Could not create temporary directory %s") %
tmpdir_path )
return
elif not os.access(tmpdir_path,os.W_OK):
ErrorDialog( _("Temporary directory %s is not writable") % tmpdir_path )
return
else: # tempdir exists and writable -- clean it up if not empty
files = os.listdir(tmpdir_path) ;
for filename in files:
os.remove( os.path.join(tmpdir_path,filename) )
# Copy all files from imp_dbpath to tmpdir_path
files = os.listdir(imp_dbpath)
for filename in files:
oldfile = os.path.join(imp_dbpath,filename)
newfile = os.path.join(tmpdir_path,filename)
try:
shutil.copy2( oldfile, newfile )
except:
# These are .* files, and dirs under database dir -- ignore them
pass
dbname = os.path.join(tmpdir_path,const.xmlFile)
dbname = os.path.join(imp_dbpath,const.xmlFile)
try:
importData(self.db,dbname,self.progress)
@ -116,25 +87,11 @@ class ReadNative:
import DisplayTrace
DisplayTrace.DisplayTrace()
# Clean up tempdir after ourselves
files = os.listdir(tmpdir_path)
dbdir_path = self.db.getSavePath()
for filename in files:
oldfile = os.path.join(tmpdir_path,filename)
newfile = os.path.join(dbdir_path,filename)
if filename not in [const.xmlFile,const.xmlFile+'.bak']:
shutil.copy2( oldfile, newfile )
os.remove( oldfile )
os.rmdir(tmpdir_path)
self.window.destroy()
self.callback(1)
def progress(self,val):
self.progress_bar.set_value(val*100.0)
self.progress_bar.set_fraction(val)
while gtk.events_pending():
gtk.mainiteration()

10
gramps2/src/plugins/ReadPkg.py
View File

@ -30,7 +30,6 @@ from intl import gettext as _
import gtk
import const
import os
import shutil
import time
from QuestionDialog import ErrorDialog, WarningDialog
import TarFile
@ -118,15 +117,8 @@ class ReadPkg:
# Clean up tempdir after ourselves
files = os.listdir(tmpdir_path)
dbdir_path = self.db.getSavePath()
for filename in files:
oldfile = os.path.join(tmpdir_path,filename)
newfile = os.path.join(dbdir_path,filename)
if filename not in [const.xmlFile,const.xmlFile+'.bak']:
shutil.copy2( oldfile, newfile )
os.remove( oldfile )
os.remove(os.path.join(tmpdir_path,filename))
os.rmdir(tmpdir_path)