test

Author: AKuHAK

.github/workflows/check_ext2.yml

@@ -1,4 +1,5 @@
 name: Continuous Integration
+
 on:
   push:
     paths:
@@ -18,14 +19,12 @@ on:
       - "**.build"
       - "**.in"
       - "**.yml"
+
 env:
   CMAKE_GENERATOR: Ninja
-  HOMEBREW_NO_ANALYTICS: "1"
-  HOMEBREW_NO_AUTO_UPDATE: "1"
-  HOMEBREW_NO_INSTALL_UPGRADE: "1"
-  HOMEBREW_NO_INSTALL_CLEANUP: "1"
   DEBIAN_FRONTEND: noninteractive
   TZ: Japan
+
 jobs:
   build-ubuntu:
     runs-on: ubuntu-latest
@@ -34,7 +33,7 @@ jobs:
       image: ubuntu:20.04
       options: --user 0
     steps:
-      - name: Install build dependancies
+      - name: Install build dependencies
         run: |
           apt-get -y update
           apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' install build-essential expect pkg-config fuse libfuse-dev git time p7zip-full e2fsprogs python3
@@ -63,59 +62,103 @@ jobs:
       - name: Run Test
         run: |
           cd test
-          # Запускаем Tcl скрипт (который теперь создает EXT2 раздел)
           time ./pfsshell_test.tcl
 
       - name: Verify EXT2 partition validity
         run: |
-          # Этот скрипт ищет раздел EXT2 в образе и проверяет его целостность
           cd test
           python3 -c "
-          import sys, struct
+          import sys, os
+
+          # Константы EXT2
+          MAGIC = b'\x53\xEF'  # 0xEF53 (Little Endian)
+          SB_OFFSET = 1024     # Суперблок начинается с 1024 байта раздела
+          MAGIC_OFFSET = 56    # Сигнатура находится на 56-м байте суперблока
+          # Итого смещение сигнатуры от начала раздела = 1080 байт
 
-          MAGIC = b'\x53\xEF' # 0xEF53 little endian
-          SB_OFFSET = 1024
-          MAGIC_OFFSET = 56
           IMG_FILE = 'test.img'
           OUT_FILE = 'ext2_dump.img'
+          PARTITION_SIZE = 128 * 1024 * 1024 # 128 MB (как в тесте)
+          CHUNK_SIZE = 10 * 1024 * 1024      # Читаем по 10 МБ
 
           print(f'Scanning {IMG_FILE} for EXT2 magic signature...')
 
+          found = False
+          if not os.path.exists(IMG_FILE):
+              print(f'Error: {IMG_FILE} not found!')
+              sys.exit(1)
+
           with open(IMG_FILE, 'rb') as f:
-              # APA разделы обычно выровнены. Сканируем с шагом 1MB для скорости.
+              offset = 0
               while True:
-                  pos = f.tell()
-                  # Проверяем сигнатуру
-                  f.seek(pos + SB_OFFSET + MAGIC_OFFSET)
-                  magic = f.read(2)
+                  # Читаем чанк + небольшой перехлест, чтобы не разрезать сигнатуру
+                  f.seek(offset)
+                  data = f.read(CHUNK_SIZE)
+                  if not data:
+                      break
+
+                  # Ищем сигнатуру внутри чанка
+                  rel_pos = -1
+                  while True:
+                      try:
+                          rel_pos = data.index(MAGIC, rel_pos + 1)
+                      except ValueError:
+                          break
+
+                      # Нашли сигнатуру по абсолютному смещению abs_magic_pos
+                      abs_magic_pos = offset + rel_pos
+
+                      # Предполагаемое начало раздела
+                      part_start = abs_magic_pos - (SB_OFFSET + MAGIC_OFFSET)
+
+                      if part_start < 0:
+                          continue
+
+                      # Проверка выравнивания (опционально, но полезно)
+                      # Обычно разделы выровнены по секторам (512 байт)
+                      if part_start % 512 == 0:
+                          print(f'FOUND EXT2 signature at offset {abs_magic_pos}')
+                          print(f'-> Suspected partition start at {part_start}')
+
+                          # Извлекаем раздел
+                          f.seek(part_start)
+                          part_data = f.read(PARTITION_SIZE)
+
+                          # Дополнительная проверка: первые байты не должны быть пустыми (там APA заголовок или уже EXT2 SB)
+                          # Но EXT2 SB начинается с 1024. Первые 1024 байта могут быть Boot Code или APA.
+                          # Просто сохраняем.
 
