Adding support for RDB version <= 12 and refactoring

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @bimtauer

.github/workflows/Python-CI.yaml

@@ -0,0 +1,149 @@
+# This file is autogenerated by maturin v1.8.1
+# To update, run
+#
+#    maturin generate-ci github --platform linux --platform windows --platform macos
+#
+name: Python-CI
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  linux:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: ubuntu-22.04
+            target: x86_64
+          - runner: ubuntu-22.04
+            target: x86
+          - runner: ubuntu-22.04
+            target: aarch64
+          - runner: ubuntu-22.04
+            target: armv7
+          - runner: ubuntu-22.04
+            target: s390x
+          - runner: ubuntu-22.04
+            target: ppc64le
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+          manylinux: auto
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-${{ matrix.platform.target }}
+          path: dist
+
+  windows:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: windows-latest
+            target: x64
+          - runner: windows-latest
+            target: x86
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+          architecture: ${{ matrix.platform.target }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-windows-${{ matrix.platform.target }}
+          path: dist
+
+  macos:
+    runs-on: ${{ matrix.platform.runner }}
+    strategy:
+      matrix:
+        platform:
+          - runner: macos-13
+            target: x86_64
+          - runner: macos-14
+            target: aarch64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          target: ${{ matrix.platform.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-macos-${{ matrix.platform.target }}
+          path: dist
+
+  sdist:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build sdist
+        uses: PyO3/maturin-action@v1
+        with:
+          command: sdist
+          args: --out dist
+      - name: Upload sdist
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-sdist
+          path: dist
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
+    needs: [linux, windows, macos, sdist]
+    permissions:
+      # Use to sign the release artifacts
+      id-token: write
+      # Used to upload release artifacts
+      contents: write
+      # Used to generate artifact attestation
+      attestations: write
+    steps:
+      - uses: actions/download-artifact@v4
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v1
+        with:
+          subject-path: 'wheels-*/*'
+      - name: Publish to PyPI
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        uses: PyO3/maturin-action@v1
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+        with:
+          command: upload
+          args: --non-interactive --skip-existing wheels-*/*

.python-version

@@ -0,0 +1 @@
+3.10

Cargo.toml

@@ -25,13 +25,18 @@ name = "rdb"
 path = "src/main.rs"
 doc  = false
 
+[lib]
+name = "rdb"
+crate-type = ["cdylib", "rlib"]
+
 [dependencies]
 lzf = "0.3"
 getopts = "0.2"
 rustc-serialize = "0.3"
 regex = "0.1"
 byteorder = "0.5"
 thiserror = "1.0"
+pyo3 = { version = "0.23.3", features = ["extension-module"], optional = true }
 clap = { version = "4.4", features = ["derive"] }
 indexmap = "2.7.0"
 log = "0.4.22"
@@ -45,3 +50,7 @@ rstest = "0.23.0"
 testcontainers = "0.23.1"
 testcontainers-modules = { version = "0.11.4", features = ["redis"] }
 tempfile = "3.14.0"
+
+[features]
+default = []
+python = ["pyo3"]

pyproject.toml

@@ -0,0 +1,23 @@
+[project]
+name = "rdb"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "maturin>=1.8.0",
+    "cffi==1.17.1"
+]
+classifiers = [
+    "Programming Language :: Rust",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "Programming Language :: Python :: Implementation :: PyPy",
+]
+
+
+[build-system]
+requires = ["maturin>=1,<2"]
+build-backend = "maturin"
+
+[tool.maturin]
+features = ["python"]

src/formatter/mod.rs

@@ -94,7 +94,6 @@ pub trait Formatter {
                 self.checksum(checksum);
                 Ok(())
             }
-            _ => Ok(()),
         }
     }
 }

src/lib.rs

@@ -27,7 +27,7 @@
 //! # use std::path::Path;
 //! let file = File::open(&Path::new("dump.rdb")).unwrap();
 //! let reader = BufReader::new(file);
-//! rdb::parse(reader, rdb::formatter::JSON::new(None), rdb::filter::Simple::new());
+//! rdb::parse_with_formatter(reader, rdb::formatter::JSON::new(None), rdb::filter::Simple::new());
 //! ```
 //!
 //! # Formatter
@@ -72,12 +72,11 @@
 //! value
 //! ```
 
-extern crate byteorder;
-extern crate lzf;
-extern crate regex;
-extern crate rustc_serialize as serialize;
+#[cfg(feature = "python")]
+use pyo3::exceptions::PyValueError;
+#[cfg(feature = "python")]
+use pyo3::prelude::*;
 
-//use pyo3::prelude::*;
 use std::io::Read;
 
 #[doc(hidden)]
@@ -107,6 +106,10 @@ impl<R: Read, L: Filter, F: Formatter> RdbParser<R, L, F> {
             formatter: None,
         }
     }
+
+    pub fn into_iter(self) -> RdbDecoder<R, L> {
+        self.decoder
+    }
 }
 
 #[derive(Default)]
@@ -156,7 +159,7 @@ impl<R: Read, L: Filter, F: Formatter> RdbParser<R, L, F> {
     }
 }
 
-pub fn parse<R: Read, L: Filter + Default, F: Formatter>(
+pub fn parse_with_formatter<R: Read, L: Filter + Default, F: Formatter>(
     reader: R,
     formatter: F,
     filter: L,
@@ -168,3 +171,60 @@ pub fn parse<R: Read, L: Filter + Default, F: Formatter>(
         .build();
     parser.parse()
 }
+
+#[cfg(feature = "python")]
+#[pyclass(name = "RdbDecoder")]
+pub struct PyRdbDecoder {
+    decoder: RdbDecoder<std::fs::File, Simple>,
+}
+
+#[cfg(feature = "python")]
+#[pymethods]
+impl PyRdbDecoder {
+    #[new]
+    pub fn new(path: &str) -> PyResult<Self> {
+        let file = std::fs::File::open(path)
+            .map_err(|e| PyValueError::new_err(format!("Failed to open file: {}", e)))?;
+
+        let mut filter = Simple::new();
+
+        for t in [
+            Type::Hash,
+            Type::String,
+            Type::List,
+            Type::Set,
+            Type::SortedSet,
+        ] {
+            filter.add_type(t);
+        }
+
+        let decoder = RdbDecoder::new(file, filter)
+            .map_err(|e| PyValueError::new_err(format!("Failed to create decoder: {}", e)))?;
+
+        Ok(PyRdbDecoder { decoder })
+    }
+
+    fn __iter__(slf: PyRef<'_, Self>) -> PyRef<'_, Self> {
+        slf
+    }
+
+    fn __next__(mut slf: PyRefMut<'_, Self>) -> PyResult<Option<PyObject>> {
+        match slf.decoder.next() {
+            Some(Ok(value)) => Python::with_gil(|py| {
+                value
+                    .into_pyobject(py)
+                    .map(|obj| Some(obj.into()))
+                    .map_err(|e| PyValueError::new_err(format!("Conversion error: {}", e)))
+            }),
+            Some(Err(e)) => Err(PyValueError::new_err(format!("Parsing error: {}", e))),
+            None => Ok(None),
+        }
+    }
+}
+
+#[cfg(feature = "python")]
+#[pymodule(name = "rdb")]
+fn rdb_py(m: &Bound<'_, PyModule>) -> PyResult<()> {
+    m.add_class::<PyRdbDecoder>()?;
+    Ok(())
+}

src/main.rs

@@ -96,5 +96,5 @@ pub fn main() {
         }
     };
 
-    rdb::parse(reader, formatter, filter).expect("Failed to parse RDB file");
+    rdb::parse_with_formatter(reader, formatter, filter).expect("Failed to parse RDB file");
 }