Add optional language field to File

Author: LostLuma

echo/openapi.json

@@ -278,6 +278,11 @@
             "type": "string",
             "description": "The File's content."
           },
+          "language": {
+            "type": "string",
+            "nullable": true,
+            "description": "Syntax highlighting language for the File."
+          },
           "lines": {
             "type": "integer",
             "description": "Amount of newlines the content has."
@@ -288,7 +293,7 @@
           },
           "annotations": {
             "type": "array",
-            "description": "Auto-generated notices about the File content.",
+            "description": "Auto-generated notices about File content.",
             "items": {
               "$ref": "#/components/schemas/Annotation"
             }
@@ -297,6 +302,7 @@
         "example": {
           "name": "beaver.txt",
           "content": "Beavers are soo cute!",
+          "language": "plaintext",
           "lines": 1,
           "characters": 21,
           "annotations": []
@@ -372,6 +378,10 @@
             "minLength": 1,
             "maxLength": 300000,
             "description": "The File's content."
+          },
+          "language": {
+            "type": "string",
+            "description": "Syntax highlighting language for the File."
           }
         },
         "required": ["content"],

echo/schema/01-base.sh

@@ -22,6 +22,7 @@ psql -v ON_ERROR_STOP=1 --username "echo" --dbname "echo" <<-EOSQL
         paste_id TEXT REFERENCES pastes(id) ON DELETE CASCADE,
         name TEXT NOT NULL,
         content TEXT NOT NULL,
+        language TEXT, -- highlight.js syntax highlighting language
         lines INTEGER NOT NULL GENERATED ALWAYS AS (LENGTH(REGEXP_REPLACE(content, '[^\n]', '', 'g')) + 1) STORED,
         characters INTEGER NOT NULL GENERATED ALWAYS AS (LENGTH(content)) STORED
     );

echo/src/database/pastes.rs

@@ -125,7 +125,7 @@ impl File {
     async fn fetch(conn: &mut Connection<PgDatabase>, paste_id: &str) -> Result<Vec<Self>> {
         let result = sqlx::query(
             "
-            SELECT id, name, content, lines, characters
+            SELECT id, name, content, language, lines, characters
             FROM files
             WHERE paste_id = $1
             ORDER BY id ASC
@@ -159,14 +159,15 @@ impl File {
     ) -> Result<Self> {
         let result = sqlx::query(
             "
-            INSERT INTO files (paste_id, name, content)
-            VALUES ($1, $2, $3)
-            RETURNING id, name, content, lines, characters
+            INSERT INTO files (paste_id, name, content, language)
+            VALUES ($1, $2, $3, $4)
+            RETURNING id, name, content, language, lines, characters
             ",
         )
         .bind(paste_id)
         .bind(file.name().or(Some("unknown")))
         .bind(file.content())
+        .bind(file.language())
         .fetch_one(&mut **tx)
         .await;
 
@@ -184,11 +185,12 @@ impl File {
     fn from_row(row: PgRow, annotations: Vec<Annotation>) -> Self {
         let name = row.get("name");
         let content = row.get("content");
+        let language = row.get("language");
 
         let lines = row.get("lines");
         let characters = row.get("characters");
 
-        File::new(name, content, lines, characters, annotations)
+        File::new(name, content, language, lines, characters, annotations)
     }
 }
 

echo/src/models/pastes.rs

@@ -77,6 +77,7 @@ impl FromRow<'_, PgRow> for Annotation {
 pub struct File {
     name: String,
     content: String,
+    language: Option<String>,
 
     lines: i32,
     characters: i32,
@@ -88,13 +89,15 @@ impl File {
     pub fn new(
         name: String,
         content: String,
+        language: Option<String>,
         lines: i32,
         characters: i32,
         annotations: Vec<Annotation>,
     ) -> Self {
         File {
             name,
             content,
+            language,
             lines,
             characters,
             annotations,
@@ -150,19 +153,21 @@ impl Paste {
 
 #[derive(Deserialize, Serialize, Validate)]
 pub struct CreateFile<'r> {
-    #[validate(length(min = 1, max = 32), custom(function = "validate_name"))]
+    #[validate(length(min = 1, max = 32), custom(function = "no_newlines"))]
     name: Option<&'r str>,
     #[validate(length(min = 1, max = 300_000))]
     // Using String instead of str because of newlines:
     // https://github.com/somehowchris/rocket-validation/issues/41
     content: String,
+    #[validate(length(min = 1, max = 32), custom(function = "no_newlines"))]
+    language: Option<&'r str>,
 }
 
-fn validate_name(name: &str) -> result::Result<(), ValidationError> {
+fn no_newlines(name: &str) -> result::Result<(), ValidationError> {
     if !name.contains("\n") {
         Ok(())
     } else {
-        Err(ValidationError::new("Newline in file name."))
+        Err(ValidationError::new("Found newline in unsupported field."))
     }
 }
 
@@ -174,6 +179,10 @@ impl<'r> CreateFile<'r> {
     pub fn content(&self) -> &str {
         &self.content
     }
+
+    pub fn language(&self) -> Option<&'r str> {
+        self.language
+    }
 }
 
 #[derive(Deserialize, Serialize, Validate)]
@@ -215,6 +224,7 @@ impl<'r> CreatePaste<'r> {
         let file = CreateFile {
             name: None,
             content,
+            language: None,
         };
 
         Ok(CreatePaste {