feat: Add first real working wip

This commit is contained in:
Myzel394 2024-02-17 09:31:51 +01:00
parent f173631404
commit e3e22458b0
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
12 changed files with 2079 additions and 30 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/target /target
build

View File

@ -1,16 +1,14 @@
// Search engine parser for DuckDuckGo // Search engine parser for DuckDuckGo
pub mod duckduckgo { pub mod duckduckgo {
use std::{ use std::{
collections::VecDeque,
pin::{pin, Pin}, pin::{pin, Pin},
task::{Context, Poll}, task::{Context, Poll},
}; };
use async_trait::async_trait; use async_trait::async_trait;
use futures::{FutureExt, Stream, StreamExt}; use futures::{AsyncRead, FutureExt, Stream, StreamExt};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use regex::Regex; use regex::Regex;
use rocket::http::hyper::body::Bytes;
use urlencoding::decode; use urlencoding::decode;
use crate::{ use crate::{
@ -32,7 +30,7 @@ pub mod duckduckgo {
callback: CallbackType, callback: CallbackType,
pub completed: bool, pub completed: bool,
results_started: bool, results_started: bool,
previous_block: String, pub previous_block: String,
// Holds all results until consumed by iterator // Holds all results until consumed by iterator
pub results: Vec<SearchResult>, pub results: Vec<SearchResult>,
} }
@ -127,34 +125,56 @@ pub mod duckduckgo {
let mut stream = client let mut stream = client
.post("https://html.duckduckgo.com/html/") .post("https://html.duckduckgo.com/html/")
.header("Content-Type", "application/x-www-form-urlencoded") .header("Content-Type", "application/x-www-form-urlencoded")
.body("q=duck") .body(format!("q={}", query))
.send() .send()
.await .await
.unwrap() .unwrap()
.bytes_stream(); .bytes_stream();
dbg!("before");
while let Some(item) = stream.next().await { while let Some(item) = stream.next().await {
let packet = item.unwrap(); let packet = item.unwrap();
dbg!(packet.len());
if let Some(result) = self.parse_packet(packet.iter()) { if let Some(result) = self.parse_packet(packet.iter()) {
self.results.push(result); self.results.push(result);
} }
} }
dbg!("after");
while let Some(result) = self.parse_next() {
self.results.push(result);
}
dbg!("competed");
self.completed = true; self.completed = true;
} }
fn parse_packet<'a>( pub fn push_packet<'a>(&mut self, packet: impl Iterator<Item = &'a u8>) {
&mut self,
packet: impl Iterator<Item = &'a u8>,
) -> Option<SearchResult> {
let bytes: Vec<u8> = packet.map(|bit| *bit).collect(); let bytes: Vec<u8> = packet.map(|bit| *bit).collect();
let raw_text = String::from_utf8_lossy(&bytes); let raw_text = String::from_utf8_lossy(&bytes);
let text = STRIP.replace_all(&raw_text, " "); let text = STRIP.replace_all(&raw_text, " ");
if self.results_started { if self.results_started {
self.previous_block.push_str(&text); self.previous_block.push_str(&text);
} else {
self.results_started = RESULTS_START.is_match(&text);
}
}
/// Push packet to internal block and return next available search result, if available
fn parse_packet<'a>(
&mut self,
packet: impl Iterator<Item = &'a u8>,
) -> Option<SearchResult> {
self.push_packet(packet);
self.parse_next()
}
/// Get next search result, if available, from internal stored block
fn parse_next<'a>(&mut self) -> Option<SearchResult> {
if self.results_started {
match SINGLE_RESULT.captures(&self.previous_block.to_owned()) { match SINGLE_RESULT.captures(&self.previous_block.to_owned()) {
Some(captures) => { Some(captures) => {
let title = decode(captures.name("title").unwrap().as_str()) let title = decode(captures.name("title").unwrap().as_str())
@ -184,8 +204,6 @@ pub mod duckduckgo {
} }
None => {} None => {}
} }
} else if RESULTS_START.is_match(&text) {
self.results_started = true;
} }
None None

20
src/html/beginning.html Normal file
View File

@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>tifsep</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="tailwind.css" rel="stylesheet">
</head>
<body class="bg-gray-700">
<header class="flex items-center justify-between px-10 py-2">
<input type="search" class="w-40 rounded-full bg-gray-500 text-white px-4 py-1" placeholder="Search">
</header>
<main>
<ul>
<!-- </ul> -->
<!-- </main> -->
<!-- </body> -->
<!-- </html> -->

21
src/html/end.html Normal file
View File

@ -0,0 +1,21 @@
<!-- <!DOCTYPE html> -->
<!-- <html lang="en"> -->
<!---->
<!-- <head> -->
<!-- <title>tifsep</title> -->
<!-- <meta charset="UTF-8"> -->
<!-- <meta name="viewport" content="width=device-width, initial-scale=1"> -->
<!-- <link href="tailwind.css" rel="stylesheet"> -->
<!-- </head> -->
<!---->
<!-- <body class="bg-gray-700"> -->
<!-- <header class="flex items-center justify-between px-10 py-2"> -->
<!-- <input type="search" class="w-40 rounded-full bg-gray-500 text-white px-4 py-1" placeholder="Search"> -->
<!-- </header> -->
<!-- <main> -->
<!-- <ul> -->
</ul>
</main>
</body>
</html>

View File

@ -21,25 +21,28 @@
// Found no other way to make this work // Found no other way to make this work
#![feature(async_closure)] #![feature(async_closure)]
use std::{ use std::sync::Arc;
cmp::max,
sync::{Arc, RwLock},
};
use futures::lock::Mutex; use futures::lock::Mutex;
use rocket::response::stream::TextStream; use lazy_static::lazy_static;
use rocket::response::{content::RawHtml, stream::TextStream};
use engines::duckduckgo::duckduckgo::DuckDuckGo; use engines::duckduckgo::duckduckgo::DuckDuckGo;
use crate::static_files::static_files::read_file_contents;
pub mod client; pub mod client;
pub mod engines; pub mod engines;
pub mod static_files;
pub mod utils; pub mod utils;
#[macro_use] #[macro_use]
extern crate rocket; extern crate rocket;
struct SearchParams<'r> { lazy_static! {
query: &'r str, static ref HTML_BEGINNING: String = read_file_contents("./src/html/beginning.html").unwrap();
static ref HTML_END: String = read_file_contents("./src/html/end.html").unwrap();
static ref TAILWIND_CSS: String = read_file_contents("./tailwindcss/output.css").unwrap();
} }
#[get("/")] #[get("/")]
@ -59,23 +62,28 @@ fn search_get() -> &'static str {
</html>" </html>"
} }
#[get("/tailwind.css")]
fn get_tailwindcss() -> &'static str {
&TAILWIND_CSS
}
#[get("/searchquery?<query>")] #[get("/searchquery?<query>")]
async fn hello<'a>(query: &str) -> TextStream![String] { async fn hello<'a>(query: &str) -> RawHtml<TextStream![String]> {
let query_box = Box::new(query.to_string()); let query_box = Box::new(query.to_string());
let ddg_ref = Arc::new(Mutex::new(DuckDuckGo::new())); let ddg_ref = Arc::new(Mutex::new(DuckDuckGo::new()));
let ddg_writer_ref = ddg_ref.clone(); let ddg_ref_writer = ddg_ref.clone();
tokio::spawn(async move { tokio::spawn(async move {
let mut ddg = ddg_writer_ref.lock().await; let mut ddg = ddg_ref_writer.lock().await;
ddg.search(&query_box).await; ddg.search(&query_box).await;
}); });
let mut current_index = 0; let mut current_index = 0;
TextStream! { RawHtml(TextStream! {
let start = "<DOCTYPE!html><html><body>".to_string(); yield HTML_BEGINNING.to_string();
yield start;
loop { loop {
let ddg = ddg_ref.lock().await; let ddg = ddg_ref.lock().await;
@ -91,9 +99,11 @@ async fn hello<'a>(query: &str) -> TextStream![String] {
} }
for ii in (current_index + 1)..len { for ii in (current_index + 1)..len {
let result = ddg.results.get(ii); let result = ddg.results.get(ii).unwrap();
dbg!(&result); let text = format!("<li><h1>{}</h1><p>{}</p></li>", &result.title, &result.description);
yield text.to_string();
} }
// [1] -> 0 // [1] -> 0
@ -101,10 +111,8 @@ async fn hello<'a>(query: &str) -> TextStream![String] {
current_index = len - 1; current_index = len - 1;
} }
let end = "</body></html>".to_string(); yield HTML_END.to_string();
})
yield end
}
} }
#[launch] #[launch]
@ -113,4 +121,5 @@ async fn rocket() -> _ {
.mount("/", routes![index]) .mount("/", routes![index])
.mount("/", routes![hello]) .mount("/", routes![hello])
.mount("/", routes![search_get]) .mount("/", routes![search_get])
.mount("/", routes![get_tailwindcss])
} }

