← Back to branch summary

~kevang/mnemosyne-proj/grade-shortcuts-improvements

« back to all changes in this revision

Viewing changes to mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_cards.py

  • Committer: Peter.Bienstman at UGent
  • Date: 2015-01-08 20:12:14 UTC
  • Revision ID: peter.bienstman@ugent.be-20150108201214-f8g8wnw49byhp6g1
Merge code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mnemosyne/mnemosyne/libmnemosyne/file_formats/mnemosyne2_cards.py
191
191
        os.chdir(self.orig_dir)
192
192
        w.close_progress()
193
193
 
194
 
    def do_import(self, filename, extra_tag_names=None):
 
194
    def do_import(self, filename, extra_tag_names=None, show_metadata=True):
195
195
        FileFormat.do_import(self, filename, extra_tag_names)
196
196
        if not extra_tag_names:
197
197
            extra_tags = []
204
204
        # Extract zipfile.
205
205
        zip_file = zipfile.ZipFile(filename, "r")
206
206
        zip_file.extractall(self.database().media_dir())
207
 
        # Show metadata
 
207
        # Show metadata.            
208
208
        metadata_filename = os.path.join(\
209
 
            self.database().media_dir(), "METADATA")
210
 
        metadata = {}
211
 
        for line in file(metadata_filename):
212
 
            key, value = line.split(":", 1)
213
 
            metadata[key] = value.replace("<br>", "\n")
214
 
        self.controller().show_export_metadata_dialog(metadata, read_only=True)
 
209
                self.database().media_dir(), "METADATA")
 
210
        if show_metadata:
 
211
            metadata = {}
 
212
            for line in file(metadata_filename):
 
213
                key, value = line.split(":", 1)
 
214
                metadata[key] = value.replace("<br>", "\n")
 
215
            self.controller().show_export_metadata_dialog(metadata, read_only=True)
215
216
        # Parse XML.
216
217
        self.database().card_types_to_instantiate_later = set()
217
218
        xml_filename = os.path.join(self.database().media_dir(), "cards.xml")