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

* src/ViewManager.py (ViewManager.import_data): Properly process

Browse Source 
non-native (plugin) imports; (_do_import): factor common code into
the new method.
* src/GrampsDb/_ReadXML.py (GrampsParser.__init__): Skip updating
if callback is empty (non-callable).
* src/docgen/HtmlDoc.py (HtmlDoc.load_tpkg): Use tarfile.
* src/ArgHandler.py (ArgHandler.cl_import): Use tarfile.
* src/plugins/WritePkg.py (PackageWriter.export): Use tarfile.
* src/plugins/ReadPkg.py (impData): Use tarfile module.


svn: r6012
This commit is contained in:
Alex Roitman
2006-03-01 00:26:29 +00:00
parent 2b96e371e1
commit 6044ca5317
8 changed files with 91 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/plugins/WritePkg.py
View File

@@ -1,7 +1,7 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2000-2005 Donald N. Allingham
# Copyright (C) 2000-2006 Donald N. Allingham
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
#-------------------------------------------------------------------------
import time
import os
import tarfile
from cStringIO import StringIO
from gettext import gettext as _
@@ -45,8 +46,7 @@ import gtk.glade
# GRAMPS modules
#
#-------------------------------------------------------------------------
import WriteXML
import TarFile
from GrampsDb._WriteXML import XmlWriter
import Utils
from QuestionDialog import MissingMediaDialog
@@ -140,9 +140,9 @@ class PackageWriter:
def fs_ok_clicked(obj):
name = fs_top.get_filename()
if os.path.isfile(name):
g = open(name,"rb")
t.add_file(base,mtime,g)
g.close()
ti = tf.gettarinfo(name,base)
ti.mtime = time.time()
tf.addfile(ti)
fs_top = gtk.FileSelection("%s - GRAMPS" % _("Select file"))
fs_top.hide_fileop_buttons()
@@ -152,8 +152,7 @@ class PackageWriter:
fs_top.destroy()
#---------------------------------------------------------------
t = TarFile.TarFile(self.filename)
mtime = time.time()
archive = tarfile.open(self.filename,'w:gz')
# Write media files first, since the database may be modified
# during the process (i.e. when removing object)
@@ -162,9 +161,9 @@ class PackageWriter:
oldfile = mobject.get_path()
base = os.path.basename(oldfile)
if os.path.isfile(oldfile):
g = open(oldfile,"rb")
t.add_file(base,mtime,g)
g.close()
tarinfo = archive.gettarinfo(oldfile,base)
tarinfo.mtime = int(time.time())
archive.addfile(tarinfo,file(oldfile))
else:
# File is lost => ask what to do
if missmedia_action == 0:
@@ -184,14 +183,23 @@ class PackageWriter:
select_clicked()
# Write XML now
# import tempfile
# tempdir = tempfile.mkdtemp('.tmp','gramps-',
# os.path.dirname(self.filename))
# new_xml_file = os.path.join(tempdir,'data.gramps')
g = StringIO()
gfile = WriteXML.XmlWriter(self.db,None,1)
gfile.write_handle(g)
mtime = time.time()
t.add_file("data.gramps",mtime,g)
gfile = XmlWriter(self.db,None,1)
gfile.write_handle(g) #write(new_xml_file) #write_handle(g)
tarinfo = tarfile.TarInfo('data.gramps')
tarinfo.size = len(g.getvalue())
tarinfo.mtime = time.time()
tarinfo.uid = os.getuid()
tarinfo.gid = os.getgid()
g.seek(0)
archive.addfile(tarinfo,g)
archive.close()
g.close()
t.close()
return 1
#-------------------------------------------------------------------------