[gentoo-portage-dev] [PATCH 1/2] dblink: case insensitive support for bug #524236

[Zac Medico <zmedico@gentoo.org>]

This adds dblink._contents_contains, _contents_iter, and  _contents_key
methods that provide an interface for contents operations with "implicit"
case handling.

X-Gentoo-Bug: 524236
X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=524236
---
 pym/portage/dbapi/vartree.py | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 8b06f4c..2d1003f 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1515,6 +1515,8 @@ class dblink(object):
 		self.contentscache = None
 		self._contents_inodes = None
 		self._contents_basenames = None
+		self._contents_case_insensitive = None
+		self._contents_case_reverse_map = None
 		self._linkmap_broken = False
 		self._device_path_map = {}
 		self._hardlink_merge_map = {}
@@ -1526,6 +1528,15 @@ class dblink(object):
 		# compliance with RESTRICT=preserve-libs.
 		self._preserve_libs = "preserve-libs" in mysettings.features
 
+		if "case-insensitive-fs" in self.settings.features:
+			self._contents_key = self._contents_key_case_insensitive
+			self._contents_contains = self._contents_contains_case_insensitive
+			self._contents_iter = self._contents_iter_case_insensitive
+		else:
+			self._contents_key = self._contents_key_case_sensitive
+			self._contents_contains = self._contents_contains_case_sensitive
+			self._contents_iter = self._contents_iter_case_sensitive
+
 	def __hash__(self):
 		return hash(self._hash_key)
 
@@ -1612,6 +1623,8 @@ class dblink(object):
 		self.contentscache = None
 		self._contents_inodes = None
 		self._contents_basenames = None
+		self._contents_case_insensitive = None
+		self._contents_case_reverse_map = None
 
 	def getcontents(self):
 		"""
@@ -1716,6 +1729,36 @@ class dblink(object):
 		self.contentscache = pkgfiles
 		return pkgfiles
 
+	def _contents_case_insensitive_init(self):
+		self._contents_case_insensitive = dict(
+			(k.lower(), v) for k, v in self.getcontents().items())
+		self._contents_case_reverse_map = dict(
+			(k.lower(), k) for k in self.getcontents())
+
+	def _contents_iter_case_insensitive(self):
+		if self._contents_case_insensitive is None:
+			self._contents_case_insensitive_init()
+		return iter(self._contents_case_insensitive)
+
+	def _contents_key_case_insensitive(self, key):
+		if self._contents_case_reverse_map is None:
+			self._contents_case_insensitive_init()
+		return self._contents_case_reverse_map[key]
+
+	def _contents_contains_case_insensitive(self, key):
+		if self._contents_case_insensitive is None:
+			self._contents_case_insensitive_init()
+		return key.lower() in self._contents_case_insensitive
+
+	def _contents_key_case_sensitive(self, key):
+		return key
+
+	def _contents_iter_case_sensitive(self):
+		return iter(self.getcontents())
+
+	def _contents_contains_case_sensitive(self, key):
+		return key in self.getcontents()
+
 	def _prune_plib_registry(self, unmerge=False,
 		needed=None, preserve_paths=None):
 		# remove preserved libraries that don't have any consumers left
-- 
2.0.4