added gray disc icon for unitialized volumes

simple partitioning interface finished
order in navigation bar changed
ignore extended partitions (in container list)

pythonrewrite/bin/CryptoBox.py

@@ -113,10 +113,10 @@ class CryptoBoxProps(CryptoBox):
 	def __init__(self, config_file=None):
 		'''read config and fill class variables'''
 		CryptoBox.__init__(self, config_file)
-		self.__reReadContainerList()
+		self.reReadContainerList()
 	
 
-	def __reReadContainerList(self):
+	def reReadContainerList(self):
 		self.containers = []
 		for device in CryptoBoxTools.getAvailablePartitions():
 			if self.isDeviceAllowed(device):

pythonrewrite/bin/CryptoBoxTools.py

@@ -18,7 +18,8 @@ def getAvailablePartitions():
 				if (len(p_details) == 4):
 					"the following code prevents double entries like /dev/hda and /dev/hda1"
 					(p_major, p_minor, p_size, p_device) = p_details
-					if  re.search('^[0-9]*$', p_major) and re.search('^[0-9]*$', p_minor):
+					## ignore lines with: invalid minor/major or extend partitions (size=1)
+					if  re.search('^[0-9]*$', p_major) and re.search('^[0-9]*$', p_minor) and (p_size != "1"):
 						p_parent = re.sub('[1-9]?[0-9]$', '', p_device)
 						if p_parent == p_device:
 							if [e for e in ret_list if re.search('^' + p_parent + '[1-9]?[0-9]$', e)]:

pythonrewrite/bin/WebInterfaceDataset.py

@@ -14,6 +14,7 @@ class WebInterfaceDataset(dict):
 		self.cbox = cbox
 		self.__setConfigValues()
 		self.__setCryptoBoxState()
+	
 
 
 	def setPluginState(self, plugins):
@@ -41,18 +42,7 @@ class WebInterfaceDataset(dict):
 					self["Data.CurrentDisk.capacity.percent"] = percent
 	
 
-	def __setConfigValues(self):
-		self["Settings.TemplateDir"] = os.path.abspath(self.prefs["Locations"]["TemplateDir"])
-		self["Settings.LanguageDir"] = os.path.abspath(self.prefs["Locations"]["LangDir"])
-		self["Settings.DocDir"] = os.path.abspath(self.prefs["Locations"]["DocDir"])
-		self["Settings.Stylesheet"] = self.prefs["WebSettings"]["Stylesheet"]
-		self["Settings.Language"] = self.prefs["WebSettings"]["Language"]
-		self["Settings.DocLang"] = self.prefs["WebSettings"]["DocLanguage"]
-		self["Settings.PluginDir"] = self.prefs["Locations"]["PluginDir"]
-
-
-	def __setCryptoBoxState(self):
-		self["Data.Version"] = self.cbox.VERSION
+	def setContainersState(self):
 		avail_counter  = 0
 		active_counter = 0
 		for container in self.cbox.getContainerList():
@@ -67,6 +57,20 @@ class WebInterfaceDataset(dict):
 			if isMounted: active_counter += 1
 			avail_counter += 1
 		self["Data.activeDisksCount"] = active_counter
+	
+
+	def __setConfigValues(self):
+		self["Settings.TemplateDir"] = os.path.abspath(self.prefs["Locations"]["TemplateDir"])
+		self["Settings.LanguageDir"] = os.path.abspath(self.prefs["Locations"]["LangDir"])
+		self["Settings.DocDir"] = os.path.abspath(self.prefs["Locations"]["DocDir"])
+		self["Settings.Stylesheet"] = self.prefs["WebSettings"]["Stylesheet"]
+		self["Settings.Language"] = self.prefs["WebSettings"]["Language"]
+		self["Settings.DocLang"] = self.prefs["WebSettings"]["DocLanguage"]
+		self["Settings.PluginDir"] = self.prefs["Locations"]["PluginDir"]
+
+
+	def __setCryptoBoxState(self):
+		self["Data.Version"] = self.cbox.VERSION
 		for lang in self.cbox.getAvailableLanguages():
 			self["Data.Languages." + lang] = self.__getLanguageName(lang)
 		## TODO: open issues: Data.Config.AdminPasswordIsSet

pythonrewrite/bin/WebInterfaceSites.py

@@ -34,6 +34,10 @@ class WebInterfaceSites:
 
 
 	def __resetDataset(self):
+		"""this method has to be called at the beginning of every "site" action
+			important: only at the beginning of an action (to not loose information)
+			important: for _every_ "site" action (cherrypy is stateful)
+		"""
 		self.dataset = WebInterfaceDataset.WebInterfaceDataset(self.cbox, self.prefs)
 
 
@@ -144,8 +148,6 @@ class WebInterfaceSites:
 					self.dataset["Data.Warning"] = "SetVolumeNameFailed"
 				else:
 					self.log.info("successfully renamed volume '%s' to '%s'" % (device, volume_name))
-					# reread the dataset
-					self.__resetDataset()
 					self.dataset.setCurrentDiskState(device)
 			else:
 				self.dataset["Data.Warning"] = "InvalidVolumeName"
@@ -188,8 +190,6 @@ class WebInterfaceSites:
 					self.log.warn("failed to mount the device (%s)" % device)
 				else:
 					self.log.info("successfully mounted the container (%s)" % device)
-					# reread the dataset
-					self.__resetDataset()
 					self.dataset.setCurrentDiskState(device)
 		else:
 			if self.cbox.getContainerList():
@@ -264,7 +264,6 @@ class WebInterfaceSites:
 				else:
 					self.log.info("successfully initialized device '%s'" % device)
 					# reread the dataset
-					self.__resetDataset()
 					self.dataset.setCurrentDiskState(device)
 					return self.__render("show_volume")
 		else:
@@ -274,8 +273,9 @@ class WebInterfaceSites:
 				return self.__render("show_status")
 
 
-	def test(self):
+	def test(self, weblang=""):
 		self.__resetDataset()
+		self.__setWebLang(weblang)
 		return "test passed"
 
 
@@ -306,7 +306,6 @@ class WebInterfaceSites:
 				else:
 					self.log.info("successfully unmounted the container (%s)" % device)
 					# reread the dataset
-					self.__resetDataset()
 					self.dataset.setCurrentDiskState(device)
 		else:
 			if self.cbox.getContainerList():
@@ -455,6 +454,9 @@ class WebInterfaceSites:
 		## add the current state of the plugins to the hdf dataset
 		self.dataset.setPluginState(self.pluginList)
 
+		## update the container information
+		self.dataset.setContainersState()
+
 		hdf = neo_util.HDF()
 		hdf.readFile(hdf_path)
 		self.log.debug(self.dataset)