refactor: re-use common code

Author: ctron

src/pipelines/copy_dir.rs

@@ -1,17 +1,17 @@
 //! Copy-dir asset pipeline.
 
-use std::path::PathBuf;
-use std::sync::Arc;
-
+use super::{data_target_path, Attrs, TrunkAssetPipelineOutput, ATTR_HREF};
+use crate::{
+    common::{copy_dir_recursive, target_path},
+    config::RtcBuild,
+};
 use anyhow::{Context, Result};
 use nipper::Document;
+use std::path::PathBuf;
+use std::sync::Arc;
 use tokio::fs;
 use tokio::task::JoinHandle;
 
-use super::{Attrs, TrunkAssetPipelineOutput, ATTR_HREF};
-use crate::common::{copy_dir_recursive, target_path};
-use crate::config::RtcBuild;
-
 /// A CopyDir asset pipeline.
 pub struct CopyDir {
     /// The ID of this pipeline's source HTML element.
@@ -42,10 +42,7 @@ impl CopyDir {
         if !path.is_absolute() {
             path = html_dir.join(path);
         }
-        let target_path = attrs
-            .get("data-target-path")
-            .map(|val| val.parse())
-            .transpose()?;
+        let target_path = data_target_path(&attrs)?;
 
         Ok(Self {
             id,

src/pipelines/copy_file.rs

@@ -1,15 +1,18 @@
 //! Copy-file asset pipeline.
 
-use crate::common::target_path;
+use crate::{
+    common::target_path,
+    config::RtcBuild,
+    pipelines::{
+        data_target_path, AssetFile, AssetFileType, Attrs, TrunkAssetPipelineOutput, ATTR_HREF,
+    },
+};
 use anyhow::{Context, Result};
 use nipper::Document;
 use std::path::PathBuf;
 use std::sync::Arc;
 use tokio::task::JoinHandle;
 
-use crate::config::RtcBuild;
-use crate::pipelines::{AssetFile, AssetFileType, Attrs, TrunkAssetPipelineOutput, ATTR_HREF};
-
 /// A CopyFile asset pipeline.
 pub struct CopyFile {
     /// The ID of this pipeline's source HTML element.
@@ -39,10 +42,7 @@ impl CopyFile {
         path.extend(href_attr.split('/'));
         let asset = AssetFile::new(&html_dir, path).await?;
 
-        let target_path = attrs
-            .get("data-target-path")
-            .map(|val| val.parse())
-            .transpose()?;
+        let target_path = data_target_path(&attrs)?;
 
         Ok(Self {
             id,

src/pipelines/css.rs

@@ -1,8 +1,11 @@
 //! CSS asset pipeline.
 
-use super::{AssetFile, AttrWriter, Attrs, TrunkAssetPipelineOutput, ATTR_HREF, ATTR_MINIFY};
-use crate::common::target_path;
+use super::{
+    data_target_path, AssetFile, AttrWriter, Attrs, TrunkAssetPipelineOutput, ATTR_HREF,
+    ATTR_MINIFY,
+};
 use crate::{
+    common::target_path,
     config::RtcBuild,
     pipelines::AssetFileType,
     processing::integrity::{IntegrityType, OutputDigest},
@@ -52,10 +55,7 @@ impl Css {
 
         let minify = attrs.get(ATTR_MINIFY).is_none();
 
-        let target_path = attrs
-            .get("data-target-path")
-            .map(|val| val.parse())
-            .transpose()?;
+        let target_path = data_target_path(&attrs)?;
 
         Ok(Self {
             id,

src/pipelines/icon.rs

@@ -1,6 +1,6 @@
 //! Icon asset pipeline.
 
-use super::{AssetFile, AttrWriter, Attrs, TrunkAssetPipelineOutput, ATTR_HREF};
+use super::{data_target_path, AssetFile, AttrWriter, Attrs, TrunkAssetPipelineOutput, ATTR_HREF};
 use crate::common::target_path;
 use crate::config::RtcBuild;
 use crate::pipelines::{AssetFileType, ImageType};
@@ -45,10 +45,7 @@ impl Icon {
 
         let integrity = IntegrityType::from_attrs(&attrs, &cfg)?;
 
-        let target_path = attrs
-            .get("data-target-path")
-            .map(|val| val.parse())
-            .transpose()?;
+        let target_path = data_target_path(&attrs)?;
 
         Ok(Self {
             id,

src/pipelines/mod.rs

@@ -46,6 +46,7 @@ const ATTR_SRC: &str = "src";
 const ATTR_TYPE: &str = "type";
 const ATTR_REL: &str = "rel";
 const ATTR_MINIFY: &str = "data-no-minify";
+const ATTR_TARGET_PATH: &str = "data-target-path";
 const SNIPPETS_DIR: &str = "snippets";
 const TRUNK_ID: &str = "data-trunk-id";
 const PNG_OPTIMIZATION_LEVEL: u8 = 6;
@@ -398,3 +399,11 @@ impl fmt::Display for AttrWriter<'_> {
         Ok(())
     }
 }
+
+/// Get the target path for an asset
+fn data_target_path(attrs: &Attrs) -> Result<Option<PathBuf>> {
+    Ok(attrs
+        .get(ATTR_TARGET_PATH)
+        .map(|val| val.parse())
+        .transpose()?)
+}