Added archive dialoug; go to trash context option

This commit is contained in:
2021-11-29 02:01:51 -06:00
parent aa74b30c12
commit a418df2ce7
6 changed files with 288 additions and 31 deletions

View File

@@ -18,8 +18,8 @@ def threaded(fn):
return wrapper
class Controller(Controller_Data, ShowHideMixin, KeyboardSignalsMixin, WidgetFileActionMixin, \
PaneMixin, WindowMixin):
class Controller(Controller_Data, ShowHideMixin, KeyboardSignalsMixin, \
WidgetFileActionMixin, PaneMixin, WindowMixin):
def __init__(self, args, unknownargs, _settings):
sys.excepthook = self.my_except_hook
self.settings = _settings
@@ -109,10 +109,18 @@ class Controller(Controller_Data, ShowHideMixin, KeyboardSignalsMixin, WidgetFil
self.to_rename_files = self.selected_files
self.rename_files()
def execute(self, option, start_dir=os.getenv("HOME")):
DEVNULL = open(os.devnull, 'w')
command = option.split()
subprocess.Popen(command, cwd=start_dir, start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
def set_arc_buffer_text(self, widget=None, eve=None):
id = widget.get_active_id()
self.arc_command_buffer.set_text(self.arc_commands[int(id)])
def execute(self, _command, start_dir=os.getenv("HOME"), use_os_system=None):
if use_os_system:
os.system(_command)
else:
DEVNULL = open(os.devnull, 'w')
command = _command.split()
subprocess.Popen(command, cwd=start_dir, shell=False, start_new_session=True, stdout=DEVNULL, stderr=DEVNULL)
def do_action_from_menu_controls(self, imagemenuitem, eventbutton):
@@ -138,11 +146,13 @@ class Controller(Controller_Data, ShowHideMixin, KeyboardSignalsMixin, WidgetFil
self.copy_files()
if action == "paste":
self.paste_files()
if action == "archive":
self.show_archiver_dialogue()
if action == "delete":
# self.delete_files()
self.trash_files()
if action == "trash":
self.trash_files()
if action == "go_to_trash":
self.builder.get_object("path_entry").set_text(self.trash_files_path)
self.ctrlDown = False

View File

@@ -1,35 +1,69 @@
# Python imports
# Gtk imports
from gi.repository import GLib
# Application imports
from shellfm import WindowController
class Controller_Data:
def has_method(self, o, name):
return callable(getattr(o, name, None))
def setup_controller_data(self):
self.window_controller = WindowController()
self.state = self.window_controller.load_state()
self.window_controller = WindowController()
self.state = self.window_controller.load_state()
self.builder = self.settings.builder
self.logger = self.settings.logger
self.builder = self.settings.builder
self.logger = self.settings.logger
self.window = self.settings.getMainWindow()
self.window1 = self.builder.get_object("window_1")
self.window2 = self.builder.get_object("window_2")
self.window3 = self.builder.get_object("window_3")
self.window4 = self.builder.get_object("window_4")
self.message_widget = self.builder.get_object("message_widget")
self.message_view = self.builder.get_object("message_view")
self.message_buffer = self.builder.get_object("message_buffer")
self.window = self.settings.getMainWindow()
self.window1 = self.builder.get_object("window_1")
self.window2 = self.builder.get_object("window_2")
self.window3 = self.builder.get_object("window_3")
self.window4 = self.builder.get_object("window_4")
self.message_widget = self.builder.get_object("message_widget")
self.message_view = self.builder.get_object("message_view")
self.message_buffer = self.builder.get_object("message_buffer")
self.arc_command_buffer = self.builder.get_object("arc_command_buffer")
self.bottom_size_label = self.builder.get_object("bottom_size_label")
self.bottom_file_count_label = self.builder.get_object("bottom_file_count_label")
self.bottom_path_label = self.builder.get_object("bottom_path_label")
self.trash_files_path = GLib.get_user_data_dir() + "/Trash/files"
self.trash_info_path = GLib.get_user_data_dir() + "/Trash/info"
# In compress commands:
# %n: First selected filename/dir to archive
# %N: All selected filenames/dirs to archive, or (with %O) a single filename
# %o: Resulting single archive file
# %O: Resulting archive per source file/directory (use changes %N meaning)
#
# In extract commands:
# %x: Archive file to extract
# %g: Unique extraction target filename with optional subfolder
# %G: Unique extraction target filename, never with subfolder
#
# In list commands:
# %x: Archive to list
#
# Plus standard bash variables are accepted.
self.arc_commands = [ '$(which 7za || echo 7zr) a %o %N',
'zip -r %o %N',
'rar a -r %o %N',
'tar -cvf %o %N',
'tar -cvjf %o %N',
'tar -cvzf %o %N',
'tar -cvJf %o %N',
'gzip -c %N > %O',
'xz -cz %N > %O'
]
self.notebooks = [self.window1, self.window2, self.window3, self.window4]
self.selected_files = []
self.to_rename_files = []

View File

@@ -19,16 +19,33 @@ class ShowHideMixin:
self.hide_about_page()
def hide_about_page(self, widget=None, eve=None):
about_page = self.builder.get_object("about_page").hide()
self.builder.get_object("about_page").hide()
def show_archiver_dialogue(self, widget=None, eve=None):
archiver_dialogue = self.builder.get_object("archiver_dialogue")
archiver_dialogue.set_action(Gtk.FileChooserAction.SAVE)
archiver_dialogue.set_select_multiple(True)
archiver_dialogue.set_current_name("arc.7z")
response = archiver_dialogue.run()
if response == Gtk.ResponseType.OK:
self.archive_files(archiver_dialogue)
if (response == Gtk.ResponseType.CANCEL) or (response == Gtk.ResponseType.DELETE_EVENT):
pass
archiver_dialogue.hide()
def hide_archiver_dialogue(self, widget=None, eve=None):
self.builder.get_object("archiver_dialogue").hide()
def show_appchooser_menu(self, widget=None, eve=None):
appchooser_menu = self.builder.get_object("appchooser_menu")
appchooser_widget = self.builder.get_object("appchooser_widget")
response = appchooser_menu.run()
resp = appchooser_menu.run()
if resp == Gtk.ResponseType.CANCEL:
if response == Gtk.ResponseType.CANCEL:
self.hide_appchooser_menu()
if resp == Gtk.ResponseType.OK:
if response == Gtk.ResponseType.OK:
self.open_with_files(appchooser_widget)
self.hide_appchooser_menu()

View File

@@ -129,6 +129,20 @@ class WidgetFileActionMixin:
self.hide_new_file_menu()
self.to_rename_files.clear()
def archive_files(self, archiver_dialogue):
wid, tid = self.window_controller.get_active_data()
iconview = self.builder.get_object(f"{wid}|{tid}|iconview")
store = iconview.get_model()
paths = self.format_to_uris(store, wid, tid, self.selected_files, True)
save_target = archiver_dialogue.get_filename();
start_itr, end_itr = self.arc_command_buffer.get_bounds()
command = self.arc_command_buffer.get_text(start_itr, end_itr, False)
command = command.replace("%o", save_target)
command = command.replace("%N", ' '.join(paths))
final_command = f"terminator -e '{command}'"
self.execute(final_command, start_dir=None, use_os_system=True)