Use selective imports when possible

soulfind-dev · Jan 2, 2025 · 1792d17 · 1792d17
1 parent cbdefa2
commit 1792d17
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/src/db.d b/src/db.d
@@ -6,8 +6,11 @@
 module soulfind.db;
 @safe:
 
-import etc.c.sqlite3;
-import soulfind.defines;
+import etc.c.sqlite3 : sqlite3, sqlite3_close, sqlite3_column_count,
+                       sqlite3_column_text, sqlite3_errstr, sqlite3_finalize,
+                       sqlite3_open, sqlite3_prepare_v2, sqlite3_step,
+                       sqlite3_stmt, SQLITE_DONE, SQLITE_OK, SQLITE_ROW;
+import soulfind.defines : default_max_users, default_port;
 import std.conv : to;
 import std.exception : ifThrown;
 import std.file : exists, isFile;
@@ -85,7 +88,7 @@ class Sdb
     private void init_config_option(string option, string value)
     {
         query(
-            "INSERT OR IGNORE INTO %s(option, value) 
+            "INSERT OR IGNORE INTO %s(option, value)
              VALUES('%s', '%s');".format(
             config_table, option, escape(value)
         ));
@@ -222,8 +225,8 @@ class Sdb
         debug(db) writefln(
             "DB: Requested %s's info...", blue ~ username ~ norm);
         const res = query(
-            "SELECT speed,ulnum,files,folders 
-             FROM %s 
+            "SELECT speed,ulnum,files,folders
+             FROM %s
              WHERE username = '%s';".format(
             users_table, escape(username)
         ));

diff --git a/src/main.d b/src/main.d
@@ -6,7 +6,7 @@
 module soulfind.main;
 @safe:
 
-import soulfind.defines;
+import soulfind.defines : exit_message;
 import std.stdio : writefln;
 
 version (Have_soulfind_server) import soulfind.server : run;

diff --git a/src/server/messages.d b/src/server/messages.d
@@ -6,8 +6,7 @@
 module soulfind.server.messages;
 @safe:
 
-import soulfind.defines;
-import soulfind.server.room;
+import soulfind.server.room : Ticker;
 import std.algorithm : sort;
 import std.bitmanip : Endian, nativeToLittleEndian, read;
 import std.stdio : writefln;

diff --git a/src/server/package.d b/src/server/package.d
@@ -6,8 +6,8 @@
 module soulfind.server;
 @safe:
 
-import soulfind.defines;
-import soulfind.server.server;
+import soulfind.defines : default_db_file;
+import soulfind.server.server : Server;
 import std.stdio : writefln;
 
 int run(string[] args)

diff --git a/src/server/room.d b/src/server/room.d
@@ -6,9 +6,8 @@
 module soulfind.server.room;
 @safe:
 
-import soulfind.defines;
 import soulfind.server.messages;
-import soulfind.server.user;
+import soulfind.server.user : User;
 import std.datetime : Clock;
 
 struct Ticker

diff --git a/src/server/server.d b/src/server/server.d
@@ -7,12 +7,13 @@ module soulfind.server.server;
 @safe:
 
 import core.time : Duration, minutes, MonoTime, seconds;
-import soulfind.db;
-import soulfind.defines;
+import soulfind.db : Sdb;
+import soulfind.defines : blue, bold, default_max_users, default_port, norm,
+                          red, server_user, VERSION;
 import soulfind.server.messages;
-import soulfind.server.pm;
-import soulfind.server.room;
-import soulfind.server.user;
+import soulfind.server.pm : PM;
+import soulfind.server.room : GlobalRoom, Room;
+import soulfind.server.user : User;
 import std.algorithm : canFind;
 import std.array : join, replace, split;
 import std.ascii : isPrintable, isPunctuation;

diff --git a/src/server/user.d b/src/server/user.d
@@ -7,11 +7,11 @@ module soulfind.server.user;
 @safe:
 
 import core.time : seconds;
-import soulfind.defines;
+import soulfind.defines : blue, max_msg_size, norm, red, server_user;
 import soulfind.server.messages;
-import soulfind.server.pm;
-import soulfind.server.room;
-import soulfind.server.server;
+import soulfind.server.pm : PM;
+import soulfind.server.room : Room;
+import soulfind.server.server : Server;
 import std.array : join;
 import std.bitmanip : Endian, nativeToLittleEndian, peek, read;
 import std.datetime : Clock, SysTime;

diff --git a/src/setup/package.d b/src/setup/package.d
@@ -6,8 +6,9 @@
 module soulfind.setup;
 @safe:
 
-import soulfind.db;
-import soulfind.defines;
+import soulfind.db : Sdb;
+import soulfind.defines : default_db_file, default_max_users, default_port,
+                          exit_message, VERSION;
 import std.conv : ConvException, to;
 import std.exception : ifThrown;
 import std.format : format;