git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH/RFC] file import functionality for git-remote-mw

From
PVPavel Volek <pavel.volek@ensimag.imag.fr>
Date
Jun 4, 2012, 19:15 UTC
Message-ID
<1338837351-8996-1-git-send-email-Pavel.Volek@ensimag.imag.fr>
In-Reply-To
<y>
From: Volek Pavel <me@pavelvolek.cz>
The current version of the git-remote-mediawiki supports only import and export of the pages, doesn't support import and export of file attachements which are also exposed by MediaWiki API. This patch adds the functionality to import the last versions of the files and all versions of description pages for these files.
Signed-off-by: Pavel Volek <Pavel.Volek@ensimag.imag.fr>
Signed-off-by: NGUYEN Kim Thuat <Kim-Thuat.Nguyen@ensimag.imag.fr>
Signed-off-by: ROUCHER IGLESIAS Javier <roucherj@ensimag.imag.fr>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
 contrib/mw-to-git/git-remote-mediawiki | 128 +++++++++++++++++++++++++++++++--
 1 file changed, 123 insertions(+), 5 deletions(-)
diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki
index c18bfa1..4168218 100755
--- a/contrib/mw-to-git/git-remote-mediawiki
+++ b/contrib/mw-to-git/git-remote-mediawiki
@@ -267,6 +267,39 @@ sub get_mw_pages {
 	return values(%pages);
 }
 
