r0b08x [chore] 3/24/2024, 9:59:00 AM

patrikx3 · Mar 24, 2024 · aa4edeb · aa4edeb
1 parent 0da561e
commit aa4edeb
Showing 7 changed files with 22 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ https://corifeus.com/redis-ui
 
 
 ---
-# 💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io v2024.4.155
+# 💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io v2024.4.156
 
 
 
@@ -77,7 +77,7 @@ All my domains ([patrikx3.com](https://patrikx3.com) and [corifeus.com](https://
 
 ---
 
-[**P3X-REDIS-UI-MATERIAL**](https://corifeus.com/redis-ui-material) Build v2024.4.155
+[**P3X-REDIS-UI-MATERIAL**](https://corifeus.com/redis-ui-material) Build v2024.4.156
 
 [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "p3x-redis-ui-material",
-    "version": "2024.4.155",
+    "version": "2024.4.156",
     "description": "💿 The p3x-redis-ui-material web interface that connects to the p3x-redis-ui-server via http and socket.io",
     "corifeus": {
         "icon": "fas fa-database",

diff --git a/src/angular/pages/main/p3xr-main-key.html b/src/angular/pages/main/p3xr-main-key.html
@@ -119,18 +119,9 @@ <h3>
 
     <md-list-item>
         <p>{{ $root.p3xr.strings.page.key.label.length }}:</p>
-        <span ng-if="$ctrl.response.type === 'string'" style="opacity: 0.5">
-                {{ $ctrl.charactersPrettyBytes($ctrl.response.length) }}
-            &nbsp;
-        </span>
-        {{ $ctrl.response.length }}
-        &nbsp;
-        <span ng-if="$ctrl.response.type === 'string'">
-                {{ $root.p3xr.strings.page.key.label.lengthString }}
-        </span>
-        <span ng-if="$ctrl.response.type !== 'string'">
-            {{ $root.p3xr.strings.page.key.label.lengthItem }}
-        </span>
+        <span style="opacity: 0.5">{{ $ctrl.charactersPrettyBytes($ctrl.response.size) }}&nbsp;</span>
+        {{ $ctrl.response.size }}&nbsp;{{ $root.p3xr.strings.page.key.label.lengthString }}
+        <span ng-if="$ctrl.response.length">,  {{ $ctrl.response.length }} {{ $root.p3xr.strings.page.key.label.lengthItem }}</span>
     </md-list-item>
 
 

diff --git a/src/angular/pages/main/p3xr-main-key.js b/src/angular/pages/main/p3xr-main-key.js
@@ -134,17 +134,23 @@ p3xr.ng.component('p3xrMainKey', {
                 })
                 this.response = response
 
-                const type = response.type
+                //const type = response.type
                 if (response.ttl === -2) {
                     checkTtl()
                     return;
                 }
-                switch (type) {
-                    case 'string':
-                        //p3xr.state.keysInfo[$stateParams.key].length = response.value.length
-                        response.length = response.valueBuffer.maxByteLength
-                        console.warn(response.valueBuffer)
-                        break;
+                response.size = 0
+                console.log('response', response, 'typeof response.valueBuffer === object', typeof response.valueBuffer === 'object')
+                if (typeof response.valueBuffer === 'object' && response.length > 0) {
+                    for (let keys of Object.keys(response.valueBuffer)) {
+                        response.size += response.valueBuffer[keys].maxByteLength
+                    }
+                } else if (Array.isArray(response.valueBuffer)) {
+                    for (let i = 0; i < response.valueBuffer.length; i++) {
+                        response.size += response.valueBuffer[i].maxByteLength
+                    }
+                } else {
+                    response.size = response.valueBuffer.maxByteLength
                 }
 
                 if (response.ttl > -1) {

diff --git a/src/strings/en/strings.js b/src/strings/en/strings.js
@@ -360,7 +360,7 @@ const strings = {
         ttlTitle: "Time To Live",
         type: "Type",
         ttlNotExpire: "does not expire",
-        lengthString: "characters",
+        lengthString: "bytes",
         lengthItem: "items",
         actions: "Actions",
       },

diff --git a/src/strings/ru/strings.js b/src/strings/ru/strings.js
@@ -364,7 +364,7 @@ const strings = {
         ttlTitle: "Время На Жизнь (TTL)",
         type: "Тип",
         ttlNotExpire: "не истекает",
-        lengthString: "символы",
+        lengthString: "байты",
         lengthItem: "обьекты",
         actions: "Действия",
       },

diff --git a/src/strings/zn/strings.js b/src/strings/zn/strings.js
@@ -344,7 +344,7 @@ const strings = {
         ttlTitle: "生存时间",
         type: "类型",
         ttlNotExpire: "不会过期",
-        lengthString: "字符",
+        lengthString: "位元組",
         lengthItem: "项数",
         actions: "操作",
       },