WIP fixes (2)

nzeemin · May 10, 2024 · a56122b · a56122b
1 parent d1ef0c0
commit a56122b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/push-matrix.yml b/.github/workflows/push-matrix.yml
@@ -54,9 +54,9 @@ jobs:
         ./bkdecmd lm ./images/CSIDOS.IMG
         ./bkdecmd lm ./images/MKDOS315.IMG
         ./bkdecmd lm ./images/NORD_1.bkd
-        ./bkdecmd lm -saha1 ./images/ANDOS330.IMG
-        ./bkdecmd lm -saha1 ./images/AODOS.IMG
-        ./bkdecmd lm -saha1 ./images/BK_SYS.DSK
-        ./bkdecmd lm -saha1 ./images/CSIDOS.IMG
-        ./bkdecmd lm -saha1 ./images/MKDOS315.IMG
-        ./bkdecmd lm -saha1 ./images/NORD_1.bkd
+        ./bkdecmd lm -sha1 ./images/ANDOS330.IMG
+        ./bkdecmd lm -sha1 ./images/AODOS.IMG
+        ./bkdecmd lm -sha1 ./images/BK_SYS.DSK
+        ./bkdecmd lm -sha1 ./images/CSIDOS.IMG
+        ./bkdecmd lm -sha1 ./images/MKDOS315.IMG
+        ./bkdecmd lm -sha1 ./images/NORD_1.bkd
diff --git a/BKImage.cpp b/BKImage.cpp
@@ -259,6 +259,10 @@ void CBKImage::PrintCatalogTableTail()
         if (m_bCalcSHA1)
             std::wcout << S_CATALOG_SEPARATOR_SHA1;
     }
+    else if (m_nListingFormat == LISTING_FORMAT::RAR_LIKE)
+    {
+        std::wcout << (m_bCalcSHA1 ? S_CATALOG_SEPARATOR_RAR_LIKE_SHA1 : S_CATALOG_SEPARATOR_RAR_LIKE);
+    }
 
     std::wcout << std::endl;
 }
@@ -513,13 +517,16 @@ bool CBKImage::PrintCurrentDirectory(const int level, const bool recursive, std:
         //TODO: Если логический диск и рекурсивный обход, то идём вниз
     }
 
-    if (level == 0 && m_nListingFormat == LISTING_FORMAT::DEFAULT)
+    if (level == 0)
     {
         PrintCatalogTableTail();
 
-        // Печатаем суммарную информацию под каталогом
-        std::wcout << std::endl;
-        PrintImageInfo();
+        if (m_nListingFormat == LISTING_FORMAT::DEFAULT)
+        {
+            // Печатаем суммарную информацию под каталогом
+            std::wcout << std::endl;
+            PrintImageInfo();
+        }
     }
 
     return true;