diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/config/config.nim | 2 | ||||
-rw-r--r-- | src/html/dom.nim | 8 | ||||
-rw-r--r-- | src/html/env.nim | 8 | ||||
-rw-r--r-- | src/html/xmlhttprequest.nim | 8 | ||||
-rw-r--r-- | src/local/client.nim | 8 | ||||
-rw-r--r-- | src/local/container.nim | 8 | ||||
-rw-r--r-- | src/local/pager.nim | 12 | ||||
-rw-r--r-- | src/server/buffer.nim | 6 | ||||
-rw-r--r-- | src/server/connecterror.nim (renamed from src/loader/connecterror.nim) | 0 | ||||
-rw-r--r-- | src/server/forkserver.nim | 4 | ||||
-rw-r--r-- | src/server/headers.nim (renamed from src/loader/headers.nim) | 0 | ||||
-rw-r--r-- | src/server/loader.nim (renamed from src/loader/loader.nim) | 10 | ||||
-rw-r--r-- | src/server/loaderiface.nim (renamed from src/loader/loaderiface.nim) | 12 | ||||
-rw-r--r-- | src/server/request.nim (renamed from src/loader/request.nim) | 2 | ||||
-rw-r--r-- | src/server/response.nim (renamed from src/loader/response.nim) | 4 | ||||
-rw-r--r-- | src/server/urlfilter.nim (renamed from src/loader/urlfilter.nim) | 0 | ||||
-rw-r--r-- | src/types/cookie.nim | 2 |
17 files changed, 47 insertions, 47 deletions
diff --git a/src/config/config.nim b/src/config/config.nim index 7fc47e1c..0edd144d 100644 --- a/src/config/config.nim +++ b/src/config/config.nim @@ -10,7 +10,6 @@ import config/mailcap import config/mimetypes import config/toml import config/urimethodmap -import loader/headers import monoucha/fromjs import monoucha/javascript import monoucha/jspropenumlist @@ -18,6 +17,7 @@ import monoucha/jsregex import monoucha/jstypes import monoucha/quickjs import monoucha/tojs +import server/headers import types/cell import types/color import types/cookie diff --git a/src/html/dom.nim b/src/html/dom.nim index 70a9277c..ec3b199e 100644 --- a/src/html/dom.nim +++ b/src/html/dom.nim @@ -25,10 +25,6 @@ import io/console import io/dynstream import io/promise import io/timeout -import loader/headers -import loader/loaderiface -import loader/request -import loader/response import monoucha/fromjs import monoucha/javascript import monoucha/jserror @@ -37,6 +33,10 @@ import monoucha/jspropenumlist import monoucha/jsutils import monoucha/quickjs import monoucha/tojs +import server/headers +import server/loaderiface +import server/request +import server/response import types/bitmap import types/blob import types/canvastypes diff --git a/src/html/env.nim b/src/html/env.nim index 1b86b0f9..69592ccb 100644 --- a/src/html/env.nim +++ b/src/html/env.nim @@ -14,16 +14,16 @@ import io/console import io/dynstream import io/promise import io/timeout -import loader/headers -import loader/loaderiface -import loader/request -import loader/response import monoucha/javascript import monoucha/jserror import monoucha/jspropenumlist import monoucha/jstypes import monoucha/quickjs import monoucha/tojs +import server/headers +import server/loaderiface +import server/request +import server/response import types/blob import types/opt import types/url diff --git a/src/html/xmlhttprequest.nim b/src/html/xmlhttprequest.nim index 0185e03a..560a54e9 100644 --- a/src/html/xmlhttprequest.nim +++ b/src/html/xmlhttprequest.nim @@ -12,15 +12,15 @@ import html/event import html/script import io/dynstream import io/promise -import loader/headers -import loader/loaderiface -import loader/request -import loader/response import monoucha/fromjs import monoucha/javascript import monoucha/jserror import monoucha/quickjs import monoucha/tojs +import server/headers +import server/loaderiface +import server/request +import server/response import types/blob import types/opt import types/url diff --git a/src/local/client.nim b/src/local/client.nim index 6b7e0a67..6c466059 100644 --- a/src/local/client.nim +++ b/src/local/client.nim @@ -23,10 +23,6 @@ import io/dynstream import io/poll import io/promise import io/timeout -import loader/headers -import loader/loaderiface -import loader/request -import loader/response import local/container import local/lineedit import local/pager @@ -43,6 +39,10 @@ import monoucha/quickjs import monoucha/tojs import server/buffer import server/forkserver +import server/headers +import server/loaderiface +import server/request +import server/response import types/blob import types/cookie import types/opt diff --git a/src/local/container.nim b/src/local/container.nim index dbc510c9..4b41ed74 100644 --- a/src/local/container.nim +++ b/src/local/container.nim @@ -10,15 +10,15 @@ import config/mimetypes import css/render import io/dynstream import io/promise -import loader/headers -import loader/loaderiface -import loader/request -import loader/response import local/select import monoucha/javascript import monoucha/jsregex import monoucha/jstypes import server/buffer +import server/headers +import server/loaderiface +import server/request +import server/response import types/bitmap import types/blob import types/cell diff --git a/src/local/pager.nim b/src/local/pager.nim index 192b340a..72f267a4 100644 --- a/src/local/pager.nim +++ b/src/local/pager.nim @@ -18,12 +18,6 @@ import io/poll import io/promise import io/tempfile import io/timeout -import loader/connecterror -import loader/headers -import loader/loaderiface -import loader/request -import loader/response -import loader/urlfilter import local/container import local/lineedit import local/select @@ -38,7 +32,13 @@ import monoucha/libregexp import monoucha/quickjs import monoucha/tojs import server/buffer +import server/connecterror import server/forkserver +import server/headers +import server/loaderiface +import server/request +import server/response +import server/urlfilter import types/bitmap import types/blob import types/cell diff --git a/src/server/buffer.nim b/src/server/buffer.nim index e89c486e..ebe88bf9 100644 --- a/src/server/buffer.nim +++ b/src/server/buffer.nim @@ -32,14 +32,14 @@ import io/dynstream import io/poll import io/promise import io/timeout -import loader/headers -import loader/loaderiface -import loader/request import monoucha/fromjs import monoucha/javascript import monoucha/jsregex import monoucha/libregexp import monoucha/quickjs +import server/headers +import server/loaderiface +import server/request import types/blob import types/cell import types/color diff --git a/src/loader/connecterror.nim b/src/server/connecterror.nim index 5b428526..5b428526 100644 --- a/src/loader/connecterror.nim +++ b/src/server/connecterror.nim diff --git a/src/server/forkserver.nim b/src/server/forkserver.nim index 8014b674..4d95f815 100644 --- a/src/server/forkserver.nim +++ b/src/server/forkserver.nim @@ -9,9 +9,9 @@ import config/urimethodmap import io/bufreader import io/bufwriter import io/dynstream -import loader/loader -import loader/loaderiface import server/buffer +import server/loader +import server/loaderiface import types/url import types/winattrs import utils/proctitle diff --git a/src/loader/headers.nim b/src/server/headers.nim index 633e81ae..633e81ae 100644 --- a/src/loader/headers.nim +++ b/src/server/headers.nim diff --git a/src/loader/loader.nim b/src/server/loader.nim index 1d6fa94d..2339408c 100644 --- a/src/loader/loader.nim +++ b/src/server/loader.nim @@ -33,12 +33,12 @@ import io/bufwriter import io/dynstream import io/poll import io/tempfile -import loader/connecterror -import loader/headers -import loader/loaderiface -import loader/request -import loader/urlfilter import monoucha/javascript +import server/connecterror +import server/headers +import server/loaderiface +import server/request +import server/urlfilter import types/cookie import types/formdata import types/opt diff --git a/src/loader/loaderiface.nim b/src/server/loaderiface.nim index 33b26444..96db01cd 100644 --- a/src/loader/loaderiface.nim +++ b/src/server/loaderiface.nim @@ -1,7 +1,7 @@ -# Interface to loader/loader. The idea is that modules don't have to +# Interface to server/loader. The idea is that modules don't have to # depend on the entire loader implementation to interact with it. # -# See loader/loader for a more detailed description of the protocol. +# See server/loader for a more detailed description of the protocol. import std/tables @@ -9,12 +9,12 @@ import io/bufreader import io/bufwriter import io/dynstream import io/promise -import loader/urlfilter -import loader/headers -import loader/request -import loader/response import monoucha/javascript import monoucha/jserror +import server/headers +import server/request +import server/response +import server/urlfilter import types/cookie import types/opt import types/referrer diff --git a/src/loader/request.nim b/src/server/request.nim index 64721af5..3745a413 100644 --- a/src/loader/request.nim +++ b/src/server/request.nim @@ -4,12 +4,12 @@ import std/tables import html/script import io/bufreader import io/bufwriter -import loader/headers import monoucha/fromjs import monoucha/javascript import monoucha/jserror import monoucha/jstypes import monoucha/quickjs +import server/headers import types/blob import types/formdata import types/opt diff --git a/src/loader/response.nim b/src/server/response.nim index bdf81a10..e6ffe729 100644 --- a/src/loader/response.nim +++ b/src/server/response.nim @@ -5,12 +5,12 @@ import chagashi/charset import chagashi/decoder import io/dynstream import io/promise -import loader/headers -import loader/request import monoucha/javascript import monoucha/jserror import monoucha/quickjs import monoucha/tojs +import server/headers +import server/request import types/blob import types/opt import types/referrer diff --git a/src/loader/urlfilter.nim b/src/server/urlfilter.nim index 20983498..20983498 100644 --- a/src/loader/urlfilter.nim +++ b/src/server/urlfilter.nim diff --git a/src/types/cookie.nim b/src/types/cookie.nim index 60355995..eb96ca62 100644 --- a/src/types/cookie.nim +++ b/src/types/cookie.nim @@ -1,10 +1,10 @@ import std/strutils import std/times -import loader/urlfilter import monoucha/javascript import monoucha/jserror import monoucha/jsregex +import server/urlfilter import types/opt import types/url import utils/twtstr |