16
src/static_files.rs Normal file
View File

@ -0,0 +1,16 @@
pub mod static_files {
use std::{
fs::File,
io::{Error, Read},
};
pub fn read_file_contents(path: &str) -> Result<String, Error> {
let mut contents = String::new();
let mut file = File::open(path)?;
file.read_to_string(&mut contents)?;
Ok(contents)
}
}

15
tailwindcss/fake.html Normal file
View File

@ -0,0 +1,15 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="../public/output.css" rel="stylesheet">
</head>
<body class="m-auto">
</body>
</html>

3
tailwindcss/input.css Normal file
View File

@ -0,0 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

549
tailwindcss/output.css Normal file
View File

@ -0,0 +1,549 @@
/*
! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
*/
/*
1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4)
2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116)
*/
*,
::before,
::after {
box-sizing: border-box;
/* 1 */
border-width: 0;
/* 2 */
border-style: solid;
/* 2 */
border-color: #e5e7eb;
/* 2 */
}
::before,
::after {
--tw-content: '';
}
/*
1. Use a consistent sensible line-height in all browsers.
2. Prevent adjustments of font size after orientation changes in iOS.
3. Use a more readable tab size.
4. Use the user's configured `sans` font-family by default.
5. Use the user's configured `sans` font-feature-settings by default.
6. Use the user's configured `sans` font-variation-settings by default.
7. Disable tap highlights on iOS
*/
html,
:host {
line-height: 1.5;
/* 1 */
-webkit-text-size-adjust: 100%;
/* 2 */
-moz-tab-size: 4;
/* 3 */
-o-tab-size: 4;
tab-size: 4;
/* 3 */
font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
/* 4 */
font-feature-settings: normal;
/* 5 */
font-variation-settings: normal;
/* 6 */
-webkit-tap-highlight-color: transparent;
/* 7 */
}
/*
1. Remove the margin in all browsers.
2. Inherit line-height from `html` so users can set them as a class directly on the `html` element.
*/
body {
margin: 0;
/* 1 */
line-height: inherit;
/* 2 */
}
/*
1. Add the correct height in Firefox.
2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
3. Ensure horizontal rules are visible by default.
*/
hr {
height: 0;
/* 1 */
color: inherit;
/* 2 */
border-top-width: 1px;
/* 3 */
}
/*
Add the correct text decoration in Chrome, Edge, and Safari.
*/
abbr:where([title]) {
-webkit-text-decoration: underline dotted;
text-decoration: underline dotted;
}
/*
Remove the default font size and weight for headings.
*/
h1,
h2,
h3,
h4,
h5,
h6 {
font-size: inherit;
font-weight: inherit;
}
/*
Reset links to optimize for opt-in styling instead of opt-out.
*/
a {
color: inherit;
text-decoration: inherit;
}
/*
Add the correct font weight in Edge and Safari.
*/
b,
strong {
font-weight: bolder;
}
/*
1. Use the user's configured `mono` font-family by default.
2. Use the user's configured `mono` font-feature-settings by default.
3. Use the user's configured `mono` font-variation-settings by default.
4. Correct the odd `em` font sizing in all browsers.
*/
code,
kbd,
samp,
pre {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
/* 1 */
font-feature-settings: normal;
/* 2 */
font-variation-settings: normal;
/* 3 */
font-size: 1em;
/* 4 */
}
/*
Add the correct font size in all browsers.
*/
small {
font-size: 80%;
}
/*
Prevent `sub` and `sup` elements from affecting the line height in all browsers.
*/
sub,
sup {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
/*
1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
3. Remove gaps between table borders by default.
*/
table {
text-indent: 0;
/* 1 */
border-color: inherit;
/* 2 */
border-collapse: collapse;
/* 3 */
}
/*
1. Change the font styles in all browsers.
2. Remove the margin in Firefox and Safari.
3. Remove default padding in all browsers.
*/
button,
input,
optgroup,
select,
textarea {
font-family: inherit;
/* 1 */
font-feature-settings: inherit;
/* 1 */
font-variation-settings: inherit;
/* 1 */
font-size: 100%;
/* 1 */
font-weight: inherit;
/* 1 */
line-height: inherit;
/* 1 */
color: inherit;
/* 1 */
margin: 0;
/* 2 */
padding: 0;
/* 3 */
}
/*
Remove the inheritance of text transform in Edge and Firefox.
*/
button,
select {
text-transform: none;
}
/*
1. Correct the inability to style clickable types in iOS and Safari.
2. Remove default button styles.
*/
button,
[type='button'],
[type='reset'],
[type='submit'] {
-webkit-appearance: button;
/* 1 */
background-color: transparent;
/* 2 */
background-image: none;
/* 2 */
}
/*
Use the modern Firefox focus style for all focusable elements.
*/
:-moz-focusring {
outline: auto;
}
/*
Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737)
*/
:-moz-ui-invalid {
box-shadow: none;
}
/*
Add the correct vertical alignment in Chrome and Firefox.
*/
progress {
vertical-align: baseline;
}
/*
Correct the cursor style of increment and decrement buttons in Safari.
*/
::-webkit-inner-spin-button,
::-webkit-outer-spin-button {
height: auto;
}
/*
1. Correct the odd appearance in Chrome and Safari.
2. Correct the outline style in Safari.
*/
[type='search'] {
-webkit-appearance: textfield;
/* 1 */
outline-offset: -2px;
/* 2 */
}
/*
Remove the inner padding in Chrome and Safari on macOS.
*/
::-webkit-search-decoration {
-webkit-appearance: none;
}
/*
1. Correct the inability to style clickable types in iOS and Safari.
2. Change font properties to `inherit` in Safari.
*/
::-webkit-file-upload-button {
-webkit-appearance: button;
/* 1 */
font: inherit;
/* 2 */
}
/*
Add the correct display in Chrome and Safari.
*/
summary {
display: list-item;
}
/*
Removes the default spacing and border for appropriate elements.
*/
blockquote,
dl,
dd,
h1,
h2,
h3,
h4,
h5,
h6,
hr,
figure,
p,
pre {
margin: 0;
}
fieldset {
margin: 0;
padding: 0;
}
legend {
padding: 0;
}
ol,
ul,
menu {
list-style: none;
margin: 0;
padding: 0;
}
/*
Reset default styling for dialogs.
*/
dialog {
padding: 0;
}
/*
Prevent resizing textareas horizontally by default.
*/
textarea {
resize: vertical;
}
/*
1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300)
2. Set the default placeholder color to the user's configured gray 400 color.
*/
input::-moz-placeholder, textarea::-moz-placeholder {
opacity: 1;
/* 1 */
color: #9ca3af;
/* 2 */
}
input::placeholder,
textarea::placeholder {
opacity: 1;
/* 1 */
color: #9ca3af;
/* 2 */
}
/*
Set the default cursor for buttons.
*/
button,
[role="button"] {
cursor: pointer;
}
/*
Make sure disabled buttons don't get the pointer cursor.
*/
:disabled {
cursor: default;
}
/*
1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14)
2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210)
This can trigger a poorly considered lint error in some tools but is included by design.
*/
img,
svg,
video,
canvas,
audio,
iframe,
embed,
object {
display: block;
/* 1 */
vertical-align: middle;
/* 2 */
}
/*
Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14)
*/
img,
video {
max-width: 100%;
height: auto;
}
/* Make elements with the HTML hidden attribute stay hidden by default */
[hidden] {
display: none;
}
*, ::before, ::after {
--tw-border-spacing-x: 0;
--tw-border-spacing-y: 0;
--tw-translate-x: 0;
--tw-translate-y: 0;
--tw-rotate: 0;
--tw-skew-x: 0;
--tw-skew-y: 0;
--tw-scale-x: 1;
--tw-scale-y: 1;
--tw-pan-x: ;
--tw-pan-y: ;
--tw-pinch-zoom: ;
--tw-scroll-snap-strictness: proximity;
--tw-gradient-from-position: ;
--tw-gradient-via-position: ;
--tw-gradient-to-position: ;
--tw-ordinal: ;
--tw-slashed-zero: ;
--tw-numeric-figure: ;
--tw-numeric-spacing: ;
--tw-numeric-fraction: ;
--tw-ring-inset: ;
--tw-ring-offset-width: 0px;
--tw-ring-offset-color: #fff;
--tw-ring-color: rgb(59 130 246 / 0.5);
--tw-ring-offset-shadow: 0 0 #0000;
--tw-ring-shadow: 0 0 #0000;
--tw-shadow: 0 0 #0000;
--tw-shadow-colored: 0 0 #0000;
--tw-blur: ;
--tw-brightness: ;
--tw-contrast: ;
--tw-grayscale: ;
--tw-hue-rotate: ;
--tw-invert: ;
--tw-saturate: ;
--tw-sepia: ;
--tw-drop-shadow: ;
--tw-backdrop-blur: ;
--tw-backdrop-brightness: ;
--tw-backdrop-contrast: ;
--tw-backdrop-grayscale: ;
--tw-backdrop-hue-rotate: ;
--tw-backdrop-invert: ;
--tw-backdrop-opacity: ;
--tw-backdrop-saturate: ;
--tw-backdrop-sepia: ;
}
::backdrop {
--tw-border-spacing-x: 0;
--tw-border-spacing-y: 0;
--tw-translate-x: 0;
--tw-translate-y: 0;
--tw-rotate: 0;
--tw-skew-x: 0;
--tw-skew-y: 0;
--tw-scale-x: 1;
--tw-scale-y: 1;
--tw-pan-x: ;
--tw-pan-y: ;
--tw-pinch-zoom: ;
--tw-scroll-snap-strictness: proximity;
--tw-gradient-from-position: ;
--tw-gradient-via-position: ;
--tw-gradient-to-position: ;
--tw-ordinal: ;
--tw-slashed-zero: ;
--tw-numeric-figure: ;
--tw-numeric-spacing: ;
--tw-numeric-fraction: ;
--tw-ring-inset: ;
--tw-ring-offset-width: 0px;
--tw-ring-offset-color: #fff;
--tw-ring-color: rgb(59 130 246 / 0.5);
--tw-ring-offset-shadow: 0 0 #0000;
--tw-ring-shadow: 0 0 #0000;
--tw-shadow: 0 0 #0000;
--tw-shadow-colored: 0 0 #0000;
--tw-blur: ;
--tw-brightness: ;
--tw-contrast: ;
--tw-grayscale: ;
--tw-hue-rotate: ;
--tw-invert: ;
--tw-saturate: ;
--tw-sepia: ;
--tw-drop-shadow: ;
--tw-backdrop-blur: ;
--tw-backdrop-brightness: ;
--tw-backdrop-contrast: ;
--tw-backdrop-grayscale: ;
--tw-backdrop-hue-rotate: ;
--tw-backdrop-invert: ;
--tw-backdrop-opacity: ;
--tw-backdrop-saturate: ;
--tw-backdrop-sepia: ;
}
.m-auto {
margin: auto;
}

1374
tailwindcss/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

15
tailwindcss/package.json Normal file
View File

@ -0,0 +1,15 @@
{
"name": "tailwindcss",
"version": "1.0.0",
"description": "",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"devDependencies": {
"tailwindcss": "^3.4.1"
}
}

View File

@ -0,0 +1,8 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: ["*.html"],
theme: {
extend: {},
},
plugins: [],
};