From 3922ed9422f724a932962bb0b8d7e11ee62c7e00 Mon Sep 17 00:00:00 2001 From: "Chang.H.S" Date: Wed, 26 Sep 2012 17:52:59 +0900 Subject: [PATCH 1/1] DeviceManager : Choice filesystem type on initialize. and fix bug..in plugin shutdown. DeviceManager : fix locale. --- .../DeviceManager/locale/DeviceManager.pot | 193 ++++++++++++--------- .../SystemPlugins/DeviceManager/locale/de.po | 193 ++++++++++++--------- .../Plugins/SystemPlugins/DeviceManager/plugin.py | 75 +++++--- 3 files changed, 271 insertions(+), 190 deletions(-) diff --git a/lib/python/Plugins/SystemPlugins/DeviceManager/locale/DeviceManager.pot b/lib/python/Plugins/SystemPlugins/DeviceManager/locale/DeviceManager.pot index b7f5684..d9cd937 100644 --- a/lib/python/Plugins/SystemPlugins/DeviceManager/locale/DeviceManager.pot +++ b/lib/python/Plugins/SystemPlugins/DeviceManager/locale/DeviceManager.pot @@ -1,9 +1,11 @@ -# translations for DeviceManager. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: DeviceManager\n" -"POT-Creation-Date: 2012-08-23 09:44\n" +"POT-Creation-Date: 2012-09-26 18:09+KST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12,7 +14,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -#: ../plugin.py:70 ../plugin.py:1095 + +#: ../plugin.py:70 ../plugin.py:1238 msgid "Cancel" msgstr "" @@ -36,340 +39,360 @@ msgstr "" msgid "Mount known devices automatically : " msgstr "" -#: ../plugin.py:159 ../plugin.py:230 +#: ../plugin.py:159 ../plugin.py:218 msgid "Close" msgstr "" -#: ../plugin.py:217 +#: ../plugin.py:205 msgid "Umount" msgstr "" -#: ../plugin.py:219 ../plugin.py:255 +#: ../plugin.py:207 ../plugin.py:259 msgid "Mount" msgstr "" -#: ../plugin.py:224 ../plugin.py:257 +#: ../plugin.py:212 ../plugin.py:261 msgid "Check" msgstr "" -#: ../plugin.py:231 ../plugin.py:282 +#: ../plugin.py:219 ../plugin.py:277 msgid "Ok" msgstr "" -#: ../plugin.py:233 +#: ../plugin.py:221 msgid "Initialize" msgstr "" -#: ../plugin.py:238 +#: ../plugin.py:226 msgid "device : %s" msgstr "" -#: ../plugin.py:239 ../plugin.py:266 +#: ../plugin.py:227 ../plugin.py:250 msgid "Size : %s" msgstr "" -#: ../plugin.py:240 +#: ../plugin.py:228 msgid "Partitions : %s" msgstr "" -#: ../plugin.py:241 +#: ../plugin.py:229 msgid "Removable : %s" msgstr "" -#: ../plugin.py:254 -msgid "Devices" -msgstr "" - -#: ../plugin.py:256 -msgid "Format" -msgstr "" - -#: ../plugin.py:262 +#: ../plugin.py:246 msgid "Partition : /dev/%s" msgstr "" -#: ../plugin.py:263 +#: ../plugin.py:247 msgid "Mounted on : %s" msgstr "" -#: ../plugin.py:263 +#: ../plugin.py:247 msgid "not mounted" msgstr "" -#: ../plugin.py:264 +#: ../plugin.py:248 msgid "UUID : %s" msgstr "" -#: ../plugin.py:264 ../plugin.py:265 ../plugin.py:266 ../plugin.py:267 +#: ../plugin.py:248 ../plugin.py:249 ../plugin.py:250 ../plugin.py:251 msgid "unknown" msgstr "" -#: ../plugin.py:265 +#: ../plugin.py:249 msgid "Type : %s" msgstr "" -#: ../plugin.py:267 +#: ../plugin.py:251 msgid "Free : %s" msgstr "" -#: ../plugin.py:281 +#: ../plugin.py:258 +msgid "Devices" +msgstr "" + +#: ../plugin.py:260 +msgid "Format" +msgstr "" + +#: ../plugin.py:267 ../plugin.py:312 +msgid "" +"No partition list found on device.\n" +"Please click BLUE key and do Initialize to use this device." +msgstr "" + +#: ../plugin.py:274 +msgid "" +"This partition is not mountable.\n" +"You need to check or format this partition." +msgstr "" + +#: ../plugin.py:276 msgid "Partitions" msgstr "" -#: ../plugin.py:291 +#: ../plugin.py:286 msgid "Mount Point : %s ->%s" msgstr "" -#: ../plugin.py:291 +#: ../plugin.py:286 msgid "Set up Default Mount Point" msgstr "" -#: ../plugin.py:292 +#: ../plugin.py:287 msgid "Automatically set up a Mount Point" msgstr "" -#: ../plugin.py:292 +#: ../plugin.py:287 msgid "Mount Point : %s -> %s" msgstr "" -#: ../plugin.py:293 +#: ../plugin.py:288 msgid "Mount Point : click ok button on here." msgstr "" -#: ../plugin.py:293 +#: ../plugin.py:288 msgid "User manually Set up a Mount Point" msgstr "" -#: ../plugin.py:383 +#: ../plugin.py:380 ../plugin.py:596 msgid "ext2 - recommended for USB flash memory" msgstr "" -#: ../plugin.py:384 +#: ../plugin.py:381 ../plugin.py:597 msgid "ext3 - recommended for harddisks" msgstr "" -#: ../plugin.py:385 +#: ../plugin.py:382 ../plugin.py:598 msgid "ext4 - experimental" msgstr "" -#: ../plugin.py:386 +#: ../plugin.py:383 ../plugin.py:599 msgid "vfat - for USB flash memory" msgstr "" -#: ../plugin.py:387 +#: ../plugin.py:384 ../plugin.py:600 msgid "Choice filesystem." msgstr "" -#: ../plugin.py:408 +#: ../plugin.py:401 msgid "" "Can't umount %s. \n" "Maybe device or resource busy." msgstr "" -#: ../plugin.py:454 +#: ../plugin.py:426 +msgid "" +"Can not use this mount point.(%s) \n" +"Please select another mount point." +msgstr "" + +#: ../plugin.py:450 msgid "" "Mount Failed!\n" "Current path is already mounted by \"%s\"" msgstr "" -#: ../plugin.py:456 -msgid "Mount Failed!(%s -> %s)" +#: ../plugin.py:467 ../plugin.py:474 +msgid "" +"Mount Failed!\n" +"(%s -> %s)" msgstr "" -#: ../plugin.py:465 +#: ../plugin.py:494 msgid "" "Mount Point is not writeable.\n" "Path : %s" msgstr "" -#: ../plugin.py:500 +#: ../plugin.py:530 msgid "" "Do you really want to initialize the device?\n" "All data on the device will be lost!" msgstr "" -#: ../plugin.py:532 +#: ../plugin.py:563 msgid "How many partitions do you want?(1-4)" msgstr "" -#: ../plugin.py:539 ../plugin.py:561 +#: ../plugin.py:570 ../plugin.py:592 msgid "The number you entered is wrong!" msgstr "" -#: ../plugin.py:550 +#: ../plugin.py:581 msgid "Input size of partition %s.(Max = %d MB)" msgstr "" -#: ../plugin.py:569 +#: ../plugin.py:619 msgid "" "%s\n" "Start Device Inititlization?" msgstr "" -#: ../plugin.py:579 +#: ../plugin.py:629 msgid "umounting failed!Maybe some files in mount point are open" msgstr "" -#: ../plugin.py:581 +#: ../plugin.py:631 msgid "InitInitializing, please wait ..." msgstr "" -#: ../plugin.py:582 ../plugin.py:828 +#: ../plugin.py:632 ../plugin.py:896 msgid "" "\n" "Device : %s" msgstr "" -#: ../plugin.py:583 +#: ../plugin.py:633 msgid "" "\n" "Size : %s MB\n" msgstr "" -#: ../plugin.py:585 +#: ../plugin.py:635 msgid "" "\n" "partition %d : %s MB" msgstr "" -#: ../plugin.py:651 +#: ../plugin.py:714 msgid "Create filesystem, please wait ..." msgstr "" -#: ../plugin.py:652 +#: ../plugin.py:715 msgid "" "\n" "Partition : %s" msgstr "" -#: ../plugin.py:653 ../plugin.py:741 ../plugin.py:829 +#: ../plugin.py:716 ../plugin.py:809 ../plugin.py:897 msgid "" "\n" "Filesystem : %s" msgstr "" -#: ../plugin.py:654 +#: ../plugin.py:717 msgid "" "\n" "Size : %d MB\n" msgstr "" -#: ../plugin.py:664 +#: ../plugin.py:727 msgid "Creating filesystem Error" msgstr "" -#: ../plugin.py:666 +#: ../plugin.py:729 msgid " at /dev/%s" msgstr "" -#: ../plugin.py:686 +#: ../plugin.py:749 msgid "Device Initialization finished sucessfully!" msgstr "" -#: ../plugin.py:719 +#: ../plugin.py:787 msgid "" "Do you really want to check the filesystem?\n" "This could take lots of time!" msgstr "" -#: ../plugin.py:739 +#: ../plugin.py:807 msgid "Check filesystem, please wait ..." msgstr "" -#: ../plugin.py:740 +#: ../plugin.py:808 msgid "" "\n" "Device : /dev/%s" msgstr "" -#: ../plugin.py:762 ../plugin.py:868 +#: ../plugin.py:830 ../plugin.py:936 msgid "" "Can not umount device /dev/%s.\n" "Maybe some files of the filesystem are open" msgstr "" -#: ../plugin.py:769 +#: ../plugin.py:837 msgid "Filesystem check finished sucessfully" msgstr "" -#: ../plugin.py:772 +#: ../plugin.py:840 msgid "Error checking disk. The disk or filesystem may be damaged" msgstr "" -#: ../plugin.py:827 +#: ../plugin.py:895 msgid "Format filesystem, please wait ..." msgstr "" -#: ../plugin.py:830 +#: ../plugin.py:898 msgid "" "\n" "Size : %s" msgstr "" -#: ../plugin.py:883 +#: ../plugin.py:951 msgid "Can not change the partition ID for %s" msgstr "" -#: ../plugin.py:916 +#: ../plugin.py:984 msgid "" "Can not format device /dev/%s.\n" "refresh partition information failed!" msgstr "" -#: ../plugin.py:930 +#: ../plugin.py:998 msgid "" "Make filesystem Error /dev/%s.\n" "Please check your device." msgstr "" -#: ../plugin.py:935 +#: ../plugin.py:1003 msgid "Format finished sucessfully." msgstr "" -#: ../plugin.py:1096 +#: ../plugin.py:1239 msgid "Select" msgstr "" -#: ../plugin.py:1097 +#: ../plugin.py:1240 msgid "Create directory" msgstr "" -#: ../plugin.py:1132 +#: ../plugin.py:1275 msgid "Input mount point path." msgstr "" -#: ../plugin.py:1144 +#: ../plugin.py:1287 msgid "" "Create directory failed!\n" "%s" msgstr "" -#: ../plugin.py:1155 +#: ../plugin.py:1298 msgid "" "Delete directory failed!\n" "Maybe directory is not empty." msgstr "" -#: ../plugin.py:1159 +#: ../plugin.py:1302 msgid "" "Delete directory failed!\n" "%s" msgstr "" -#: ../plugin.py:1354 +#: ../plugin.py:1622 msgid "" -"umounted partitions found.!\n" -"Do you want to open DeviceManager and set mount point?\n" +"No mountable devices found.! (%s)\n" +"Do you want to open DeviceManager and do initialize or format this device?\n" "\n" "(Open 'Menu->Setup->System -> Harddisk -> DeviceManager'\n" " and press MENU button to deactivate this check.)" msgstr "" -#: ../plugin.py:1452 ../plugin.py:1460 +#: ../plugin.py:1673 ../plugin.py:1681 msgid "DeviceManager" msgstr "" -#: ../plugin.py:1460 +#: ../plugin.py:1681 msgid "manage block devices of your VU+" msgstr "" diff --git a/lib/python/Plugins/SystemPlugins/DeviceManager/locale/de.po b/lib/python/Plugins/SystemPlugins/DeviceManager/locale/de.po index b7f5684..d9cd937 100644 --- a/lib/python/Plugins/SystemPlugins/DeviceManager/locale/de.po +++ b/lib/python/Plugins/SystemPlugins/DeviceManager/locale/de.po @@ -1,9 +1,11 @@ -# translations for DeviceManager. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: DeviceManager\n" -"POT-Creation-Date: 2012-08-23 09:44\n" +"POT-Creation-Date: 2012-09-26 18:09+KST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12,7 +14,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" -#: ../plugin.py:70 ../plugin.py:1095 + +#: ../plugin.py:70 ../plugin.py:1238 msgid "Cancel" msgstr "" @@ -36,340 +39,360 @@ msgstr "" msgid "Mount known devices automatically : " msgstr "" -#: ../plugin.py:159 ../plugin.py:230 +#: ../plugin.py:159 ../plugin.py:218 msgid "Close" msgstr "" -#: ../plugin.py:217 +#: ../plugin.py:205 msgid "Umount" msgstr "" -#: ../plugin.py:219 ../plugin.py:255 +#: ../plugin.py:207 ../plugin.py:259 msgid "Mount" msgstr "" -#: ../plugin.py:224 ../plugin.py:257 +#: ../plugin.py:212 ../plugin.py:261 msgid "Check" msgstr "" -#: ../plugin.py:231 ../plugin.py:282 +#: ../plugin.py:219 ../plugin.py:277 msgid "Ok" msgstr "" -#: ../plugin.py:233 +#: ../plugin.py:221 msgid "Initialize" msgstr "" -#: ../plugin.py:238 +#: ../plugin.py:226 msgid "device : %s" msgstr "" -#: ../plugin.py:239 ../plugin.py:266 +#: ../plugin.py:227 ../plugin.py:250 msgid "Size : %s" msgstr "" -#: ../plugin.py:240 +#: ../plugin.py:228 msgid "Partitions : %s" msgstr "" -#: ../plugin.py:241 +#: ../plugin.py:229 msgid "Removable : %s" msgstr "" -#: ../plugin.py:254 -msgid "Devices" -msgstr "" - -#: ../plugin.py:256 -msgid "Format" -msgstr "" - -#: ../plugin.py:262 +#: ../plugin.py:246 msgid "Partition : /dev/%s" msgstr "" -#: ../plugin.py:263 +#: ../plugin.py:247 msgid "Mounted on : %s" msgstr "" -#: ../plugin.py:263 +#: ../plugin.py:247 msgid "not mounted" msgstr "" -#: ../plugin.py:264 +#: ../plugin.py:248 msgid "UUID : %s" msgstr "" -#: ../plugin.py:264 ../plugin.py:265 ../plugin.py:266 ../plugin.py:267 +#: ../plugin.py:248 ../plugin.py:249 ../plugin.py:250 ../plugin.py:251 msgid "unknown" msgstr "" -#: ../plugin.py:265 +#: ../plugin.py:249 msgid "Type : %s" msgstr "" -#: ../plugin.py:267 +#: ../plugin.py:251 msgid "Free : %s" msgstr "" -#: ../plugin.py:281 +#: ../plugin.py:258 +msgid "Devices" +msgstr "" + +#: ../plugin.py:260 +msgid "Format" +msgstr "" + +#: ../plugin.py:267 ../plugin.py:312 +msgid "" +"No partition list found on device.\n" +"Please click BLUE key and do Initialize to use this device." +msgstr "" + +#: ../plugin.py:274 +msgid "" +"This partition is not mountable.\n" +"You need to check or format this partition." +msgstr "" + +#: ../plugin.py:276 msgid "Partitions" msgstr "" -#: ../plugin.py:291 +#: ../plugin.py:286 msgid "Mount Point : %s ->%s" msgstr "" -#: ../plugin.py:291 +#: ../plugin.py:286 msgid "Set up Default Mount Point" msgstr "" -#: ../plugin.py:292 +#: ../plugin.py:287 msgid "Automatically set up a Mount Point" msgstr "" -#: ../plugin.py:292 +#: ../plugin.py:287 msgid "Mount Point : %s -> %s" msgstr "" -#: ../plugin.py:293 +#: ../plugin.py:288 msgid "Mount Point : click ok button on here." msgstr "" -#: ../plugin.py:293 +#: ../plugin.py:288 msgid "User manually Set up a Mount Point" msgstr "" -#: ../plugin.py:383 +#: ../plugin.py:380 ../plugin.py:596 msgid "ext2 - recommended for USB flash memory" msgstr "" -#: ../plugin.py:384 +#: ../plugin.py:381 ../plugin.py:597 msgid "ext3 - recommended for harddisks" msgstr "" -#: ../plugin.py:385 +#: ../plugin.py:382 ../plugin.py:598 msgid "ext4 - experimental" msgstr "" -#: ../plugin.py:386 +#: ../plugin.py:383 ../plugin.py:599 msgid "vfat - for USB flash memory" msgstr "" -#: ../plugin.py:387 +#: ../plugin.py:384 ../plugin.py:600 msgid "Choice filesystem." msgstr "" -#: ../plugin.py:408 +#: ../plugin.py:401 msgid "" "Can't umount %s. \n" "Maybe device or resource busy." msgstr "" -#: ../plugin.py:454 +#: ../plugin.py:426 +msgid "" +"Can not use this mount point.(%s) \n" +"Please select another mount point." +msgstr "" + +#: ../plugin.py:450 msgid "" "Mount Failed!\n" "Current path is already mounted by \"%s\"" msgstr "" -#: ../plugin.py:456 -msgid "Mount Failed!(%s -> %s)" +#: ../plugin.py:467 ../plugin.py:474 +msgid "" +"Mount Failed!\n" +"(%s -> %s)" msgstr "" -#: ../plugin.py:465 +#: ../plugin.py:494 msgid "" "Mount Point is not writeable.\n" "Path : %s" msgstr "" -#: ../plugin.py:500 +#: ../plugin.py:530 msgid "" "Do you really want to initialize the device?\n" "All data on the device will be lost!" msgstr "" -#: ../plugin.py:532 +#: ../plugin.py:563 msgid "How many partitions do you want?(1-4)" msgstr "" -#: ../plugin.py:539 ../plugin.py:561 +#: ../plugin.py:570 ../plugin.py:592 msgid "The number you entered is wrong!" msgstr "" -#: ../plugin.py:550 +#: ../plugin.py:581 msgid "Input size of partition %s.(Max = %d MB)" msgstr "" -#: ../plugin.py:569 +#: ../plugin.py:619 msgid "" "%s\n" "Start Device Inititlization?" msgstr "" -#: ../plugin.py:579 +#: ../plugin.py:629 msgid "umounting failed!Maybe some files in mount point are open" msgstr "" -#: ../plugin.py:581 +#: ../plugin.py:631 msgid "InitInitializing, please wait ..." msgstr "" -#: ../plugin.py:582 ../plugin.py:828 +#: ../plugin.py:632 ../plugin.py:896 msgid "" "\n" "Device : %s" msgstr "" -#: ../plugin.py:583 +#: ../plugin.py:633 msgid "" "\n" "Size : %s MB\n" msgstr "" -#: ../plugin.py:585 +#: ../plugin.py:635 msgid "" "\n" "partition %d : %s MB" msgstr "" -#: ../plugin.py:651 +#: ../plugin.py:714 msgid "Create filesystem, please wait ..." msgstr "" -#: ../plugin.py:652 +#: ../plugin.py:715 msgid "" "\n" "Partition : %s" msgstr "" -#: ../plugin.py:653 ../plugin.py:741 ../plugin.py:829 +#: ../plugin.py:716 ../plugin.py:809 ../plugin.py:897 msgid "" "\n" "Filesystem : %s" msgstr "" -#: ../plugin.py:654 +#: ../plugin.py:717 msgid "" "\n" "Size : %d MB\n" msgstr "" -#: ../plugin.py:664 +#: ../plugin.py:727 msgid "Creating filesystem Error" msgstr "" -#: ../plugin.py:666 +#: ../plugin.py:729 msgid " at /dev/%s" msgstr "" -#: ../plugin.py:686 +#: ../plugin.py:749 msgid "Device Initialization finished sucessfully!" msgstr "" -#: ../plugin.py:719 +#: ../plugin.py:787 msgid "" "Do you really want to check the filesystem?\n" "This could take lots of time!" msgstr "" -#: ../plugin.py:739 +#: ../plugin.py:807 msgid "Check filesystem, please wait ..." msgstr "" -#: ../plugin.py:740 +#: ../plugin.py:808 msgid "" "\n" "Device : /dev/%s" msgstr "" -#: ../plugin.py:762 ../plugin.py:868 +#: ../plugin.py:830 ../plugin.py:936 msgid "" "Can not umount device /dev/%s.\n" "Maybe some files of the filesystem are open" msgstr "" -#: ../plugin.py:769 +#: ../plugin.py:837 msgid "Filesystem check finished sucessfully" msgstr "" -#: ../plugin.py:772 +#: ../plugin.py:840 msgid "Error checking disk. The disk or filesystem may be damaged" msgstr "" -#: ../plugin.py:827 +#: ../plugin.py:895 msgid "Format filesystem, please wait ..." msgstr "" -#: ../plugin.py:830 +#: ../plugin.py:898 msgid "" "\n" "Size : %s" msgstr "" -#: ../plugin.py:883 +#: ../plugin.py:951 msgid "Can not change the partition ID for %s" msgstr "" -#: ../plugin.py:916 +#: ../plugin.py:984 msgid "" "Can not format device /dev/%s.\n" "refresh partition information failed!" msgstr "" -#: ../plugin.py:930 +#: ../plugin.py:998 msgid "" "Make filesystem Error /dev/%s.\n" "Please check your device." msgstr "" -#: ../plugin.py:935 +#: ../plugin.py:1003 msgid "Format finished sucessfully." msgstr "" -#: ../plugin.py:1096 +#: ../plugin.py:1239 msgid "Select" msgstr "" -#: ../plugin.py:1097 +#: ../plugin.py:1240 msgid "Create directory" msgstr "" -#: ../plugin.py:1132 +#: ../plugin.py:1275 msgid "Input mount point path." msgstr "" -#: ../plugin.py:1144 +#: ../plugin.py:1287 msgid "" "Create directory failed!\n" "%s" msgstr "" -#: ../plugin.py:1155 +#: ../plugin.py:1298 msgid "" "Delete directory failed!\n" "Maybe directory is not empty." msgstr "" -#: ../plugin.py:1159 +#: ../plugin.py:1302 msgid "" "Delete directory failed!\n" "%s" msgstr "" -#: ../plugin.py:1354 +#: ../plugin.py:1622 msgid "" -"umounted partitions found.!\n" -"Do you want to open DeviceManager and set mount point?\n" +"No mountable devices found.! (%s)\n" +"Do you want to open DeviceManager and do initialize or format this device?\n" "\n" "(Open 'Menu->Setup->System -> Harddisk -> DeviceManager'\n" " and press MENU button to deactivate this check.)" msgstr "" -#: ../plugin.py:1452 ../plugin.py:1460 +#: ../plugin.py:1673 ../plugin.py:1681 msgid "DeviceManager" msgstr "" -#: ../plugin.py:1460 +#: ../plugin.py:1681 msgid "manage block devices of your VU+" msgstr "" diff --git a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py index fd67f84..4ee8037 100755 --- a/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py +++ b/lib/python/Plugins/SystemPlugins/DeviceManager/plugin.py @@ -521,6 +521,7 @@ class DeviceInit(Screen): self.exitMessageTimer = eTimer() self.exitMessageTimer.callback.append(self.exitMessage) self.msg = "" + self.fstype = None def timerStart(self): self.initStartTimer.start(100,True) @@ -571,10 +572,10 @@ class DeviceInit(Screen): def InputPartitionSize_step2(self): current_partition = len(self.inputbox_partitionSizeList)+1 if self.inputbox_partitionSizeRemain == 0: - self.initInitializeConfirm() + self.choiceBoxFstype() elif current_partition == self.inputbox_partitions: self.inputbox_partitionSizeList.append(str(self.inputbox_partitionSizeRemain)) - self.initInitializeConfirm() + self.choiceBoxFstype() else: text = str(int(self.inputbox_partitionSizeRemain/(self.inputbox_partitions-len(self.inputbox_partitionSizeList) ))) self.session.openWithCallback(self.InputPartitionSize_step2_CB, InputBox, title=_("Input size of partition %s.(Max = %d MB)")%(current_partition,self.inputbox_partitionSizeRemain ), text=text, maxSize=False, type=Input.NUMBER) @@ -590,12 +591,31 @@ class DeviceInit(Screen): else: self.session.openWithCallback(self.exit ,MessageBox, _("The number you entered is wrong!"), MessageBox.TYPE_ERROR, timeout = 10) + def choiceBoxFstype(self): + menu = [] + menu.append((_("ext2 - recommended for USB flash memory"), "ext2")) + menu.append((_("ext3 - recommended for harddisks"), "ext3")) + menu.append((_("ext4 - experimental"), "ext4")) + menu.append((_("vfat - for USB flash memory"), "vfat")) + self.session.openWithCallback(self.choiceBoxFstypeCB, ChoiceBox, title=_("Choice filesystem."), list=menu) + + def choiceBoxFstypeCB(self, choice): + if choice is None: + self.exit() + else: + self.fstype = choice[1] + if self.fstype not in ["ext2", "ext3", "ext4", "vfat"]: + self.exit() + else: + self.initInitializeConfirm() + def initInitializeConfirm(self): # print self.inputbox_partitionSizeList partitionsInfo = "" for index in range(len(self.inputbox_partitionSizeList)): print "partition %d : %s Bytes"%(index+1, str(self.inputbox_partitionSizeList[index])) partitionsInfo += "partition %d : %s MB\n"%(index+1, str(self.inputbox_partitionSizeList[index])) + partitionsInfo += "filesystem type : %s"%(self.fstype) self.session.openWithCallback(self.initInitializeConfirmCB, MessageBoxConfirm, _("%s\nStart Device Inititlization?") % partitionsInfo , MessageBox.TYPE_YESNO) def initInitializeConfirmCB(self,ret): @@ -667,20 +687,33 @@ class DeviceInit(Screen): break partitions.close() - if partitionsize > 64 * 1024 * 1024: - cmd = "/sbin/mkfs.ext3 " - filesystem = "ext3" + if self.fstype == "ext4": + cmd = "/sbin/mkfs.ext4 -F " + if partitionsize > 2 * 1024 * 1024: # 2GB + cmd += "-T largefile " + cmd += "-O extent,flex_bg,large_file,uninit_bg -m1 " + fulldevicename + elif self.fstype == "ext3": + cmd = "/sbin/mkfs.ext3 -F " + if partitionsize > 2 * 1024 * 1024: + cmd += "-T largefile " + cmd += "-m0 " + fulldevicename + elif self.fstype == "ext2": + cmd = "/sbin/mkfs.ext2 -F " + if partitionsize > 2 * 1024 * 1024: + cmd += "-T largefile " + cmd += "-m0 " + fulldevicename + elif self.fstype == "vfat": + if partitionsize > 4 * 1024 * 1024 * 1024: + cmd = "/usr/sbin/mkfs.vfat -I -S4096 " + fulldevicename + else: + cmd = "/usr/sbin/mkfs.vfat -I " + fulldevicename else: - cmd = "/sbin/mkfs.ext2 " - filesystem = "ext2" - - if partitionsize > 2 * 1024 * 1024: - cmd += "-T largefile " - cmd += "-m0 " + fulldevicename + self.createFilesystemFinished(None, -1, (self.device, fulldevicename)) + return msg = _("Create filesystem, please wait ...") msg += _("\nPartition : %s") % (fulldevicename) - msg += _("\nFilesystem : %s") % (filesystem) + msg += _("\nFilesystem : %s") % (self.fstype) msg += _("\nSize : %d MB\n")%int(self.inputbox_partitionSizeList[self.devicenumber-1]) self.msgWaitingMkfs = self.session.openWithCallback(self.msgWaitingMkfsCB, MessageBox_2, msg, type = MessageBox.TYPE_INFO, enable_input = False) self.deviceInitConsole.ePopen(cmd, self.createFilesystemFinished, (self.device, fulldevicename)) @@ -1400,7 +1433,7 @@ class deviceManagerHotplug: print "[DeviceManager] Mount Failed. (Another device is already mounted)" return # do mount - print "[DeviceManager] doMount" +# print "[DeviceManager] doMount" if not path.exists(mountpoint): os.system("mkdir %s"%mountpoint) if path.exists(mountpoint): @@ -1452,7 +1485,8 @@ class deviceManagerHotplug: return # do mount if deviceinfo.isMounted(devpath, mountpoint): - print "[DeviceManagerHotplug] already mounted" + pass +# print "[DeviceManagerHotplug] already mounted" else: self.doMount(uuid, devpath, mountpoint, filesystem) @@ -1508,7 +1542,7 @@ class deviceManagerHotplug: if uuid_cfg == uuid: # do mount if deviceinfo.isMounted(devpath, mountpoint_cfg): - print "[Devicemanager startup] already mounted" +# print "[Devicemanager startup] already mounted" self.addPartitionAutofsMountpoint(devpath, mountpoint_cfg) else: # print "[autoMountOnStartup] do mount(%s %s %s)"%(devpath, configmountpoint, filesystem) @@ -1525,7 +1559,7 @@ class deviceManagerHotplug: continue devpath, mountpoint = x.split()[:2] mounts.append((path.basename(devpath), mountpoint)) -# print "[DeviceManager] mounts : ",mounts +# get blkid info data = self.getBlkidInfo() # check configList for c in configList: @@ -1535,7 +1569,7 @@ class deviceManagerHotplug: if uuid_cfg in data.keys(): device_cfg = data[uuid_cfg] if device_cfg is None: - return + continue for (device, mountpoint) in mounts: if device_cfg == device: if not deviceinfo.isFstabAutoMounted(uuid_cfg, "/dev/"+device_cfg, mountpoint_cfg): @@ -1543,8 +1577,9 @@ class deviceManagerHotplug: def getBlkidInfo(self): data = {} - blkid_lines = os.popen("blkid -c /dev/NULL /dev/sd*").readlines() - for line in blkid_lines: + blkid_data = os.popen("blkid -c /dev/NULL /dev/sd*").read() + for line in blkid_data.split('\n'): +# print "[DeviceManager] getBlkidInfo line : ",line device = uuid = "" device = path.basename(line.split(':')[0]) if line.find(" UUID=") != -1: @@ -1584,7 +1619,7 @@ def checkMounts(session): if noMountable_dev != "": print "Umountable partitions found." - InfoText = _("No mountable devices found.! (%s)\nDo you want to open DeviceManager and do initialize or format this device?\n\n(Open 'Menu->Setup->System -> Harddisk -> DeviceManager'\n and press MENU button to deactivate this check.)"%noMountable_dev) + InfoText = _("No mountable devices found.! (%s)\nDo you want to open DeviceManager and do initialize or format this device?\n\n(Open 'Menu->Setup->System -> Harddisk -> DeviceManager'\n and press MENU button to deactivate this check.)")%noMountable_dev AddNotificationWithCallback( boundFunction(callBackforDeviceManager, session), MessageBox, InfoText, timeout = 60, default = False -- 2.7.4