Split svg_string from svg_path (#24)

* add * Update Cargo.lock * Update lib.rs * Update lib.rs * Update CI.yaml * add * Update CI.yaml * add * Update CI.yaml * add * add * add * Update CI.yaml * Update CI.yaml * Revert "Update CI.yaml" This reverts commit 93209d4. * Update CI.yaml * ad * Update CI.yaml * Update CI.yaml * add
baseplate-admin · May 6, 2024 · c048f21 · c048f21
1 parent b2211be
commit c048f21
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 68 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,10 +10,10 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 100
-  - package-ecosystem: "github-actions" # See documentation for possible values
-    directory: "/" # Location of package manifests
-    schedule:
-      interval: "daily"
+  # - package-ecosystem: "github-actions" # See documentation for possible values
+  #   directory: "/" # Location of package manifests
+  #   schedule:
+  #     interval: "daily"
     open-pull-requests-limit: 100
   - package-ecosystem: "pip" # See documentation for possible values
     directory: "/" # Location of package manifests

diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -1,30 +1,27 @@
 # This file is autogenerated by maturin v1.5.1
 # To update, run
 #
-#    maturin generate-ci --pytest github
+#    maturin generate-ci github
 #
 name: CI
 
 on:
     push:
         branches:
-            - "*"
+            - main
+            - master
         tags:
             - '*'
     pull_request:
     workflow_dispatch:
 
-env:
-    RUST_BACKTRACE: "full"
-
 permissions:
     contents: read
 
 jobs:
     linux:
         runs-on: ${{ matrix.platform.runner }}
         strategy:
-            fail-fast: false
             matrix:
                 platform:
                     - runner: ubuntu-latest
@@ -35,6 +32,8 @@ jobs:
                       target: aarch64
                     - runner: ubuntu-latest
                       target: armv7
+                    - runner: ubuntu-latest
+                      target: s390x
                     - runner: ubuntu-latest
                       target: ppc64le
         steps:
@@ -54,29 +53,6 @@ jobs:
               with:
                   name: wheels-linux-${{ matrix.platform.target }}
                   path: dist
-            - name: pytest
-              if: ${{ startsWith(matrix.platform.target, 'x86_64') }}
-              shell: bash
-              run: |
-                  set -e
-                  pip install resvg_py --find-links dist --force-reinstall
-                  pip install pytest
-                  pytest -rP
-            - name: pytest
-              if: ${{ !startsWith(matrix.platform.target, 'x86') && matrix.platform.target != 'ppc64' }}
-              uses: uraimo/run-on-arch-action@v2.7.2
-              with:
-                  arch: ${{ matrix.platform.target }}
-                  distro: ubuntu22.04
-                  githubToken: ${{ github.token }}
-                  install: |
-                      apt-get update
-                      apt-get install -y --no-install-recommends python3 python3-pip
-                      pip3 install -U pip pytest
-                  run: |
-                      set -e
-                      pip3 install resvg_py --find-links dist --force-reinstall
-                      pytest -rP
 
     windows:
         runs-on: ${{ matrix.platform.runner }}
@@ -104,14 +80,6 @@ jobs:
               with:
                   name: wheels-windows-${{ matrix.platform.target }}
                   path: dist
-            - name: pytest
-              if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
-              shell: bash
-              run: |
-                  set -e
-                  pip install resvg_py --find-links dist --force-reinstall
-                  pip install pytest
-                  pytest -rP
 
     macos:
         runs-on: ${{ matrix.platform.runner }}
@@ -138,14 +106,6 @@ jobs:
               with:
                   name: wheels-macos-${{ matrix.platform.target }}
                   path: dist
-            - name: pytest
-              if: ${{ !startsWith(matrix.platform.target, 'aarch64') }}
-              shell: bash
-              run: |
-                  set -e
-                  pip install resvg_py --find-links dist --force-reinstall
-                  pip install pytest
-                  pytest -rP
 
     sdist:
         runs-on: ubuntu-latest

diff --git a/src/rust/lib.rs b/src/rust/lib.rs
@@ -135,7 +135,8 @@ fn resvg_magic(mut options: Opts, svg_string: String) -> Result<Vec<u8>, String>
 #[pyfunction]
 #[pyo3(name = "svg_to_base64")]
 fn svg_to_base64(
-    svg: String,
+    svg_string: Option<String>,
+    svg_path: Option<String>,
     // Control width, height, zoom, dpi
     width: Option<u32>,
     height: Option<u32>,
@@ -161,19 +162,31 @@ fn svg_to_base64(
     // Background
     background: Option<String>,
 ) -> PyResult<String> {
-    let svg_string: String;
+    let mut _svg_string = String::new();
 
-    if std::path::Path::new(&svg).exists() {
-        let mut svg_data = std::fs::read(&svg).expect("failed to open the provided file");
-        if svg_data.starts_with(&[0x1f, 0x8b]) {
-            svg_data =
-                resvg::usvg::decompress_svgz(&svg_data).expect("can't decompress the svg file");
-        };
-        svg_string = std::str::from_utf8(&svg_data)
-            .expect("can't convert bytes to utf-8")
-            .to_owned();
-    } else {
-        svg_string = svg;
+    if let Some(svg_string) = svg_string {
+        _svg_string = svg_string;
+    }
+
+    // Only check for path if provided string is empty
+    if _svg_string.is_empty() {
+        if let Some(svg_path) = svg_path {
+            if std::path::Path::new(&svg_path).exists() {
+                let mut svg_data =
+                    std::fs::read(&svg_path).expect("failed to open the provided file");
+                if svg_data.starts_with(&[0x1f, 0x8b]) {
+                    svg_data = resvg::usvg::decompress_svgz(&svg_data)
+                        .expect("can't decompress the svg file");
+                };
+                _svg_string = std::str::from_utf8(&svg_data)
+                    .expect("can't convert bytes to utf-8")
+                    .to_owned();
+            }
+        }
+    }
+
+    if _svg_string.is_empty() {
+        panic!("`svg_string` is empty or `svg_path` contains empty invalid svg");
     }
 
     let mut fit_to = FitTo::Original;
@@ -259,7 +272,7 @@ fn svg_to_base64(
         font_files,
         font_dirs,
     };
-    let pixmap = resvg_magic(options, svg_string.trim().to_owned()).unwrap();
+    let pixmap = resvg_magic(options, _svg_string.trim().to_owned()).unwrap();
     Ok(general_purpose::STANDARD.encode(&pixmap))
 }
 

diff --git a/tests/test_complex_camera.py b/tests/test_complex_camera.py
diff --git a/tests/test_multiple_layer_svg.py b/tests/test_multiple_layer_svg.py
diff --git a/tests/test_normal_shape.py b/tests/test_normal_shape.py
@@ -8,7 +8,7 @@
 
 
 def test_rectangle():
-    base64 = resvg_py.svg_to_base64(svg_string)
+    base64 = resvg_py.svg_to_base64(svg_string=svg_string)
     assert (
         base64
         == "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"

diff --git a/tests/test_path.py b/tests/test_path.py
@@ -11,15 +11,15 @@ def test_path():
     path = os.path.join(BASE_DIR, "acid.svg")
     print(path)
 
-    base = resvg_py.svg_to_base64(path)
+    base = resvg_py.svg_to_base64(svg_path=path)
     assert base == svg_output
 
 
 def test_gzip_path():
     path = os.path.join(BASE_DIR, "acid.svg.gz")
     print(path)
 
-    base = resvg_py.svg_to_base64(path)
+    base = resvg_py.svg_to_base64(svg_path=path)
     assert base == svg_output