Reorganize modules

diff --git a/clients.pl b/clients.pl
index df66a3f071af5837f2fd756360d218c0fe1e78e8..9ace24979fb61fea9a9f62dc072c72165ca4b035 100644 (file)
--- a/clients.pl
+++ b/clients.pl
@@ -1,9 +1,9 @@
 :- module(clients, [save_client/1, load_clients/0]).
 
-:- use_module(log).
 :- use_module(library(files)).
-:- use_module(library(pio)).
 :- use_module(library(iso_ext)).
+:- use_module(library(pio)).
+:- use_module(ui/log).
 
 :- dynamic(known_client/1).
 
@@ -16,9 +16,8 @@ load_clients :-
             close(S)
         ),
         error(existence_error(source_sink,"clients_db.pl"),open/4),
-        (open("clients_db.pl", write, S),
-         close(S))
-        ).
+        ( open("clients_db.pl", write, S), close(S) )
+    ).
 
 read_clients(Stream) :-
     read_term(Stream, Term, []),

diff --git a/config.pl b/config.pl
index d11e13f0db17bafd0de09e216453b08525ef1400..e8c7372595cbc0b27d60bb24f805e0e41cc4d1ed 100644 (file)
--- a/config.pl
+++ b/config.pl
@@ -7,13 +7,13 @@
                    hostname/1
                   ]).
 
-:- use_module(library(os)).
-:- use_module(library(iso_ext)).
 :- use_module(library(dcgs)).
 :- use_module(library(files)).
+:- use_module(library(iso_ext)).
 :- use_module(library(lists)).
+:- use_module(library(os)).
 :- use_module(library(si)).
-:- use_module(log).
+:- use_module(ui/log).
 
 :- dynamic(cfg/2).
 

