diff --git a/build.zig.zon b/build.zig.zon index 6a2fb7a..33bb030 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .jido, .fingerprint = 0xee45eabe36cafb57, - .version = "1.3.0", + .version = "1.4.0", .minimum_zig_version = "0.15.2", .dependencies = .{ diff --git a/src/app.zig b/src/app.zig index 345e1cd..773612f 100644 --- a/src/app.zig +++ b/src/app.zig @@ -1,21 +1,23 @@ const std = @import("std"); const builtin = @import("builtin"); -const environment = @import("./environment.zig"); -const Drawer = @import("./drawer.zig"); -const Notification = @import("./notification.zig"); -const config = &@import("./config.zig").config; -const List = @import("./list.zig").List; -const Directories = @import("./directories.zig"); -const FileLogger = @import("./file_logger.zig"); -const CircStack = @import("./circ_stack.zig").CircularStack; -const Image = @import("./image.zig"); -const Archive = @import("./archive.zig"); -const zuid = @import("zuid"); + const vaxis = @import("vaxis"); const Key = vaxis.Key; -const EventHandlers = @import("./event_handlers.zig"); +const zuid = @import("zuid"); + +const Archive = @import("./archive.zig"); +const CircStack = @import("./circ_stack.zig").CircularStack; const CommandHistory = @import("./commands.zig").CommandHistory; +const Directories = @import("./directories.zig"); +const Drawer = @import("./drawer.zig"); +const environment = @import("./environment.zig"); +const EventHandlers = @import("./event_handlers.zig"); +const FileLogger = @import("./file_logger.zig"); +const Image = @import("./image.zig"); +const List = @import("./list.zig").List; +const Notification = @import("./notification.zig"); +const config = &@import("./config.zig").config; const help_menu_items = [_][]const u8{ "Global:", " :Exit.", diff --git a/src/archive.zig b/src/archive.zig index 6ba9798..4a817e4 100644 --- a/src/archive.zig +++ b/src/archive.zig @@ -1,5 +1,6 @@ -const std = @import("std"); const ascii = @import("std").ascii; +const std = @import("std"); + const FileLogger = @import("./file_logger.zig"); const archive_buf_size = 8192; diff --git a/src/commands.zig b/src/commands.zig index 70de62b..c93ecad 100644 --- a/src/commands.zig +++ b/src/commands.zig @@ -1,6 +1,8 @@ const std = @import("std"); + const App = @import("app.zig"); const environment = @import("environment.zig"); + const user_config = &@import("./config.zig").config; pub const CommandHistory = struct { diff --git a/src/config.zig b/src/config.zig index 656b38f..3ace2b8 100644 --- a/src/config.zig +++ b/src/config.zig @@ -1,10 +1,12 @@ const std = @import("std"); const builtin = @import("builtin"); -const environment = @import("./environment.zig"); + const vaxis = @import("vaxis"); -const FileLogger = @import("file_logger.zig"); -const Notification = @import("./notification.zig"); + const App = @import("./app.zig"); +const environment = @import("./environment.zig"); +const Notification = @import("./notification.zig"); +const FileLogger = @import("file_logger.zig"); const CONFIG_NAME = "config.json"; const TRASH_DIR_NAME = "trash"; diff --git a/src/directories.zig b/src/directories.zig index 95f2b8e..9610ffe 100644 --- a/src/directories.zig +++ b/src/directories.zig @@ -1,9 +1,12 @@ const std = @import("std"); -const List = @import("./list.zig").List; -const CircStack = @import("./circ_stack.zig").CircularStack; -const config = &@import("./config.zig").config; + const fuzzig = @import("fuzzig"); +const CircStack = @import("./circ_stack.zig").CircularStack; +const List = @import("./list.zig").List; + +const sort = &@import("./sort.zig"); +const config = &@import("./config.zig").config; const history_len: usize = 100; const Self = @This(); @@ -119,7 +122,7 @@ pub fn populateChildEntries( } if (config.sort_dirs == true) { - std.mem.sort([]const u8, self.child_entries.all(), {}, sortChildEntry); + std.mem.sort([]const u8, self.child_entries.all(), {}, sort.string); } } @@ -142,18 +145,10 @@ pub fn populateEntries(self: *Self, fuzzy_search: []const u8) !void { } if (config.sort_dirs == true) { - std.mem.sort(std.fs.Dir.Entry, self.entries.all(), {}, sortEntry); + std.mem.sort(std.fs.Dir.Entry, self.entries.all(), {}, sort.sortDirectoryEntry); } } -fn sortEntry(_: void, lhs: std.fs.Dir.Entry, rhs: std.fs.Dir.Entry) bool { - return std.mem.lessThan(u8, lhs.name, rhs.name); -} - -fn sortChildEntry(_: void, lhs: []const u8, rhs: []const u8) bool { - return std.mem.lessThan(u8, lhs, rhs); -} - pub fn clearEntries(self: *Self) void { for (self.entries.all()) |entry| { self.entries.alloc.free(entry.name); diff --git a/src/drawer.zig b/src/drawer.zig index a41c85f..72b677c 100644 --- a/src/drawer.zig +++ b/src/drawer.zig @@ -1,17 +1,19 @@ const std = @import("std"); + +const vaxis = @import("vaxis"); +const zeit = @import("zeit"); + const App = @import("./app.zig"); -const FileLogger = @import("./file_logger.zig"); -const Notification = @import("./notification.zig"); +const Archive = @import("./archive.zig"); const Directories = @import("./directories.zig"); -const config = &@import("./config.zig").config; -const vaxis = @import("vaxis"); -const sort = @import("./sort.zig"); +const FileLogger = @import("./file_logger.zig"); const Git = @import("./git.zig"); -const List = @import("./list.zig").List; -const zeit = @import("zeit"); const Image = @import("./image.zig"); -const Archive = @import("./archive.zig"); +const List = @import("./list.zig").List; +const Notification = @import("./notification.zig"); +const sort = @import("./sort.zig"); +const config = &@import("./config.zig").config; const Drawer = @This(); const top_div: u16 = 1; diff --git a/src/environment.zig b/src/environment.zig index 0fd046e..5ee0d55 100644 --- a/src/environment.zig +++ b/src/environment.zig @@ -1,7 +1,8 @@ const std = @import("std"); -const zuid = @import("zuid"); const builtin = @import("builtin"); +const zuid = @import("zuid"); + pub fn getHomeDir() !?std.fs.Dir { return try std.fs.openDirAbsolute(std.posix.getenv("HOME") orelse { return null; diff --git a/src/event_handlers.zig b/src/event_handlers.zig index b0f591a..7a0d339 100644 --- a/src/event_handlers.zig +++ b/src/event_handlers.zig @@ -1,14 +1,16 @@ const std = @import("std"); -const App = @import("./app.zig"); -const environment = @import("./environment.zig"); -const zuid = @import("zuid"); + const vaxis = @import("vaxis"); const Key = vaxis.Key; -const config = &@import("./config.zig").config; +const zuid = @import("zuid"); + +const App = @import("./app.zig"); const commands = @import("./commands.zig"); const Keybinds = @import("./config.zig").Keybinds; +const environment = @import("./environment.zig"); const events = @import("./events.zig"); +const config = &@import("./config.zig").config; pub fn handleGlobalEvent( app: *App, event: App.Event, diff --git a/src/file_logger.zig b/src/file_logger.zig index 99ac5d9..e10c3e4 100644 --- a/src/file_logger.zig +++ b/src/file_logger.zig @@ -1,5 +1,7 @@ const std = @import("std"); + const environment = @import("environment.zig"); + const config = &@import("./config.zig").config; pub const LOG_PATH = "log.txt"; diff --git a/src/image.zig b/src/image.zig index 414979d..fa8f3aa 100644 --- a/src/image.zig +++ b/src/image.zig @@ -1,5 +1,7 @@ const std = @import("std"); + const vaxis = @import("vaxis"); + const App = @import("app.zig"); pub const Cache = struct { diff --git a/src/list.zig b/src/list.zig index 7c66b7a..253fe05 100644 --- a/src/list.zig +++ b/src/list.zig @@ -1,4 +1,5 @@ const std = @import("std"); + const vaxis = @import("vaxis"); pub fn List(comptime T: type) type { diff --git a/src/main.zig b/src/main.zig index e2c9908..2b322f3 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,13 +1,15 @@ const std = @import("std"); const builtin = @import("builtin"); + const options = @import("options"); -const App = @import("app.zig"); -const FileLogger = @import("file_logger.zig"); const vaxis = @import("vaxis"); -const config = &@import("./config.zig").config; +pub const panic = vaxis.panic_handler; + const resolvePath = @import("./commands.zig").resolvePath; +const App = @import("app.zig"); +const FileLogger = @import("file_logger.zig"); -pub const panic = vaxis.panic_handler; +const config = &@import("./config.zig").config; const help_menu = \\Usage: jido \\ diff --git a/src/notification.zig b/src/notification.zig index bd3054a..fcec962 100644 --- a/src/notification.zig +++ b/src/notification.zig @@ -1,7 +1,8 @@ const std = @import("std"); + const vaxis = @import("vaxis"); -const Event = @import("app.zig").Event; +const Event = @import("app.zig").Event; const FileLogger = @import("file_logger.zig"); const Self = @This(); diff --git a/src/sort.zig b/src/sort.zig index fc0e3c2..7e5bf45 100644 --- a/src/sort.zig +++ b/src/sort.zig @@ -3,3 +3,7 @@ const std = @import("std"); pub fn string(_: void, lhs: []const u8, rhs: []const u8) bool { return std.mem.lessThan(u8, lhs, rhs); } + +pub fn sortDirectoryEntry(_: void, lhs: std.fs.Dir.Entry, rhs: std.fs.Dir.Entry) bool { + return std.mem.lessThan(u8, lhs.name, rhs.name); +}