+sub get_mw_media_pages {
+	mw_connect_maybe();
+
+	my %pages; # hash on page titles to avoid duplicates
+
+	# get all pages for mediafiles (they are in different namespace)
+	# only one namespace can be queried at the same moment
+	my $mw_pages = $mediawiki->list({
+		action => 'query',
+		list => 'allpages',
+		apnamespace => get_mw_namespace_id("File"),
+		aplimit => 500,
+	});
+	if (!defined($mw_pages)) {
+		print STDERR "fatal: could not get the list of media file pages.\n";
+		print STDERR "fatal: '$url' does not appear to be a mediawiki\n";
+		print STDERR "fatal: make sure '$url/api.php' is a valid page.\n";
+		exit 1;
+	}
+	foreach my $page (@{$mw_pages}) {
+		$pages{$page->{title}} = $page;
+	}
+	return values(%pages);
+}
+
+sub get_all_mw_pages() {
+	my @pages = get_mw_pages();
+	my @media_pages = get_mw_media_pages();
+	push(@pages,@media_pages);
+
+	return @pages;
+}
+
 sub run_git {
 	open(my $git, "-|:encoding(UTF-8)", "git " . $_[0]);
 	my $res = do { local $/; <$git> };
@@ -300,7 +333,7 @@ my %basetimestamps;
 sub get_last_remote_revision {
 	mw_connect_maybe();
 
-	my @pages = get_mw_pages();
+	my @pages = get_all_mw_pages();
 
 	my $max_rev_num = 0;
 
@@ -403,6 +436,25 @@ sub mw_option {
 	print STDOUT "unsupported\n";
 }
 
+# Returns MediaWiki id for a canonical namespace name. Ex.: "File", "Project".
+sub get_mw_namespace_id() {
+	mw_connect_maybe();
+	my $name = shift;
+	my $query = {
+		action => 'query',
+		meta => 'siteinfo',
+		siprop => 'namespaces',
+	};
+	my $result = $mediawiki->api($query);
+
+	while (my ($id, $ns) = each(%{$result->{query}->{namespaces}})) {
+		if (defined($ns->{canonical}) && ($ns->{canonical} eq $name)) {
+			return $ns->{id};
+		}
+	}
+	die "Namespace $name was not found on MediaWiki.";
+}
+
 sub fetch_mw_revisions_for_page {
 	my $page = shift;
 	my $id = shift;
@@ -461,11 +513,37 @@ sub fetch_mw_revisions {
 	return ($n, @revisions);
 }
 
+sub download_mw_mediafile {
+	my $filename = shift;
+
+	$mediawiki->{config}->{files_url} = $url;
+
+	my $file = $mediawiki->download( { title => $filename } )
+			|| die 'Fatal: Error ' .
+				$mediawiki->{error}->{code} .
+				' from mediwiki: ' . $mediawiki->{error}->{details};
+	if (!defined($file)){
+		print STDERR "\tFile \'$filename\' could not be downloaded.\n";
+		exit 1;
+	} elsif ($file eq "") {
+		print STDERR "\tFile \'$filename\' does not exist on the wiki.\n";
+		exit 1;
+	} else {
+		return $file;
+	}
+}
+
 sub import_file_revision {
 	my $commit = shift;
 	my %commit = %{$commit};
 	my $full_import = shift;
 	my $n = shift;
+	my $mediafile_import = shift;
+	my $mediafile;my %mediafile;
+	if ($mediafile_import) {
+		$mediafile = shift;
+		%mediafile = %{$mediafile};
+	}
 
 	my $title = $commit{title};
 	my $comment = $commit{comment};
@@ -485,6 +563,10 @@ sub import_file_revision {
 	if ($content ne DELETED_CONTENT) {
 		print STDOUT "M 644 inline $title.mw\n";
 		literal_data($content);
+		if ($mediafile_import) {
+			print STDOUT "M 644 inline $mediafile{title}\n";
+			literal_data($mediafile{content});
+		}
 		print STDOUT "\n\n";
 	} else {
 		print STDOUT "D $title.mw\n";
@@ -547,7 +629,7 @@ sub mw_import_ref {
 
 	mw_connect_maybe();
 
-	my @pages = get_mw_pages();
+	my @pages = get_all_mw_pages();
 
 	print STDERR "Searching revisions...\n";
 	my $last_local = get_last_local_revision();
@@ -580,6 +662,7 @@ sub mw_import_ref {
 
 		$n++;
 
+		my $page_title = $result->{query}->{pages}->{$pagerevid->{pageid}}->{title};
 		my %commit;
 		$commit{author} = $rev->{user} || 'Anonymous';
 		$commit{comment} = $rev->{comment} || '*Empty MediaWiki Message*';
@@ -596,9 +679,44 @@ sub mw_import_ref {
 		}
 		$commit{date} = DateTime::Format::ISO8601->parse_datetime($last_timestamp);
 
-		print STDERR "$n/", scalar(@revisions), ": Revision #$pagerevid->{revid} of $commit{title}\n";
-
-		import_file_revision(\%commit, ($fetch_from == 1), $n);
+		# differentiates classic pages and media pages
+		my @prefix = split (":",$page_title);
+		if ($prefix[0] eq "File" || $prefix[0] eq "Image") {
+			# check if there is a corresponding mediafile with the same timestamp => it is page
+			# for new verion of the file (not only for new version of the description of the file)
+			# => download corresponding file version
+			$query = {
+				action => 'query',
+				prop => 'imageinfo',
+				titles => $page_title,
+				iistart => $rev->{timestamp},
+				iiend => $rev->{timestamp},
+				iiprop => 'timestamp|archivename',
+				iilimit => 1,
+			};
+			$result = $mediawiki->api($query);
+
+			my ($imageid,$imageinfo) = each ( %{$result->{query}->{pages}} );
+			# page has a related version of the file
+			if (defined($imageinfo->{imageinfo})) {
+				foreach ( @{$imageinfo->{imageinfo}} ) {
+					my %mediafile;
+					if ($prefix[0] eq "File") { $mediafile{title} = substr $page_title, 5; }
+					else { $mediafile{title} = substr $page_title, 6; }
+
+					$mediafile{content} = download_mw_mediafile("File:".$mediafile{title});
+					print STDERR "$n/", scalar(@revisions), ": Revision #$pagerevid->{revid} of $commit{title}\n";
+					import_file_revision(\%commit, ($fetch_from == 1), $n, 1, \%mediafile);
+				}
+			# page has no related version of the file, do commit only for the page
+			} else {
+				print STDERR "$n/", scalar(@revisions), ": Revision #$pagerevid->{revid} of $commit{title}\n";
+				import_file_revision(\%commit, ($fetch_from == 1), $n, 0);
+			}
+		} else {
+			print STDERR "$n/", scalar(@revisions), ": Revision #$pagerevid->{revid} of $commit{title}\n";
+			import_file_revision(\%commit, ($fetch_from == 1), $n, 0);
+		}
 	}
 
 	if ($fetch_from == 1 && $n == 0) {
-- 
1.7.10.2.552.gaa3bb87
Previous: Andrew GarberNext: Matthieu Moy
Message 38 of 98 in “Close a forgotten reference to the HEAD ref.”
  1. 1/2 Close a forgotten reference to the HEAD ref.Robin Rosenberg, Dec 2, 2008
  2. 2/2 Improve closing of files in error situations.Robin Rosenberg, Dec 2, 2008
  3. 2/2 Improve closing of files in error situations.Robin Rosenberg, Dec 2, 2008
  4. 0/3 Ref log readerRobin Rosenberg, Jun 7, 2009
  5. 1/3 Assert the name and origName properties of Ref objectsRobin Rosenberg, Jun 7, 2009
  6. 2/3 Add methods to RawParseUtils for scanning backwards.Robin Rosenberg, Jun 7, 2009
  7. 3/3 Add a ref log reader classRobin Rosenberg, Jun 7, 2009
  8. Shawn O. PearceJun 7, 2009
  9. Robin RosenbergJun 7, 2009
  10. Shawn O. PearceJun 7, 2009
  11. 1/2 Add methods to RawParseUtils for scanning backwards.Robin Rosenberg, Jun 8, 2009
  12. 2/2 Add a ref log reader classRobin Rosenberg, Jun 8, 2009
  13. Shawn O. PearceJun 12, 2009
  14. 1/2 Use a UTC relative time zone for PersonIdentRobin Rosenberg, Jun 15, 2009
  15. 2/2 Add a ref log reader classRobin Rosenberg, Jun 15, 2009
  16. Robin RosenbergJun 15, 2009
  17. [BUG] apply: test for trailing whitespace & no new line bugy@vger.kernel.org, Jun 22, 2009
  18. [BUG] apply: test for trailing whitespace & no new line bugy@vger.kernel.org, Jun 22, 2009
  19. diff.c: fix a graph output bugstruggleyb.nku@gmail.com, Jul 8, 2010
  20. Junio C HamanoJul 9, 2010
  21. Junio C HamanoJul 9, 2010
  22. Nazri RamliyJul 9, 2010
  23. Junio C HamanoJul 9, 2010
  24. Bo YangJul 11, 2010
  25. 1/2 setup.c: add enter_work_tree()pclouds@gmail.com, Oct 7, 2010
  26. 2/2 worktree: provide better prefix to go back to original cwdpclouds@gmail.com, Oct 7, 2010
  27. Nguyen Thai Ngoc DuyOct 7, 2010
  28. Junio C HamanoOct 7, 2010
  29. Nguyen Thai Ngoc DuyOct 7, 2010
  30. Junio C HamanoOct 7, 2010
  31. Nguyen Thai Ngoc DuyOct 7, 2010
  32. Corrected cmitmode set in the right lower window when initiating a diff.Michał Pomorski, Nov 23, 2010
  33. git-p4: replace each tab with 8 spaces for consistencyAndrew Garber, Apr 7, 2011
  34. Junio C HamanoApr 7, 2011
  35. Phil HordApr 7, 2011
  36. Junio C HamanoApr 7, 2011
  37. git-p4: replace each tab with 8 spaces for consistencyAndrew Garber, Apr 7, 2011
  38. file import functionality for git-remote-mwPavel Volek, Jun 4, 2012
  39. Matthieu MoyJun 4, 2012
  40. Export file attachements in git-remote-mediawikiNGUYEN Kim Thuat, Jun 4, 2012
  41. Matthieu MoyJun 4, 2012
  42. nguyenkiJun 5, 2012
  43. Matthieu MoyJun 5, 2012
  44. nguyenkiJun 6, 2012
  45. nguyenkiJun 5, 2012
  46. [PATCHv1] Export file in git-remote-mediawikiKim Thuat NGUYEN, Jun 8, 2012
  47. Matthieu MoyJun 8, 2012
  48. nguyenkiJun 8, 2012
  49. Matthieu MoyJun 10, 2012
  50. [PATCHv2] git-remote-mediawiki: export File: attachmentsKim Thuat NGUYEN, Jun 12, 2012
  51. Matthieu MoyJun 12, 2012
  52. nguyenkiJun 12, 2012
  53. Max HornJun 12, 2012
  54. [PATCHv3] git-remote-mediawiki: export File: attachmentskim-thuat.nguyen@ensimag.imag.fr, Jun 13, 2012
  55. Matthieu MoyJun 13, 2012
  56. git send-email should not allow 'y' for in-reply-toEric Blake, Jan 11, 2013
  57. Jeff KingJan 11, 2013
  58. Eric BlakeJan 11, 2013
  59. Hilco WijbengaJan 11, 2013
  60. Jeff KingJan 11, 2013
  61. Junio C HamanoFeb 24, 2013
  62. v3 [PATCH 1/2] status: introduce status.short to enable --short by defaulty@ensimag.imag.fr, Jun 10, 2013
  63. v3 [PATCH 1/2] status: introduce status.short to enable --short by defaulty@ensimag.imag.fr, Jun 10, 2013
  64. v3 [PATCH 2/2] status:introduce status.branch to enable --branch by defaulty@ensimag.imag.fr, Jun 10, 2013
  65. v3 [PATCH 2/2] status:introduce status.branch to enable --branch by defaulty@ensimag.imag.fr, Jun 10, 2013
  66. Matthieu MoyJun 10, 2013
  67. Junio C HamanoJun 10, 2013
  68. 3/3 builtin/blame.c: reduce scope of variablesElia Pinto, Jan 29, 2014
  69. use strchrnul() in place of strchr() and strlen()Rohit Mani, Mar 5, 2014
  70. Junio C HamanoMar 6, 2014
  71. [GSoC][PATCH v2] use strchrnul() in place of strchr() and strlen()Rohit Mani, Mar 8, 2014
  72. Junio C HamanoMar 10, 2014
  73. [GSOC2014]TamerTas, Mar 10, 2014
  74. [GSOC2014] changed logical chain in branch.c to lookup tablesTamerTas, Mar 10, 2014
  75. Stefan BellerMar 10, 2014
  76. Eric SunshineMar 10, 2014
  77. Tamer TASMar 10, 2014
  78. Eric SunshineMar 10, 2014
  79. Tamer TASMar 11, 2014
  80. Eric SunshineMar 11, 2014
  81. [GSOC2014] add: Rewrite run_add_interactive to use struct argv_arrayMovchan Pavel, Mar 18, 2014
  82. Junio C HamanoMar 18, 2014
  83. Use "working tree" instead of "working directory" for git statusLars Vogel, Jun 9, 2016
  84. Eric SunshineJun 9, 2016
  85. Lars VogelJun 9, 2016
  86. 1/1 git-stash.txt: correct "git stash" behavior with no argumentsTakahito Ogawa, Oct 11, 2017
  87. Junio C HamanoOct 12, 2017
  88. 小川恭史Oct 12, 2017
  89. 小川恭史Oct 12, 2017
  90. Junio C HamanoOct 12, 2017
  91. Allow usage of --gpg-sign flag in commit-tree builtin.Brandon Richardson, Jan 17, 2019
  92. Martin ÅgrenJan 17, 2019
  93. commit-tree: add missing --gpg-sign flagBrandon Richardson, Jan 18, 2019
  94. Martin ÅgrenJan 18, 2019
  95. Brandon RichardsonJan 18, 2019
  96. Junio C HamanoJan 18, 2019
  97. [L10N] Kickoff for Git 2.22.0 round #1Jiang Xin, May 14, 2019
  98. [L10N] Kickoff for Git 2.49.0Jiang Xin, Feb 27, 2025

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.