Adding support for RDB version <= 12 and refactoring

.github/CODEOWNERS

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

.github/workflows/Python-CI.yaml

@@ -0,0 +1,148 @@
+# This file is autogenerated by maturin v1.8.1
+# To update, run
+#
+#    maturin generate-ci github --platform linux --platform windows --platform macos
+#
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - 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
+        with:
+          command: upload
+          args: --non-interactive --skip-existing wheels-*/*

.github/workflows/ci.yaml

@@ -0,0 +1,40 @@
+name: Cargo Build & Test
+
+on:
+  push:
+  pull_request:
+
+env: 
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build_and_test:
+    name: Rust project - latest
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        toolchain:
+          - stable
+          - beta
+          - nightly
+    steps:
+      - uses: actions/checkout@v4
+      - name: setup toolchain
+        run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
+
+      - name: Cache cargo
+        uses: Swatinem/rust-cache@v2
+
+      - name: cargo build
+        run: cargo build --verbose
+
+      - name: cargo test
+        run: cargo test --verbose
+
+      - name: Check formatting
+        if: matrix.toolchain == 'stable'
+        run: cargo fmt --all -- --check
+
+      - name: Clippy
+        if: matrix.toolchain == 'stable'
+        run: cargo clippy --all --all-features --tests -- -D warnings

.gitignore

@@ -1,6 +1,17 @@
-/target
-/Cargo.lock
-/utils/pkg
-/utils/src
-/utils/rdb-rs
-*.tar.gz
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
+
+# MSVC Windows builds of rustc generate these, which store debugging information
+*.pdb
+
+# Python
+.python-version

CHANGELOG.md

@@ -1,3 +1,37 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+ - New RDB version and Datatypes
+ - Rust based integration tests
+ - Fixtures for protocol and plain output
+ - Redis integration test covering 6.2 - 7.4
+ - Option to output to file
+ - Error handling with thiserror
+ - Support for new encoding types:
+    - listpack
+    - quicklist
+    - sorted set v2
+ - Python bindings with Maturin
+
+### Changed
+ - Ported CLI to clap
+ - Encoding of non-ascii characters - previously escaped, resulting in possible duplicate json keys, now as hex string
+ - Separated decoding and formatting logic
+
+### Removed
+ - Previous docs and build pipeline
+
+
+---
+# Previous:
+
 ### 0.2.1 - 2016-08-03
 
 * Bug fix: Correctly handle skipping blobs

Cargo.toml

@@ -1,15 +1,12 @@
 [package]
-
 name = "rdb"
-version = "0.2.1"
-authors = ["Jan-Erik Rediger <[email protected]>"]
-
-keywords = ["redis", "database"]
+edition = "2021"
+version = "0.3.0"
+authors = ["Jan-Erik Rediger <[email protected]>", "Tim Bauer <[email protected]>"]
+keywords = ["redis", "database", "rdb", "parser"]
 description = "Fast and efficient RDB parsing utility"
-
 readme = "README.md"
 license = "MIT"
-
 homepage = "http://rdb.fnordig.de/"
 documentation = "http://rdb.fnordig.de/doc/rdb/"
 repository = "https://github.com/badboy/rdb-rs"
@@ -28,9 +25,33 @@ 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"
+
+[dev-dependencies]
+async-std = { version = "1.13.0", features = ["attributes"] }
+tokio = { version = "1.0", features = ["full"] }
+pretty_assertions = "1.4.1"
+redis = "0.27.6"
+rstest = "0.23.0"
+testcontainers = "0.23.1"
+testcontainers-modules = { version = "0.11.4", features = ["redis"] }
+tempfile = "3.14.0"
+assert_cmd = "2.0.16"
+
+[features]
+default = []
+python = ["pyo3"]