From 54bb1ae27de20c274056d656dc667e3ff827b65a Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:37:32 -0800 Subject: [PATCH 1/3] Adds an optional API field to follow the filenaming format when creating a bulk download zip --- src/documents/bulk_download.py | 37 ++++++-- src/documents/models.py | 3 + src/documents/serialisers.py | 4 + src/documents/tests/test_api.py | 145 ++++++++++++++++++++++++++++++-- src/documents/views.py | 3 +- 5 files changed, 181 insertions(+), 11 deletions(-) diff --git a/src/documents/bulk_download.py b/src/documents/bulk_download.py index 6beefa23b..87d97afcc 100644 --- a/src/documents/bulk_download.py +++ b/src/documents/bulk_download.py @@ -1,18 +1,29 @@ +import os from zipfile import ZipFile from documents.models import Document class BulkArchiveStrategy: - def __init__(self, zipf: ZipFile): + def __init__(self, zipf: ZipFile, follow_formatting: bool = False): self.zipf = zipf + if follow_formatting: + self.make_unique_filename = self._formatted_filepath + else: + self.make_unique_filename = self._filename_only - def make_unique_filename( + def _filename_only( self, doc: Document, archive: bool = False, folder: str = "", ): + """ + Constructs a unique name for the given document to be used inside the + zip file. + + The filename might not be unique enough, so a counter is appended if needed + """ counter = 0 while True: filename = folder + doc.get_public_filename(archive, counter) @@ -21,6 +32,25 @@ class BulkArchiveStrategy: else: return filename + def _formatted_filepath( + self, + doc: Document, + archive: bool = False, + folder: str = "", + ): + """ + Constructs a full file path for the given document to be used inside + the zipfile. + + The path is already unique, as handled when a document is consumed or updated + """ + if archive and doc.has_archive_version: + in_archive_path = os.path.join(folder, doc.archive_filename) + else: + in_archive_path = os.path.join(folder, doc.filename) + + return in_archive_path + def add_document(self, doc: Document): raise NotImplementedError() # pragma: no cover @@ -31,9 +61,6 @@ class OriginalsOnlyStrategy(BulkArchiveStrategy): class ArchiveOnlyStrategy(BulkArchiveStrategy): - def __init__(self, zipf): - super().__init__(zipf) - def add_document(self, doc: Document): if doc.has_archive_version: self.zipf.write( diff --git a/src/documents/models.py b/src/documents/models.py index c1b9c88bc..1ee6dfedb 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -287,6 +287,9 @@ class Document(models.Model): return open(self.archive_path, "rb") def get_public_filename(self, archive=False, counter=0, suffix=None) -> str: + """ + Returns a sanitized filename for the document, not including any paths. + """ result = str(self) if counter: diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index db282cacd..3e6ec4390 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -551,6 +551,10 @@ class BulkDownloadSerializer(DocumentListSerializer): default="none", ) + follow_formatting = serializers.BooleanField( + default=False, + ) + def validate_compression(self, compression): import zipfile diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index d876984bd..a7e2be53f 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -2329,6 +2329,9 @@ class TestBulkEdit(DirectoriesMixin, APITestCase): class TestBulkDownload(DirectoriesMixin, APITestCase): + + ENDPOINT = "/api/documents/bulk_download/" + def setUp(self): super().setUp() @@ -2379,7 +2382,7 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): def test_download_originals(self): response = self.client.post( - "/api/documents/bulk_download/", + self.ENDPOINT, json.dumps( {"documents": [self.doc2.id, self.doc3.id], "content": "originals"}, ), @@ -2402,7 +2405,7 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): def test_download_default(self): response = self.client.post( - "/api/documents/bulk_download/", + self.ENDPOINT, json.dumps({"documents": [self.doc2.id, self.doc3.id]}), content_type="application/json", ) @@ -2423,7 +2426,7 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): def test_download_both(self): response = self.client.post( - "/api/documents/bulk_download/", + self.ENDPOINT, json.dumps({"documents": [self.doc2.id, self.doc3.id], "content": "both"}), content_type="application/json", ) @@ -2457,7 +2460,7 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): def test_filename_clashes(self): response = self.client.post( - "/api/documents/bulk_download/", + self.ENDPOINT, json.dumps({"documents": [self.doc2.id, self.doc2b.id]}), content_type="application/json", ) @@ -2479,13 +2482,145 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): def test_compression(self): response = self.client.post( - "/api/documents/bulk_download/", + self.ENDPOINT, json.dumps( {"documents": [self.doc2.id, self.doc2b.id], "compression": "lzma"}, ), content_type="application/json", ) + @override_settings(FILENAME_FORMAT="{correspondent}/{title}") + def test_formatted_download_originals(self): + + c = Correspondent.objects.create(name="test") + c2 = Correspondent.objects.create(name="a space name") + + self.doc2.correspondent = c + self.doc2.title = "This is Doc 2" + self.doc2.save() + + self.doc3.correspondent = c2 + self.doc3.title = "Title 2 - Doc 3" + self.doc3.save() + + response = self.client.post( + self.ENDPOINT, + json.dumps( + { + "documents": [self.doc2.id, self.doc3.id], + "content": "originals", + "follow_formatting": True, + }, + ), + content_type="application/json", + ) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response["Content-Type"], "application/zip") + + with zipfile.ZipFile(io.BytesIO(response.content)) as zipf: + self.assertEqual(len(zipf.filelist), 2) + self.assertIn("a space name/Title 2 - Doc 3.jpg", zipf.namelist()) + self.assertIn("test/This is Doc 2.pdf", zipf.namelist()) + + with self.doc2.source_file as f: + self.assertEqual(f.read(), zipf.read("test/This is Doc 2.pdf")) + + with self.doc3.source_file as f: + self.assertEqual( + f.read(), + zipf.read("a space name/Title 2 - Doc 3.jpg"), + ) + + @override_settings(FILENAME_FORMAT="somewhere/{title}") + def test_formatted_download_archive(self): + + self.doc2.title = "This is Doc 2" + self.doc2.save() + + self.doc3.title = "Title 2 - Doc 3" + self.doc3.save() + print(self.doc3.archive_path) + print(self.doc3.archive_filename) + + response = self.client.post( + self.ENDPOINT, + json.dumps( + { + "documents": [self.doc2.id, self.doc3.id], + "follow_formatting": True, + }, + ), + content_type="application/json", + ) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response["Content-Type"], "application/zip") + + with zipfile.ZipFile(io.BytesIO(response.content)) as zipf: + self.assertEqual(len(zipf.filelist), 2) + self.assertIn("somewhere/This is Doc 2.pdf", zipf.namelist()) + self.assertIn("somewhere/Title 2 - Doc 3.pdf", zipf.namelist()) + + with self.doc2.source_file as f: + self.assertEqual(f.read(), zipf.read("somewhere/This is Doc 2.pdf")) + + with self.doc3.archive_file as f: + self.assertEqual(f.read(), zipf.read("somewhere/Title 2 - Doc 3.pdf")) + + @override_settings(FILENAME_FORMAT="{document_type}/{title}") + def test_formatted_download_both(self): + + dc1 = DocumentType.objects.create(name="bill") + dc2 = DocumentType.objects.create(name="statement") + + self.doc2.document_type = dc1 + self.doc2.title = "This is Doc 2" + self.doc2.save() + + self.doc3.document_type = dc2 + self.doc3.title = "Title 2 - Doc 3" + self.doc3.save() + + response = self.client.post( + self.ENDPOINT, + json.dumps( + { + "documents": [self.doc2.id, self.doc3.id], + "content": "both", + "follow_formatting": True, + }, + ), + content_type="application/json", + ) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response["Content-Type"], "application/zip") + + with zipfile.ZipFile(io.BytesIO(response.content)) as zipf: + self.assertEqual(len(zipf.filelist), 3) + self.assertIn("originals/bill/This is Doc 2.pdf", zipf.namelist()) + self.assertIn("archive/statement/Title 2 - Doc 3.pdf", zipf.namelist()) + self.assertIn("originals/statement/Title 2 - Doc 3.jpg", zipf.namelist()) + + with self.doc2.source_file as f: + self.assertEqual( + f.read(), + zipf.read("originals/bill/This is Doc 2.pdf"), + ) + + with self.doc3.archive_file as f: + self.assertEqual( + f.read(), + zipf.read("archive/statement/Title 2 - Doc 3.pdf"), + ) + + with self.doc3.source_file as f: + self.assertEqual( + f.read(), + zipf.read("originals/statement/Title 2 - Doc 3.jpg"), + ) + class TestApiAuth(DirectoriesMixin, APITestCase): def test_auth_required(self): diff --git a/src/documents/views.py b/src/documents/views.py index 10225be6f..ce82cbfaa 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -745,6 +745,7 @@ class BulkDownloadView(GenericAPIView): ids = serializer.validated_data.get("documents") compression = serializer.validated_data.get("compression") content = serializer.validated_data.get("content") + follow_filename_format = serializer.validated_data.get("follow_formatting") os.makedirs(settings.SCRATCH_DIR, exist_ok=True) temp = tempfile.NamedTemporaryFile( @@ -761,7 +762,7 @@ class BulkDownloadView(GenericAPIView): strategy_class = ArchiveOnlyStrategy with zipfile.ZipFile(temp.name, "w", compression) as zipf: - strategy = strategy_class(zipf) + strategy = strategy_class(zipf, follow_filename_format) for id in ids: doc = Document.objects.get(id=id) strategy.add_document(doc) From 812df3782a7f5aacd2391ccdf553abd53c688d8c Mon Sep 17 00:00:00 2001 From: Trenton Holmes <797416+stumpylog@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:47:18 -0800 Subject: [PATCH 2/3] Documents the test conditions --- src/documents/tests/test_api.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/documents/tests/test_api.py b/src/documents/tests/test_api.py index a7e2be53f..c9d8aefc2 100644 --- a/src/documents/tests/test_api.py +++ b/src/documents/tests/test_api.py @@ -2491,6 +2491,15 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): @override_settings(FILENAME_FORMAT="{correspondent}/{title}") def test_formatted_download_originals(self): + """ + GIVEN: + - Defined file naming format + WHEN: + - Bulk download request for original documents + - Bulk download request requests to follow format + THEN: + - Files defined in resulting zipfile are formatted + """ c = Correspondent.objects.create(name="test") c2 = Correspondent.objects.create(name="a space name") @@ -2534,6 +2543,15 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): @override_settings(FILENAME_FORMAT="somewhere/{title}") def test_formatted_download_archive(self): + """ + GIVEN: + - Defined file naming format + WHEN: + - Bulk download request for archive documents + - Bulk download request requests to follow format + THEN: + - Files defined in resulting zipfile are formatted + """ self.doc2.title = "This is Doc 2" self.doc2.save() @@ -2570,6 +2588,15 @@ class TestBulkDownload(DirectoriesMixin, APITestCase): @override_settings(FILENAME_FORMAT="{document_type}/{title}") def test_formatted_download_both(self): + """ + GIVEN: + - Defined file naming format + WHEN: + - Bulk download request for original documents and archive documents + - Bulk download request requests to follow format + THEN: + - Files defined in resulting zipfile are formatted + """ dc1 = DocumentType.objects.create(name="bill") dc2 = DocumentType.objects.create(name="statement") From 48ef8eca80a385623449b4110f2de6a51b8a4059 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 4 Dec 2022 23:09:19 -0800 Subject: [PATCH 3/3] Add bulk download options dropdown --- .../bulk-editor/bulk-editor.component.html | 66 ++++++--- .../bulk-editor/bulk-editor.component.scss | 7 + .../bulk-editor/bulk-editor.component.ts | 133 +++++++++++++----- .../src/app/services/rest/document.service.ts | 12 +- src-ui/src/theme.scss | 6 +- 5 files changed, 171 insertions(+), 53 deletions(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 04069d997..d8345fd81 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -66,7 +66,6 @@
-
- -
+
- +
+ +
+ +
+
+

Include:

+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+
+
+ +
+ +
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss index e69de29bb..939f2c790 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.scss @@ -0,0 +1,7 @@ +.dropdown-toggle-split { + --bs-border-radius: .25rem; +} + +.dropdown-menu{ + --bs-dropdown-min-width: 12rem; +} diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 7c2ca6e55..dbfb9d2f0 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -25,6 +25,8 @@ import { saveAs } from 'file-saver' import { StoragePathService } from 'src/app/services/rest/storage-path.service' import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path' import { SETTINGS_KEYS } from 'src/app/data/paperless-uisettings' +import { FormControl, FormGroup } from '@angular/forms' +import { first, Subject, takeUntil } from 'rxjs' @Component({ selector: 'app-bulk-editor', @@ -43,6 +45,14 @@ export class BulkEditorComponent { storagePathsSelectionModel = new FilterableDropdownSelectionModel() awaitingDownload: boolean + unsubscribeNotifier: Subject = new Subject() + + downloadForm = new FormGroup({ + downloadFileTypeArchive: new FormControl(true), + downloadFileTypeOriginals: new FormControl(false), + downloadUseFormatting: new FormControl(false), + }) + constructor( private documentTypeService: DocumentTypeService, private tagService: TagService, @@ -66,16 +76,46 @@ export class BulkEditorComponent { ngOnInit() { this.tagService .listAll() + .pipe(first()) .subscribe((result) => (this.tags = result.results)) this.correspondentService .listAll() + .pipe(first()) .subscribe((result) => (this.correspondents = result.results)) this.documentTypeService .listAll() + .pipe(first()) .subscribe((result) => (this.documentTypes = result.results)) this.storagePathService .listAll() + .pipe(first()) .subscribe((result) => (this.storagePaths = result.results)) + + this.downloadForm + .get('downloadFileTypeArchive') + .valueChanges.pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe((newValue) => { + if (!newValue) { + this.downloadForm + .get('downloadFileTypeOriginals') + .patchValue(true, { emitEvent: false }) + } + }) + this.downloadForm + .get('downloadFileTypeOriginals') + .valueChanges.pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe((newValue) => { + if (!newValue) { + this.downloadForm + .get('downloadFileTypeArchive') + .patchValue(true, { emitEvent: false }) + } + }) + } + + ngOnDestroy(): void { + this.unsubscribeNotifier.next(this) + this.unsubscribeNotifier.complete() } private executeBulkOperation(modal, method: string, args) { @@ -84,8 +124,9 @@ export class BulkEditorComponent { } this.documentService .bulkEdit(Array.from(this.list.selected), method, args) - .subscribe( - (response) => { + .pipe(first()) + .subscribe({ + next: () => { this.list.reload() this.list.reduceSelectionToFilter() this.list.selected.forEach((id) => { @@ -95,7 +136,7 @@ export class BulkEditorComponent { modal.close() } }, - (error) => { + error: (error) => { if (modal) { modal.componentInstance.buttonsEnabled = true } @@ -104,8 +145,8 @@ export class BulkEditorComponent { error.error )}` ) - } - ) + }, + }) } private applySelectionData( @@ -126,6 +167,7 @@ export class BulkEditorComponent { openTagsDropdown() { this.documentService .getSelectionData(Array.from(this.list.selected)) + .pipe(first()) .subscribe((s) => { this.applySelectionData(s.selected_tags, this.tagSelectionModel) }) @@ -134,6 +176,7 @@ export class BulkEditorComponent { openDocumentTypeDropdown() { this.documentService .getSelectionData(Array.from(this.list.selected)) + .pipe(first()) .subscribe((s) => { this.applySelectionData( s.selected_document_types, @@ -145,6 +188,7 @@ export class BulkEditorComponent { openCorrespondentDropdown() { this.documentService .getSelectionData(Array.from(this.list.selected)) + .pipe(first()) .subscribe((s) => { this.applySelectionData( s.selected_correspondents, @@ -156,6 +200,7 @@ export class BulkEditorComponent { openStoragePathDropdown() { this.documentService .getSelectionData(Array.from(this.list.selected)) + .pipe(first()) .subscribe((s) => { this.applySelectionData( s.selected_storage_paths, @@ -232,12 +277,14 @@ export class BulkEditorComponent { modal.componentInstance.btnClass = 'btn-warning' modal.componentInstance.btnCaption = $localize`Confirm` - modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation(modal, 'modify_tags', { - add_tags: changedTags.itemsToAdd.map((t) => t.id), - remove_tags: changedTags.itemsToRemove.map((t) => t.id), + modal.componentInstance.confirmClicked + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe(() => { + this.executeBulkOperation(modal, 'modify_tags', { + add_tags: changedTags.itemsToAdd.map((t) => t.id), + remove_tags: changedTags.itemsToRemove.map((t) => t.id), + }) }) - }) } else { this.executeBulkOperation(null, 'modify_tags', { add_tags: changedTags.itemsToAdd.map((t) => t.id), @@ -270,11 +317,13 @@ export class BulkEditorComponent { } modal.componentInstance.btnClass = 'btn-warning' modal.componentInstance.btnCaption = $localize`Confirm` - modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation(modal, 'set_correspondent', { - correspondent: correspondent ? correspondent.id : null, + modal.componentInstance.confirmClicked + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe(() => { + this.executeBulkOperation(modal, 'set_correspondent', { + correspondent: correspondent ? correspondent.id : null, + }) }) - }) } else { this.executeBulkOperation(null, 'set_correspondent', { correspondent: correspondent ? correspondent.id : null, @@ -306,11 +355,13 @@ export class BulkEditorComponent { } modal.componentInstance.btnClass = 'btn-warning' modal.componentInstance.btnCaption = $localize`Confirm` - modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation(modal, 'set_document_type', { - document_type: documentType ? documentType.id : null, + modal.componentInstance.confirmClicked + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe(() => { + this.executeBulkOperation(modal, 'set_document_type', { + document_type: documentType ? documentType.id : null, + }) }) - }) } else { this.executeBulkOperation(null, 'set_document_type', { document_type: documentType ? documentType.id : null, @@ -342,11 +393,13 @@ export class BulkEditorComponent { } modal.componentInstance.btnClass = 'btn-warning' modal.componentInstance.btnCaption = $localize`Confirm` - modal.componentInstance.confirmClicked.subscribe(() => { - this.executeBulkOperation(modal, 'set_storage_path', { - storage_path: storagePath ? storagePath.id : null, + modal.componentInstance.confirmClicked + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe(() => { + this.executeBulkOperation(modal, 'set_storage_path', { + storage_path: storagePath ? storagePath.id : null, + }) }) - }) } else { this.executeBulkOperation(null, 'set_storage_path', { storage_path: storagePath ? storagePath.id : null, @@ -364,16 +417,30 @@ export class BulkEditorComponent { modal.componentInstance.message = $localize`This operation cannot be undone.` modal.componentInstance.btnClass = 'btn-danger' modal.componentInstance.btnCaption = $localize`Delete document(s)` - modal.componentInstance.confirmClicked.subscribe(() => { - modal.componentInstance.buttonsEnabled = false - this.executeBulkOperation(modal, 'delete', {}) - }) + modal.componentInstance.confirmClicked + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe(() => { + modal.componentInstance.buttonsEnabled = false + this.executeBulkOperation(modal, 'delete', {}) + }) } - downloadSelected(content = 'archive') { + downloadSelected() { this.awaitingDownload = true + let downloadFileType: string = + this.downloadForm.get('downloadFileTypeArchive').value && + this.downloadForm.get('downloadFileTypeOriginals').value + ? 'both' + : this.downloadForm.get('downloadFileTypeArchive').value + ? 'archive' + : 'originals' this.documentService - .bulkDownload(Array.from(this.list.selected), content) + .bulkDownload( + Array.from(this.list.selected), + downloadFileType, + this.downloadForm.get('downloadUseFormatting').value + ) + .pipe(first()) .subscribe((result: any) => { saveAs(result, 'documents.zip') this.awaitingDownload = false @@ -389,9 +456,11 @@ export class BulkEditorComponent { modal.componentInstance.message = $localize`This operation cannot be undone.` modal.componentInstance.btnClass = 'btn-danger' modal.componentInstance.btnCaption = $localize`Proceed` - modal.componentInstance.confirmClicked.subscribe(() => { - modal.componentInstance.buttonsEnabled = false - this.executeBulkOperation(modal, 'redo_ocr', {}) - }) + modal.componentInstance.confirmClicked + .pipe(takeUntil(this.unsubscribeNotifier)) + .subscribe(() => { + modal.componentInstance.buttonsEnabled = false + this.executeBulkOperation(modal, 'redo_ocr', {}) + }) } } diff --git a/src-ui/src/app/services/rest/document.service.ts b/src-ui/src/app/services/rest/document.service.ts index 8e4d8eee9..4e7e97110 100644 --- a/src-ui/src/app/services/rest/document.service.ts +++ b/src-ui/src/app/services/rest/document.service.ts @@ -174,10 +174,18 @@ export class DocumentService extends AbstractPaperlessService ) } - bulkDownload(ids: number[], content = 'both') { + bulkDownload( + ids: number[], + content = 'both', + useFilenameFormatting: boolean = false + ) { return this.http.post( this.getResourceUrl(null, 'bulk_download'), - { documents: ids, content: content }, + { + documents: ids, + content: content, + follow_formatting: useFilenameFormatting, + }, { responseType: 'blob' } ) } diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss index 77260a882..a6273eaba 100644 --- a/src-ui/src/theme.scss +++ b/src-ui/src/theme.scss @@ -203,9 +203,13 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,