-                  if magic == MAGIC:
-                      print(f'FOUND EXT2 signature at partition offset {pos}')
-                      # Извлекаем 128MB (размер, который мы задали в тесте)
-                      f.seek(pos)
-                      data = f.read(128 * 1024 * 1024)
-                      with open(OUT_FILE, 'wb') as out:
-                          out.write(data)
-                      print(f'Dumped partition to {OUT_FILE}')
-                      sys.exit(0)
+                          with open(OUT_FILE, 'wb') as out:
+                              out.write(part_data)
 
-                  # Переходим к следующему блоку (ищем дальше)
-                  f.seek(pos + 1024*1024)
-                  # Проверка конца файла
-                  if not f.read(1):
+                          print(f'Dumped {len(part_data)} bytes to {OUT_FILE}')
+                          found = True
+                          break
+
+                  if found:
                       break
 
-          print('EXT2 partition NOT found!')
-          sys.exit(1)
+                  offset += CHUNK_SIZE
+                  # Небольшой откат назад, чтобы не пропустить сигнатуру на границе чанков
+                  # (не обязательно, если ищем побайтово, но для надежности)
+                  if offset > 1024:
+                      offset -= 1024
+
+          if not found:
+              print('EXT2 partition NOT found!')
+              sys.exit(1)
           "
 
           echo "Running e2fsck on extracted partition..."
-          # Запускаем проверку файловой системы (-f force, -n no changes/readonly)
+          # Запускаем проверку файловой системы
+          # -f: force checking even if clean
+          # -n: open in read-only mode
           /sbin/e2fsck -f -n ext2_dump.img
+
           if [ $? -eq 0 ]; then
-            echo "EXT2 Filesystem is VALID."
+            echo "SUCCESS: EXT2 Filesystem is VALID."
           else
-            echo "EXT2 Filesystem is CORRUPT."
+            echo "FAILURE: EXT2 Filesystem is CORRUPT."
             exit 1
           fi
 
@@ -125,171 +168,3 @@ jobs:
           path: |
             build/pfsshell
             build/pfs2tar
