From 4889048b175de3b82fb02c364c8afe27ea8c7710 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Mon, 27 Apr 2020 19:50:36 -0500
Subject: [PATCH] Fixing bug with data files

---
 acm-config-default.json | 36 ++++++++++++++++++------------------
 acm.py                  |  4 ++--
 setup.py                |  2 +-
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/acm-config-default.json b/acm-config-default.json
index e2feb8b..1e0d125 100644
--- a/acm-config-default.json
+++ b/acm-config-default.json
@@ -3,7 +3,7 @@
   "profiles": {
     "default": {
       "jpeg": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cjpeg"],
         "extensions": [
           "jpg",
@@ -13,7 +13,7 @@
         "command": "cjpeg -optimize -quality 90 -progressive -outfile {output_file} {input_file}"
       },
       "png": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["optipng"],
         "extensions": [
           "png"
@@ -22,7 +22,7 @@
         "command": "optipng -o2 -strip all -out {output_file} {input_file}"
       },
       "video": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["ffmpeg"],
         "extensions": [
           "mp4",
@@ -32,7 +32,7 @@
         "command": "ffmpeg -hide_banner -loglevel panic -i {input_file} -c:v libvpx-vp9 -b:v 0 -crf 29 -c:a libopus {output_file}"
       },
       "audio": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["ffmpeg", "opusenc"],
         "extensions": [
           "wav",
@@ -44,7 +44,7 @@
     },
     "placebo": {
       "jpeg": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cp"],
         "extensions": [
           "jpg",
@@ -55,7 +55,7 @@
         "command": "cp {input_file} {output_file}"
       },
       "png": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cp"],
         "extensions": [
           "png"
@@ -65,7 +65,7 @@
         "command": "cp {input_file} {output_file}"
       },
       "video": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cp"],
         "extensions": [
           "mp4",
@@ -76,7 +76,7 @@
         "command": "cp {input_file} {output_file}"
       },
       "audio": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cp"],
         "extensions": [
           "wav",
@@ -89,7 +89,7 @@
     },
     "webp": {
       "jpeg": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cwebp"],
         "extensions": [
           "jpg",
@@ -99,7 +99,7 @@
         "command": "cwebp -jpeg_like -q 90 -o {output_file} {input_file}"
       },
       "png": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cwebp"],
         "extensions": [
           "png"
@@ -110,7 +110,7 @@
     },
     "aggressive": {
       "jpeg": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["ffmpeg", "cjpeg"],
         "extensions": [
           "jpg",
@@ -120,7 +120,7 @@
         "command": "export FILE={output_file} && export TEMP_FILE=${FILE}_tmp.jpg && ffmpeg -i {input_file} -vf scale=-1:720 ${TEMP_FILE} && cjpeg -optimize -quality 75 -progressive -outfile {output_file} ${TEMP_FILE} && rm ${TEMP_FILE}"
       },
       "png": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["optipng"],
         "extensions": [
           "png"
@@ -129,7 +129,7 @@
         "command": "optipng -o2 -strip all -out {output_file} {input_file}"
       },
       "video": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["ffmpeg"],
         "extensions": [
           "mp4",
@@ -139,7 +139,7 @@
         "command": "ffmpeg -hide_banner -loglevel panic -i {input_file} -vf scale=-1:720 -c:v libvpx-vp9 -b:v 0 -crf 38 -c:a libopus {output_file}"
       },
       "audio": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["ffmpeg", "opusenc"],
         "extensions": [
           "wav",
@@ -151,7 +151,7 @@
     },
     "aggressive-webp": {
       "jpeg": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cwebp"],
         "extensions": [
           "jpg",
@@ -161,7 +161,7 @@
         "command": "export FILE={output_file} && export TEMP_FILE=${FILE}_tmp.jpg && ffmpeg -i {input_file} -vf scale=-1:720 ${TEMP_FILE} && cwebp -jpeg_like -q 75 -o {output_file} ${TEMP_FILE} && rm ${TEMP_FILE}"
       },
       "png": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["cwebp"],
         "extensions": [
           "png"
@@ -170,7 +170,7 @@
         "command": "cwebp -o {output_file} ${input_file}"
       },
       "video": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["ffmpeg"],
         "extensions": [
           "mp4",
@@ -180,7 +180,7 @@
         "command": "ffmpeg -hide_banner -loglevel panic -i {input_file} -vf scale=-1:720 -c:v libvpx-vp9 -b:v 0 -crf 38 -c:a libopus {output_file}"
       },
       "audio": {
-        "version": "1.2.1",
+        "version": "1.3.1",
         "processors": ["ffmpeg", "opusenc"],
         "extensions": [
           "wav",
diff --git a/acm.py b/acm.py
index 5ec6381..de461b6 100755
--- a/acm.py
+++ b/acm.py
@@ -18,7 +18,7 @@ from minio.error import NoSuchKey
 BUF_SIZE = 4096
 
 #Application Version
-VERSION = "1.3.0"
+VERSION = "1.3.1"
 
 
 ###########
@@ -603,7 +603,7 @@ def clean_files(ctx, context, context_data, dry_run, files):
                     print(f'ERROR: {s3_bucket}:{file_identity} {e}', file=sys.stderr)
 
     for file_data_identity in found_data_objects:
-        if not f'/{file_data_identity}' in found_data_files:
+        if not file_data_identity in found_data_files:
             if dry_run:
                 removed_files.append(f'{s3_data_bucket}:{file_data_identity}')
             else:
diff --git a/setup.py b/setup.py
index b690a8b..9fcf464 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from distutils.core import setup
 
 setup(
     name='Asset-Compression-Manager',
-    version='1.3.0',
+    version='1.3.1',
     description='Helper Utility For Managing Compressed Assets',
     author='Drew Short',
     author_email='warrick@sothr.com'