Final Push

Author: TheFinalJoke

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 [package]
 name = "ohmyoled"
-version = "2.2.0"
+version = "2.2.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@ ARG NODE_VERSION="none"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 RUN apt update && apt install fonts-noto-mono -y && apt install vim python3-dev -y 
 
-ARG OHMYOLED_VERSION=2.2.0
+ARG OHMYOLED_VERSION=2.2.1
 ARG RBGMATRIX_GIT_URL=https://github.com/hzeller/rpi-rgb-led-matrix.git
 RUN /usr/local/bin/python3 -m pip install --upgrade pip
 
@@ -23,8 +23,7 @@ RUN echo 'source $HOME/.cargo/env' >> $HOME/.bashrc
 
 FROM RUST_LAYER
 RUN git clone https://github.com/TheFinalJoke/ohmyoled.git \
-    && mkdir -p /var/log/ohmyoled && mkdir -p /etc/ohmyoled \ 
-    && cp /ohmyoled/lib/config/ohmyoled.conf /etc/ohmyoled/ \
+    && mkdir -p /var/log/ohmyoled && mkdir -p /etc/ohmyoled \
     && cp -Rv /ohmyoled/fonts/* /usr/share/fonts/
 
 CMD [ "/bin/bash"]

Cargo.lock

@@ -7,7 +7,7 @@ ARG NODE_VERSION="none"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 RUN apt update && apt install fonts-noto-mono -y && apt install vim python3-dev -y 
 
-ARG OHMYOLED_VERSION=2.2.0
+ARG OHMYOLED_VERSION=2.2.1
 ARG RBGMATRIX_GIT_URL=https://github.com/hzeller/rpi-rgb-led-matrix.git
 RUN /usr/local/bin/python3 -m pip install --upgrade pip
 
@@ -27,5 +27,7 @@ RUN git clone https://github.com/TheFinalJoke/ohmyoled.git \
     && cp -Rv /ohmyoled/fonts/* /usr/share/fonts/
 WORKDIR /ohmyoled/
 RUN /root/.cargo/bin/cargo build --release
-
-ENTRYPOINT ["target/release/ohmyoled"]
+ENV RUST_BACKTRACE=full
+#SCMD cat /etc/ohmyoled/ohmyoled.json
+#ENTRYPOINT ["target/release/ohmyoled"]
+CMD /bin/bash

Cargo.toml

@@ -100,7 +100,7 @@ fn init_logger() {
 async fn main() -> PyResult<()> {
     init_logger();
     let mut configuration = json::JsonValue::Null;
-    let app = App::new("ohmyoled").version("2.2.0");
+    let app = App::new("ohmyoled").version("2.2.1sssssssssssssssss");
     let args_vec = vec![
         Arg::new("create_json")
         .short('c')

container/devcontainer_build/Dockerfile

@@ -58,7 +58,7 @@ def __init__(self, config):
         super().__init__()
         self.config = config
         self.runner_logger = logger
-        if int(os.getenv("DEV")) != 1:
+        if not os.getenv("DEV"):
             self.logger.setLevel(logging.INFO)
         else:
             self.logger.setLevel(logging.DEBUG)

container/prodcontainer_build/Dockerfile

@@ -45,7 +45,7 @@ def version(cls):
     def __init__(self, config) -> None:
         self.config = config
         self.logger = logger
-        if int(os.getenv("DEV")) != 1:
+        if not os.getenv("DEV"):
             self.logger.setLevel(logging.INFO)
         else:
             self.logger.setLevel(logging.DEBUG)

src/main.rs

@@ -4,7 +4,7 @@
     ld = file.read()
 setup(
     name="ohmyoled",
-    version="2.2.0",
+    version="2.2.1",
     python_requires='>=3.8.9',
     py_modules=["ohmyoled"], # Tells the name 
     packages=find_packages(),