-
-      - name: Build pfsfuse
-        run: |
-          rm -rf build/
-          meson setup build/ -Denable_pfsfuse=true
-          meson compile -C build
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: pfsfuse-ubuntu
-          path: build/pfsfuse
-
-  # ... (Остальные jobs: build-win32, build-macos и т.д. остаются без изменений) ...
-  build-win32:
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    container:
-      image: ubuntu:20.04
-      options: --user 0
-    steps:
-      - run: |
-          apt-get -y update
-          apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' install build-essential mingw-w64 git p7zip-full
-          update-alternatives --set i686-w64-mingw32-gcc /usr/bin/i686-w64-mingw32-gcc-posix
-          update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
-      - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-      - uses: actions/setup-python@v3
-        with:
-          python-version: 3.13.3
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip
-          restore-keys: ${{ runner.os }}-pip
-      - run: python -m pip install --upgrade meson ninja
-      - run: |
-          meson setup build/ -Denable_pfs2tar=true --cross-file ./external/meson_toolchains/mingw32_meson.ini
-          meson compile -C build archive
-      - uses: actions/upload-artifact@v4
-        with:
-          name: pfsshell-win32
-          path: build/*.7z
-
-  build-pfsfuse-win32:
-    runs-on: windows-latest
-    timeout-minutes: 20
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - name: Install MSYS2 packages
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW32
-          install: base-devel git make texinfo patch binutils mpc-devel p7zip mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-make mingw-w64-i686-meson
-          update: true
-          shell: msys2 {0}
-      - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-      - name: Enable git symlinks
-        run: |
-          git config core.symlinks true
-          git reset --hard
-      - name: Build pfsfuse
-        run: |
-          meson setup build/ -Denable_pfsfuse=true
-          meson compile -C build
-          cp -f external/dokany/license.lgpl.txt build/
-      - uses: actions/upload-artifact@v4
-        with:
-          name: pfsfuse-win32
-          path: |
-            build/pfsfuse.exe
-            build/libdokanfuse*.dll
-            build/license.lgpl.txt
-
-  build-macos:
-    runs-on: macos-latest
-    timeout-minutes: 20
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-      - uses: actions/setup-python@v3
-        with:
-          python-version: 3.x
-      - uses: actions/cache@v3
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip
-          restore-keys: ${{ runner.os }}-pip
-      - run: python -m pip install --upgrade meson ninja
-      - run: brew install macfuse coreutils
-      - run: |
-          meson setup build/ -Denable_pfs2tar=true
-          meson compile -C build
-      - name: Run Test
-        run: |
-          cd test
-          time ./pfsshell_test.tcl
-      - uses: actions/upload-artifact@v4
-        with:
-          name: pfsshell-macos
-          path: |
-            build/pfsshell
-            build/pfs2tar
-      - run: |
-          rm -rf build/
-          meson setup build/ -Denable_pfsfuse=true
-          meson compile -C build
-      - uses: actions/upload-artifact@v4
-        with:
-          name: pfsfuse-macos
-          path: build/pfsfuse
-
-  create-release:
-    needs: [build-ubuntu, build-win32, build-macos, build-pfsfuse-win32]
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    container:
-      image: ubuntu:20.04
-      options: --user 0
-    if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'
-    steps:
-      - name: Download all artifact
-        uses: actions/download-artifact@v4
-      - name: Install build dependancies
-        run: |
-          apt-get -y update
-          apt-get -y -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' install p7zip-full
-      - name: Prepare artifacts for release
-        run: |
-          7z a -tzip pfsshell-ubuntu.zip pfsshell-ubuntu/*
-          7z a -tzip pfsshell-macos.zip pfsshell-macos/*
-          7z a -tzip pfsfuse-ubuntu.zip pfsfuse-ubuntu/*
-          7z a -tzip pfsfuse-macos.zip pfsfuse-macos/*
-          7z a -tzip pfsfuse-win32.zip pfsfuse-win32/*
-      - name: Create prerelease
-        if: github.ref == 'refs/heads/master'
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          prerelease: true
-          automatic_release_tag: latest
-          title: Latest development builds
-          files: |
-            pfsshell-win32/*
-            pfsfuse-win32.zip
-            pfsshell-ubuntu.zip
-            pfsshell-macos.zip
-            pfsfuse-ubuntu.zip
-            pfsfuse-macos.zip
-      - name: Create release
-        if: startsWith(github.ref, 'refs/tags/v')
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          prerelease: ${{ contains(github.ref, '-rc') }}
-          files: |
-            pfsshell-win32/*
-            pfsfuse-win32.zip
-            pfsshell-ubuntu.zip
-            pfsshell-macos.zip
-            pfsfuse-ubuntu.zip
-            pfsfuse-macos.zip

test/pfsshell_test.tcl

@@ -111,6 +111,7 @@ run_cmd "get" "get pfsshell.md" "-exact" "__net:/# "
 run_cmd "rm" "rm pfsshell.md" "-exact" "__net:/# "
 run_cmd "rmdir" "rmdir directory" "-exact" "__net:/# "
 run_cmd "umount" "umount" "-exact" "# "
+run_cmd "mkpart" "mkpart __linux.1 128M EXT2" "-exact" "# "
 run_cmd "rmpart" "rmpart __net" "-exact" "# "
 run_cmd "rmpart" "ls" "-exact" "
 __mbr\r