diff --git a/gemini_uri.pl b/dcgs/gemini_uri.pl
similarity index 99%
rename from gemini_uri.pl
rename to dcgs/gemini_uri.pl
index 6a03fd1c513ec13b1dcb54336c39cd98addac6e1..2f5f54792baf2856f70607e4da921981517f95b7 100644 (file)
--- a/gemini_uri.pl
+++ b/dcgs/gemini_uri.pl
@@ -1,9 +1,9 @@
 :- module(gemini_uri, [gemini_uri//4]).
 
+:- use_module(ip).
+:- use_module(library(charsio)).
 :- use_module(library(clpz)).
 :- use_module(library(dcgs)).
-:- use_module(library(charsio)).
-:- use_module('./ip').
 
 gemini_uri(Host, Port, Path, Query) -->
     % scheme MUST be gemini

diff --git a/ip.pl b/dcgs/ip.pl
similarity index 100%
rename from ip.pl
rename to dcgs/ip.pl
index c02406af8b6bb04eba214bd22c414d86c15d98b2..2ad8f7b16fc5bb00e9095b2c5d7ec630d92880ea 100644 (file)
--- a/ip.pl
+++ b/dcgs/ip.pl
@@ -1,8 +1,8 @@
 :- module(ip, [ipv6_address//0, ipv4_address//0, ip_address//0]).
 
-:- use_module(library(dcgs)).
 :- use_module(library(charsio)).
 :- use_module(library(clpz)).
+:- use_module(library(dcgs)).
 
 ip_address --> ipv4_address ; ipv6_address.
 

diff --git a/response.pl b/dcgs/response.pl
similarity index 100%
rename from response.pl
rename to dcgs/response.pl

diff --git a/request.pl b/request.pl
index 00e1d907048608b9aa5616bb276db0a26f77bc8f..d87c976117491036ede491d1ab910f154ebfd446 100644 (file)
--- a/request.pl
+++ b/request.pl
@@ -1,9 +1,9 @@
 :- module(request, [read_request/3]).
 
-:- use_module(gemini_uri).
+:- use_module(dcgs/gemini_uri).
 :- use_module(library(clpz)).
 :- use_module(library(dcgs)).
-:- use_module(log).
+:- use_module(ui/log).
 
 %% read_request(+Stream, -Path, -Query)
 %

diff --git a/serve.pl b/serve.pl
index bb6df47d904c019f800aaeab8dfe5438101206c8..be0c69ef4a396d51d9dfe56a496d108b18a11b55 100644 (file)
--- a/serve.pl
+++ b/serve.pl
@@ -1,17 +1,17 @@
 :- module(serve, [serve/4]).
 
-:- use_module(library(dcgs)).
 :- use_module(config).
+:- use_module(dcgs/response).
+:- use_module(library(charsio)).
+:- use_module(library(dcgs)).
+:- use_module(library(debug)).
 :- use_module(library(files)).
 :- use_module(library(iso_ext)).
 :- use_module(library(lists)).
 :- use_module(library(pio)).
-:- use_module(library(charsio)).
 :- use_module(library(sockets)).
-:- use_module(library(debug)).
-:- use_module(log).
-:- use_module(mime).
-:- use_module(response).
+:- use_module(sys/mime).
+:- use_module(ui/log).
 
 %% serve(+Stream, +Root, +Path, -Query)
 %

diff --git a/sula.pl b/sula.pl
index 086416fb0d71ff3e1afa577e8f042d522f7b6b69..29f3e2537ef7fe6210ef47def6d2c491c1d73011 100755 (executable)
--- a/sula.pl
+++ b/sula.pl
@@ -12,10 +12,9 @@ exit 1
 
 :- module(sula, [run/0]).
 
-:- use_module(cert).
 :- use_module(clients).
-:- use_module(banner).
 :- use_module(config).
+:- use_module(dcgs/response).
 :- use_module(library(charsio)).
 :- use_module(library(clpz)).
 :- use_module(library(dcgs)).
@@ -25,11 +24,12 @@ exit 1
 :- use_module(library(pio)).
 :- use_module(library(sockets)).
 :- use_module(library(tls)).
-:- use_module(log).
-:- use_module(mime).
-:- use_module(serve).
 :- use_module(request).
-:- use_module(response).
+:- use_module(serve).
+:- use_module(sys/mime).
+:- use_module(sys/tls_certs).
+:- use_module(ui/banner).
+:- use_module(ui/log).
 
 run :-
     once(display_banner),

diff --git a/mime.pl b/sys/mime.pl
similarity index 98%
rename from mime.pl
rename to sys/mime.pl
index ba378afee2084a020f97d4c15348026e0d1704f0..37935a6b0fb6cad3092e602fcdc4fe1dd242efe6 100644 (file)
--- a/mime.pl
+++ b/sys/mime.pl
@@ -1,9 +1,9 @@
 :- module(mime, [load_mime/0, mime/2, guess_mime/2]).
 
-:- use_module(library(pio)).
 :- use_module(library(dcgs)).
 :- use_module(library(lists)).
-:- use_module(log).
+:- use_module(library(pio)).
+:- use_module('../ui/log').
 
 :- dynamic(mime/2).
 

diff --git a/cert.pl b/sys/tls_certs.pl
similarity index 95%
rename from cert.pl
rename to sys/tls_certs.pl
index 1963a85c35be077e44dd99f8e69210ef855c7a67..8cf4304570ec15ba584cc207ada79fc409531359 100644 (file)
--- a/cert.pl
+++ b/sys/tls_certs.pl
@@ -1,15 +1,15 @@
-:- module(cert, [load_certificate/1, with_tls_connection/3]).
+:- module(tls_certs, [load_certificate/1, with_tls_connection/3]).
 
-:- use_module(config).
+:- use_module('../config').
 :- use_module(library(dcgs)).
-:- use_module(library(tls)).
-:- use_module(library(process)).
+:- use_module(library(debug)).
 :- use_module(library(files)).
-:- use_module(library(lists)).
 :- use_module(library(iso_ext)).
-:- use_module(library(debug)).
+:- use_module(library(lists)).
 :- use_module(library(pio)).
-:- use_module(log).
+:- use_module(library(process)).
+:- use_module(library(tls)).
+:- use_module('../ui/log').
 
 load_certificate(Context) :-
     load_existing_certificate(Context)

diff --git a/banner.pl b/ui/banner.pl
similarity index 89%
rename from banner.pl
rename to ui/banner.pl
index 2dd689bbeeac2c6ba0b34efde9a394600b8d9bbf..6b718c6ee113fce216599d79e9cb0d16436fb6ba 100644 (file)
--- a/banner.pl
+++ b/ui/banner.pl
@@ -1,13 +1,13 @@
 :- module(banner, [display_banner/0]).
 
 :- use_module(library(dcgs)).
-:- use_module(library(lists)).
 :- use_module(library(lambda)).
+:- use_module(library(lists)).
 :- use_module(library(pio)).
 :- use_module(log).
 
 display_banner :-
-    phrase_from_file(lines(Ls), "banner.txt"),
+    phrase_from_file(lines(Ls), "ui/banner.txt"),
     maplist(\S^log_msg("system", "~s~n", [S]), Ls).
 
 lines([])     --> call(eos), !.

diff --git a/banner.txt b/ui/banner.txt
similarity index 100%
rename from banner.txt
rename to ui/banner.txt

diff --git a/log.pl b/ui/log.pl
similarity index 92%
rename from log.pl
rename to ui/log.pl
index 42d3c24c461a73007633d200fe53eeb0d3eacd13..84eab5ee4409f5d9d60c2fe091e0e62790de824c 100644 (file)
--- a/log.pl
+++ b/ui/log.pl
@@ -1,12 +1,14 @@
 :- module(log, [log_msg/3]).
 
+:- use_module(library(clpz)).
 :- use_module(library(crypto)).
 :- use_module(library(format)).
-:- use_module(library(clpz)).
 :- use_module(library(lists)).
 
+% reserved for errors
+red("\x1b\[31m").
+
 colors([
-    "\x1b\[31m", % Red
     "\x1b\[32m", % Green
     "\x1b\[33m", % Yellow
     "\x1b\[34m", % Blue
@@ -20,6 +22,9 @@ colors([
     "\x1b\[96m"  % Light Cyan
 ]).
 
+scope_color("error", Red) :-
+    red(Red).
+
 scope_color(ScopeName, ColorANSI) :-
     crypto_data_hash(ScopeName, HashHex, [algorithm(sha256)]),