KekenoBSD/installer-gui
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix partition editor

Browse Source
This commit is contained in:
ericbsd
2019-04-17 23:23:55 -03:00
parent 5f3b1b6d2c
commit bec19b2b89
3 changed files with 90 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/db_partition.py
+3 -3
View File
@@ -34,13 +34,13 @@ from subprocess import Popen, PIPE, STDOUT, call
import pickle import pickle
from time import sleep from time import sleep
tmp = "/tmp/.gbi/" tmp = "/tmp/.gbinstall/"
if not os.path.exists(tmp): if not os.path.exists(tmp):
os.makedirs(tmp) os.makedirs(tmp)
installer = "/usr/local/lib/gbi/" installer = "/usr/local/lib/gbinstall/"
sysinstall = "/usr/local/sbin/pc-sysinstall" sysinstall = "/usr/local/sbin/pc-sysinstall"
partitiondb = "%spartitiondb/" % tmp partitiondb = "%spartitiondb/" % tmp
query = "sh /usr/local/lib/gbi/backend-query/" query = "sh /usr/local/lib/gbinstall/backend-query/"
query_disk = '%sdisk-list.sh' % query query_disk = '%sdisk-list.sh' % query
detect_sheme = '%sdetect-sheme.sh' % query detect_sheme = '%sdetect-sheme.sh' % query
diskdb = "%sdisk" % partitiondb diskdb = "%sdisk" % partitiondb
src/install.py
+1 -1
View File
@@ -15,7 +15,7 @@ import threading
import os import os
from subprocess import Popen, PIPE, STDOUT, call from subprocess import Popen, PIPE, STDOUT, call
from time import sleep from time import sleep
from partition_handler import rDeleteParttion, destroyParttion, makingParttion from db_partition import rDeleteParttion, destroyParttion, makingParttion
from create_cfg import gbsd_cfg from create_cfg import gbsd_cfg
from slides import gbsdSlides from slides import gbsdSlides
# from slides import dbsdSlides # from slides import dbsdSlides
src/partition.py
+86 -88
View File
@@ -64,7 +64,7 @@ disk_label = '%sdisk-label.sh' % query
disk_schem = '%sscheme' % tmp disk_schem = '%sscheme' % tmp
disk_file = '%sdisk' % tmp disk_file = '%sdisk' % tmp
psize = '%spart_size' % tmp psize = '%spart_size' % tmp
logo = "/usr/local/lib/gbi/logo.png" logo = "/usr/local/lib/gbinstall/logo.png"
Part_label = '%spartlabel' % tmp Part_label = '%spartlabel' % tmp
part_schem = '%sscheme' % tmp part_schem = '%sscheme' % tmp
partitiondb = "%spartitiondb/" % tmp partitiondb = "%spartitiondb/" % tmp
@@ -73,11 +73,7 @@ ufs_Partiton_list = []
cssProvider = Gtk.CssProvider() cssProvider = Gtk.CssProvider()
# if os.path.exists(rcconfgbsd):
# print(True)
cssProvider.load_from_path('/usr/local/lib/gbinstall/ghostbsd-style.css') cssProvider.load_from_path('/usr/local/lib/gbinstall/ghostbsd-style.css')
# elif os.path.exists(rcconfdbsd):
# cssProvider.load_from_path('/usr/local/lib/gbi/desktopbsd-style.css')
screen = Gdk.Screen.get_default() screen = Gdk.Screen.get_default()
styleContext = Gtk.StyleContext() styleContext = Gtk.StyleContext()
styleContext.add_provider_for_screen(screen, cssProvider, styleContext.add_provider_for_screen(screen, cssProvider,
@@ -272,7 +268,7 @@ class Partitions():
self.window.set_title("Partition Scheme") self.window.set_title("Partition Scheme")
self.window.set_border_width(0) self.window.set_border_width(0)
self.window.set_size_request(400, 150) self.window.set_size_request(400, 150)
self.window.set_icon_from_file("/usr/local/lib/gbi/logo.png") self.window.set_icon_from_file(logo)
box1 = Gtk.VBox(False, 0) box1 = Gtk.VBox(False, 0)
self.window.add(box1) self.window.add(box1)
box1.show() box1.show()
@@ -324,7 +320,7 @@ class Partitions():
self.window.set_title("Add Partition") self.window.set_title("Add Partition")
self.window.set_border_width(0) self.window.set_border_width(0)
self.window.set_size_request(400, 150) self.window.set_size_request(400, 150)
self.window.set_icon_from_file("/usr/local/lib/gbi/logo.png") self.window.set_icon_from_file(logo)
box1 = Gtk.VBox(False, 0) box1 = Gtk.VBox(False, 0)
self.window.add(box1) self.window.add(box1)
box1.show() box1.show()
@@ -461,91 +457,93 @@ class Partitions():
def partition_selection(self, widget): def partition_selection(self, widget):
model, self.iter, = widget.get_selected() model, self.iter, = widget.get_selected()
if self.iter is not None: print(self.iter)
self.path = model.get_path(self.iter) if self.iter is None:
tree_iter3 = model.get_iter(self.path[0]) return
self.scheme = model.get_value(tree_iter3, 3) self.path = model.get_path(self.iter)
self.disk = model.get_value(tree_iter3, 0) tree_iter3 = model.get_iter(self.path[0])
tree_iter = model.get_iter(self.path) self.scheme = model.get_value(tree_iter3, 3)
self.slice = model.get_value(tree_iter, 0) self.disk = model.get_value(tree_iter3, 0)
self.size = model.get_value(tree_iter, 1) tree_iter = model.get_iter(self.path)
if len(self.path) == 2 and self.path[1] > 0 and self.scheme == "MBR": self.slice = model.get_value(tree_iter, 0)
pathbehind = str(self.path[0]) + ":" + str(int(self.path[1] - 1)) self.size = model.get_value(tree_iter, 1)
tree_iter2 = model.get_iter(pathbehind) if len(self.path) == 2 and self.path[1] > 0 and self.scheme == "MBR":
pathbehind = str(self.path[0]) + ":" + str(int(self.path[1] - 1))
tree_iter2 = model.get_iter(pathbehind)
self.slicebehind = model.get_value(tree_iter2, 0)
sl = int(self.path[1]) + 1
if 'freespace' in self.slicebehind:
slbehind = self.path[1]
else:
slbehind = int(self.slicebehind.partition('s')[2])
elif len(self.path) == 2 and self.path[1] > 0 and self.scheme == "GPT":
pathbehind = str(self.path[0]) + ":" + str(int(self.path[1] - 1))
tree_iter2 = model.get_iter(pathbehind)
self.slicebehind = model.get_value(tree_iter2, 0)
self.lablebehind = model.get_value(tree_iter2, 2)
sl = int(self.path[1]) + 1
if 'freespace' in self.slicebehind:
slbehind = self.path[1]
else:
slbehind = int(self.slicebehind.partition('p')[2])
elif len(self.path) == 3 and self.path[2] > 0 and self.scheme == "MBR":
if self.path[1] > 0:
pathbehind1 = str(self.path[0]) + ":" + str(int(self.path[1] - 1))
tree_iter2 = model.get_iter(pathbehind1)
self.slicebehind = model.get_value(tree_iter2, 0) self.slicebehind = model.get_value(tree_iter2, 0)
sl = int(self.path[1]) + 1
if 'freespace' in self.slicebehind:
slbehind = self.path[1]
else:
slbehind = int(self.slicebehind.partition('s')[2])
elif len(self.path) == 2 and self.path[1] > 0 and self.scheme == "GPT":
pathbehind = str(self.path[0]) + ":" + str(int(self.path[1] - 1))
tree_iter2 = model.get_iter(pathbehind)
self.slicebehind = model.get_value(tree_iter2, 0)
self.lablebehind = model.get_value(tree_iter2, 2)
sl = int(self.path[1]) + 1
if 'freespace' in self.slicebehind:
slbehind = self.path[1]
else:
slbehind = int(self.slicebehind.partition('p')[2])
elif len(self.path) == 3 and self.path[2] > 0 and self.scheme == "MBR":
if self.path[1] > 0:
pathbehind1 = str(self.path[0]) + ":" + str(int(self.path[1] - 1))
tree_iter2 = model.get_iter(pathbehind1)
self.slicebehind = model.get_value(tree_iter2, 0)
else:
self.slicebehind = None
pathbehind2 = str(self.path[0]) + ":" + str(self.path[1]) + ":" + str(int(self.path[2] - 1))
tree_iter3 = model.get_iter(pathbehind2)
self.lablebehind = model.get_value(tree_iter3, 2)
sl = int(self.path[1]) + 1
if self.slicebehind is None:
slbehind = self.path[1]
elif 'freespace' in self.slicebehind:
slbehind = self.path[1]
else:
slbehind = int(self.slicebehind.partition('s')[2])
else: else:
self.slicebehind = None self.slicebehind = None
self.lablebehind = None pathbehind2 = str(self.path[0]) + ":" + str(self.path[1]) + ":" + str(int(self.path[2] - 1))
sl = 1 tree_iter3 = model.get_iter(pathbehind2)
slbehind = 0 self.lablebehind = model.get_value(tree_iter3, 2)
if 'freespace' in self.slice: sl = int(self.path[1]) + 1
if self.path[1] > 3 and self.scheme == "MBR": if self.slicebehind is None:
self.create_bt.set_sensitive(False) slbehind = self.path[1]
elif self.slicebehind is None: elif 'freespace' in self.slicebehind:
self.create_bt.set_sensitive(True) slbehind = self.path[1]
elif sl == slbehind:
self.create_bt.set_sensitive(False)
elif slbehind > 4:
self.create_bt.set_sensitive(False)
else:
self.create_bt.set_sensitive(True)
self.delete_bt.set_sensitive(False)
self.modifi_bt.set_sensitive(False)
self.auto_bt.set_sensitive(True)
elif 's' in self.slice:
self.create_bt.set_sensitive(False)
self.delete_bt.set_sensitive(True)
# self.modifi_bt.set_sensitive(True)
self.auto_bt.set_sensitive(False)
elif 'p' in self.slice:
self.create_bt.set_sensitive(False)
self.delete_bt.set_sensitive(True)
# self.modifi_bt.set_sensitive(True)
self.auto_bt.set_sensitive(False)
else: else:
self.delete_bt.set_sensitive(False) slbehind = int(self.slicebehind.partition('s')[2])
self.modifi_bt.set_sensitive(False) else:
self.auto_bt.set_sensitive(False) self.slicebehind = None
how_many_prt = how_partition(self.path) self.lablebehind = None
firstisfree = first_is_free(self.path) sl = 1
if how_many_prt == 1 and firstisfree == 'freespace': slbehind = 0
self.create_bt.set_sensitive(False) if 'freespace' in self.slice:
elif how_partition(self.path) == 0: if self.path[1] > 3 and self.scheme == "MBR":
self.create_bt.set_sensitive(True) self.create_bt.set_sensitive(False)
else: elif self.slicebehind is None:
self.create_bt.set_sensitive(False) self.create_bt.set_sensitive(True)
elif sl == slbehind:
self.create_bt.set_sensitive(False)
elif slbehind > 4:
self.create_bt.set_sensitive(False)
else:
self.create_bt.set_sensitive(True)
self.delete_bt.set_sensitive(False)
self.modifi_bt.set_sensitive(False)
self.auto_bt.set_sensitive(True)
elif 's' in self.slice:
self.create_bt.set_sensitive(False)
self.delete_bt.set_sensitive(True)
# self.modifi_bt.set_sensitive(True)
self.auto_bt.set_sensitive(False)
elif 'p' in self.slice:
self.create_bt.set_sensitive(False)
self.delete_bt.set_sensitive(True)
# self.modifi_bt.set_sensitive(True)
self.auto_bt.set_sensitive(False)
else:
self.delete_bt.set_sensitive(False)
self.modifi_bt.set_sensitive(False)
self.auto_bt.set_sensitive(False)
how_many_prt = how_partition(self.path)
firstisfree = first_is_free(self.path)
if how_many_prt == 1 and firstisfree == 'freespace':
self.create_bt.set_sensitive(False)
elif how_partition(self.path) == 0:
self.create_bt.set_sensitive(True)
else:
self.create_bt.set_sensitive(False)
if os.path.exists(Part_label): if os.path.exists(Part_label):
rd = open(Part_label, 'r') rd = open(Part_label, 'r')
self.prttn = rd.readlines() self.prttn = rd.readlines()