mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2026-02-12 10:35:39 +00:00
Deploying to gh-pages from @ dd726c15d1e1d3bdb80c80d056ffc26a40c5eef0 🚀
This commit is contained in:
@@ -245,6 +245,12 @@
|
||||
<span id="240">240</span>
|
||||
<span id="241">241</span>
|
||||
<span id="242">242</span>
|
||||
<span id="243">243</span>
|
||||
<span id="244">244</span>
|
||||
<span id="245">245</span>
|
||||
<span id="246">246</span>
|
||||
<span id="247">247</span>
|
||||
<span id="248">248</span>
|
||||
</pre><pre class="rust"><code><span class="comment">/*
|
||||
* Copyright (C) 2022 Aravinth Manivannan <realaravinth@batsense.net>
|
||||
*
|
||||
@@ -265,8 +271,9 @@
|
||||
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
|
||||
|
||||
<span class="kw">use</span> <span class="ident">config</span>::{<span class="ident">Config</span>, <span class="ident">ConfigError</span>, <span class="ident">Environment</span>, <span class="ident">File</span>};
|
||||
<span class="kw">use</span> <span class="ident">derive_more::Display</span>;
|
||||
<span class="kw">use</span> <span class="ident">log</span>::{<span class="ident">debug</span>, <span class="ident">warn</span>};
|
||||
<span class="kw">use</span> <span class="ident">serde::Deserialize</span>;
|
||||
<span class="kw">use</span> <span class="ident">serde</span>::{<span class="ident">Deserialize</span>, <span class="ident">Serialize</span>};
|
||||
<span class="kw">use</span> <span class="ident">url::Url</span>;
|
||||
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Clone</span>, <span class="ident">Deserialize</span>)]</span>
|
||||
@@ -312,28 +319,47 @@
|
||||
}
|
||||
}
|
||||
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Clone</span>, <span class="ident">Deserialize</span>)]</span>
|
||||
<span class="kw">struct</span> <span class="ident">DatabaseBuilder</span> {
|
||||
<span class="kw">pub</span> <span class="ident">port</span>: <span class="ident">u32</span>,
|
||||
<span class="kw">pub</span> <span class="ident">hostname</span>: <span class="ident">String</span>,
|
||||
<span class="kw">pub</span> <span class="ident">username</span>: <span class="ident">String</span>,
|
||||
<span class="kw">pub</span> <span class="ident">password</span>: <span class="ident">String</span>,
|
||||
<span class="kw">pub</span> <span class="ident">name</span>: <span class="ident">String</span>,
|
||||
<span class="comment">//#[derive(Debug, Clone, Deserialize)]</span>
|
||||
<span class="comment">//struct DatabaseBuilder {</span>
|
||||
<span class="comment">// pub port: u32,</span>
|
||||
<span class="comment">// pub hostname: String,</span>
|
||||
<span class="comment">// pub username: String,</span>
|
||||
<span class="comment">// pub password: String,</span>
|
||||
<span class="comment">// pub name: String,</span>
|
||||
<span class="comment">//}</span>
|
||||
|
||||
<span class="comment">//impl DatabaseBuilder {</span>
|
||||
<span class="comment">// #[cfg(not(tarpaulin_include))]</span>
|
||||
<span class="comment">// fn extract_database_url(url: &Url) -> Self {</span>
|
||||
<span class="comment">// debug!("Databse name: {}", url.path());</span>
|
||||
<span class="comment">// let mut path = url.path().split('/');</span>
|
||||
<span class="comment">// path.next();</span>
|
||||
<span class="comment">// let name = path.next().expect("no database name").to_string();</span>
|
||||
<span class="comment">// DatabaseBuilder {</span>
|
||||
<span class="comment">// port: url.port().expect("Enter database port").into(),</span>
|
||||
<span class="comment">// hostname: url.host().expect("Enter database host").to_string(),</span>
|
||||
<span class="comment">// username: url.username().into(),</span>
|
||||
<span class="comment">// password: url.password().expect("Enter database password").into(),</span>
|
||||
<span class="comment">// name,</span>
|
||||
<span class="comment">// }</span>
|
||||
<span class="comment">// }</span>
|
||||
<span class="comment">//}</span>
|
||||
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Deserialize</span>, <span class="ident">Serialize</span>, <span class="ident">Display</span>, <span class="ident">PartialEq</span>, <span class="ident">Clone</span>, <span class="ident">Debug</span>)]</span>
|
||||
<span class="attribute">#[<span class="ident">serde</span>(<span class="ident">rename_all</span> <span class="op">=</span> <span class="string">"lowercase"</span>)]</span>
|
||||
<span class="kw">pub</span> <span class="kw">enum</span> <span class="ident">DBType</span> {
|
||||
<span class="attribute">#[<span class="ident">display</span>(<span class="ident">fmt</span> <span class="op">=</span> <span class="string">"postgres"</span>)]</span>
|
||||
<span class="ident">Postgres</span>,
|
||||
<span class="attribute">#[<span class="ident">display</span>(<span class="ident">fmt</span> <span class="op">=</span> <span class="string">"maria"</span>)]</span>
|
||||
<span class="ident">Maria</span>,
|
||||
}
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">DatabaseBuilder</span> {
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">tarpaulin_include</span>))]</span>
|
||||
<span class="kw">fn</span> <span class="ident">extract_database_url</span>(<span class="ident">url</span>: <span class="kw-2">&</span><span class="ident">Url</span>) -> <span class="self">Self</span> {
|
||||
<span class="macro">debug!</span>(<span class="string">"Databse name: {}"</span>, <span class="ident">url</span>.<span class="ident">path</span>());
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">path</span> <span class="op">=</span> <span class="ident">url</span>.<span class="ident">path</span>().<span class="ident">split</span>(<span class="string">'/'</span>);
|
||||
<span class="ident">path</span>.<span class="ident">next</span>();
|
||||
<span class="kw">let</span> <span class="ident">name</span> <span class="op">=</span> <span class="ident">path</span>.<span class="ident">next</span>().<span class="ident">expect</span>(<span class="string">"no database name"</span>).<span class="ident">to_string</span>();
|
||||
<span class="ident">DatabaseBuilder</span> {
|
||||
<span class="ident">port</span>: <span class="ident">url</span>.<span class="ident">port</span>().<span class="ident">expect</span>(<span class="string">"Enter database port"</span>).<span class="ident">into</span>(),
|
||||
<span class="ident">hostname</span>: <span class="ident">url</span>.<span class="ident">host</span>().<span class="ident">expect</span>(<span class="string">"Enter database host"</span>).<span class="ident">to_string</span>(),
|
||||
<span class="ident">username</span>: <span class="ident">url</span>.<span class="ident">username</span>().<span class="ident">into</span>(),
|
||||
<span class="ident">password</span>: <span class="ident">url</span>.<span class="ident">password</span>().<span class="ident">expect</span>(<span class="string">"Enter database password"</span>).<span class="ident">into</span>(),
|
||||
<span class="ident">name</span>,
|
||||
<span class="kw">impl</span> <span class="ident">DBType</span> {
|
||||
<span class="kw">fn</span> <span class="ident">from_url</span>(<span class="ident">url</span>: <span class="kw-2">&</span><span class="ident">Url</span>) -> <span class="prelude-ty">Result</span><span class="op"><</span><span class="self">Self</span>, <span class="ident">ConfigError</span><span class="op">></span> {
|
||||
<span class="kw">match</span> <span class="ident">url</span>.<span class="ident">scheme</span>() {
|
||||
<span class="string">"mysql"</span> => <span class="prelude-val">Ok</span>(<span class="ident"><span class="self">Self</span>::Maria</span>),
|
||||
<span class="string">"postgres"</span> => <span class="prelude-val">Ok</span>(<span class="ident"><span class="self">Self</span>::Postgres</span>),
|
||||
<span class="kw">_</span> => <span class="prelude-val">Err</span>(<span class="ident">ConfigError::Message</span>(<span class="string">"Unknown database type"</span>.<span class="ident">into</span>())),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -342,6 +368,7 @@
|
||||
<span class="kw">pub</span> <span class="kw">struct</span> <span class="ident">Database</span> {
|
||||
<span class="kw">pub</span> <span class="ident">url</span>: <span class="ident">String</span>,
|
||||
<span class="kw">pub</span> <span class="ident">pool</span>: <span class="ident">u32</span>,
|
||||
<span class="kw">pub</span> <span class="ident">database_type</span>: <span class="ident">DBType</span>,
|
||||
}
|
||||
|
||||
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>, <span class="ident">Clone</span>, <span class="ident">Deserialize</span>)]</span>
|
||||
@@ -400,14 +427,13 @@
|
||||
<span class="kw">match</span> <span class="ident">env::var</span>(<span class="string">"DATABASE_URL"</span>) {
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) => {
|
||||
<span class="kw">let</span> <span class="ident">url</span> <span class="op">=</span> <span class="ident">Url::parse</span>(<span class="kw-2">&</span><span class="ident">val</span>).<span class="ident">expect</span>(<span class="string">"couldn't parse Database URL"</span>);
|
||||
<span class="kw">let</span> <span class="ident">database_conf</span> <span class="op">=</span> <span class="ident">DatabaseBuilder::extract_database_url</span>(<span class="kw-2">&</span><span class="ident">url</span>);
|
||||
<span class="ident">set_from_database_url</span>(<span class="kw-2">&mut</span> <span class="ident">s</span>, <span class="kw-2">&</span><span class="ident">database_conf</span>);
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"database.url"</span>, <span class="ident">url</span>.<span class="ident">to_string</span>()).<span class="ident">unwrap</span>();
|
||||
}
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) => {
|
||||
<span class="ident">set_database_url</span>(<span class="kw-2">&mut</span> <span class="ident">s</span>);
|
||||
}
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) => <span class="macro">warn!</span>(<span class="string">"couldn't interpret DATABASE_URL: {}"</span>, <span class="ident">e</span>),
|
||||
}
|
||||
|
||||
<span class="ident">set_database_url</span>(<span class="kw-2">&mut</span> <span class="ident">s</span>);
|
||||
|
||||
<span class="comment">// setting default values</span>
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"database.pool"</span>, <span class="number">2</span>.<span class="ident">to_string</span>())
|
||||
@@ -429,20 +455,6 @@
|
||||
<span class="ident">Url::parse</span>(<span class="kw-2">&</span><span class="ident">url</span>).<span class="ident">expect</span>(<span class="string">"Please enter a URL for source_code in settings"</span>);
|
||||
}
|
||||
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">tarpaulin_include</span>))]</span>
|
||||
<span class="kw">fn</span> <span class="ident">set_from_database_url</span>(<span class="ident">s</span>: <span class="kw-2">&mut</span> <span class="ident">Config</span>, <span class="ident">database_conf</span>: <span class="kw-2">&</span><span class="ident">DatabaseBuilder</span>) {
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"database.username"</span>, <span class="ident">database_conf</span>.<span class="ident">username</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">expect</span>(<span class="string">"Couldn't set database username"</span>);
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"database.password"</span>, <span class="ident">database_conf</span>.<span class="ident">password</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">expect</span>(<span class="string">"Couldn't access database password"</span>);
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"database.hostname"</span>, <span class="ident">database_conf</span>.<span class="ident">hostname</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">expect</span>(<span class="string">"Couldn't access database hostname"</span>);
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"database.port"</span>, <span class="ident">database_conf</span>.<span class="ident">port</span> <span class="kw">as</span> <span class="ident">i64</span>)
|
||||
.<span class="ident">expect</span>(<span class="string">"Couldn't access database port"</span>);
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"database.name"</span>, <span class="ident">database_conf</span>.<span class="ident">name</span>.<span class="ident">clone</span>())
|
||||
.<span class="ident">expect</span>(<span class="string">"Couldn't access database name"</span>);
|
||||
}
|
||||
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">tarpaulin_include</span>))]</span>
|
||||
<span class="kw">fn</span> <span class="ident">set_database_url</span>(<span class="ident">s</span>: <span class="kw-2">&mut</span> <span class="ident">Config</span>) {
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(
|
||||
|
||||
Reference in New Issue
Block a user