project: wire open-as-project flows

yhs0602 · yhs0602 · commit 22fb671fd266 · 2026-03-20T09:48:55.000+09:00
diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt b/app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt
@@ -19,6 +19,7 @@ import org.json.JSONException
 import splitties.init.appCtx
 import java.io.File
 import java.io.IOException
+import java.util.zip.ZipFile
 
 /**
  * the list of paths of project_info.json is saved to a SharedPreference.
@@ -284,6 +285,44 @@ object ProjectManager {
     }
 }
 
+sealed class ProjectOpenAction {
+    data object PromptCopy : ProjectOpenAction()
+    data class OpenExistingProject(val projectInfoFile: File) : ProjectOpenAction()
+    data class ImportProjectArchive(val archiveFile: File) : ProjectOpenAction()
+}
+
+internal fun determineProjectOpenAction(targetFile: File, openAsProject: Boolean): ProjectOpenAction {
+    if (!openAsProject) {
+        return ProjectOpenAction.PromptCopy
+    }
+    projectInfoFileForDirectory(targetFile)?.let {
+        return ProjectOpenAction.OpenExistingProject(it)
+    }
+    if (isProjectArchiveFile(targetFile)) {
+        return ProjectOpenAction.ImportProjectArchive(targetFile)
+    }
+    return ProjectOpenAction.PromptCopy
+}
+
+internal fun projectInfoFileForDirectory(targetFile: File): File? {
+    if (!targetFile.isDirectory) {
+        return null
+    }
+    val projectInfoFile = targetFile.resolve("project_info.json")
+    return projectInfoFile.takeIf { it.isFile }
+}
+
+fun isProjectArchiveFile(targetFile: File): Boolean {
+    if (!targetFile.isFile || !targetFile.extension.equals("zip", ignoreCase = true)) {
+        return false
+    }
+    return runCatching {
+        ZipFile(targetFile).use { zipFile ->
+            zipFile.getEntry("project_info.json") != null
+        }
+    }.getOrDefault(false)
+}
+
 internal fun importedProjectInfoFile(projectDir: File): File {
     return projectDir.resolve("project_info.json")
 }
diff --git a/app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt b/app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt
@@ -20,10 +20,12 @@ import com.kyhsgeekcode.disassembler.exporting.buildProjectExportFileName
 import com.kyhsgeekcode.disassembler.exporting.copyFileToDocument
 import com.kyhsgeekcode.disassembler.project.ProjectDataStorage
 import com.kyhsgeekcode.disassembler.project.ProjectManager
+import com.kyhsgeekcode.disassembler.project.ProjectOpenAction
 import com.kyhsgeekcode.disassembler.project.models.ProjectModel
 import com.kyhsgeekcode.disassembler.project.models.ProjectSourceDescriptor
 import com.kyhsgeekcode.disassembler.project.models.ProjectSourceKind
 import com.kyhsgeekcode.disassembler.project.models.ProjectType
+import com.kyhsgeekcode.disassembler.project.determineProjectOpenAction
 import com.kyhsgeekcode.disassembler.ui.FileDrawerTreeItem
 import com.kyhsgeekcode.disassembler.ui.TabData
 import com.kyhsgeekcode.disassembler.ui.TabKind
@@ -150,10 +152,55 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     private fun onSelectFilePayload(payload: SelectedFileIntentPayload) {
-        _file.value = File(payload.filePath)
-        _nativeFile.value = payload.nativeFilePath?.let(::File)
-        _projectType.value = payload.projectType
-        _askCopy.value = true
+        val selectedFile = File(payload.filePath)
+        when (val action = determineProjectOpenAction(selectedFile, _openAsProject.value)) {
+            ProjectOpenAction.PromptCopy -> {
+                _file.value = selectedFile
+                _nativeFile.value = payload.nativeFilePath?.let(::File)
+                _projectType.value = payload.projectType
+                _askCopy.value = true
+            }
+
+            is ProjectOpenAction.OpenExistingProject -> {
+                openExistingProject(action.projectInfoFile)
+            }
+
+            is ProjectOpenAction.ImportProjectArchive -> {
+                importProjectArchive(action.archiveFile)
+            }
+        }
+    }
+
+    private fun openExistingProject(projectInfoFile: File) {
+        viewModelScope.launch {
+            eventChannel.send(Event.StartProgress())
+            try {
+                val project = withContext(Dispatchers.IO) {
+                    ProjectManager.openProject(projectInfoFile.absolutePath)
+                }
+                _selectedFilePath.value = project.sourceFilePath
+                _currentProject.value = project
+            } catch (e: Exception) {
+                eventChannel.send(Event.AlertError("Failed to open project"))
+            }
+            eventChannel.send(Event.FinishProgress())
+        }
+    }
+
+    private fun importProjectArchive(archiveFile: File) {
+        viewModelScope.launch {
+            eventChannel.send(Event.StartProgress())
+            try {
+                val project = withContext(Dispatchers.IO) {
+                    ProjectManager.import(archiveFile)
+                }
+                _selectedFilePath.value = project.sourceFilePath
+                _currentProject.value = project
+            } catch (e: Exception) {
+                eventChannel.send(Event.AlertError("Failed to import project"))
+            }
+            eventChannel.send(Event.FinishProgress())
+        }
     }
 
     private fun onSelectUri(uri: Uri, displayName: String? = null) {
diff --git a/app/src/main/java/com/kyhsgeekcode/filechooser/model/FileItem.kt b/app/src/main/java/com/kyhsgeekcode/filechooser/model/FileItem.kt
@@ -11,6 +11,7 @@ import com.kyhsgeekcode.disassembler.R
 import com.kyhsgeekcode.disassembler.importing.AdvancedImportOptions
 import com.kyhsgeekcode.disassembler.importing.AdvancedImportSource
 import com.kyhsgeekcode.disassembler.importing.DefaultAdvancedImportSourceCatalog
+import com.kyhsgeekcode.disassembler.project.isProjectArchiveFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import splitties.init.appCtx
@@ -74,7 +75,7 @@ open class FileItem : Serializable {
 
     open fun isAccessible(): Boolean = file?.isAccessible() ?: true
 
-    open fun isProjectAble(): Boolean = file?.isDirectory == true
+    open fun isProjectAble(): Boolean = file?.isDirectory == true || file?.let(::isProjectArchiveFile) == true
 
     open suspend fun listSubItems(publisher: (current: Int, total: Int) -> Unit = { _, _ -> }): List<FileItem> {
         if (!canExpand())
diff --git a/app/src/test/java/com/kyhsgeekcode/disassembler/viewmodel/ProjectOpenActionTest.kt b/app/src/test/java/com/kyhsgeekcode/disassembler/viewmodel/ProjectOpenActionTest.kt
@@ -0,0 +1,84 @@
+package com.kyhsgeekcode.disassembler.viewmodel
+
+import com.kyhsgeekcode.disassembler.project.ProjectOpenAction
+import com.kyhsgeekcode.disassembler.project.determineProjectOpenAction
+import java.io.File
+import java.nio.file.Path
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
+import kotlin.io.path.createTempDirectory
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+
+class ProjectOpenActionTest {
+    @Test
+    fun `determineProjectOpenAction prompts copy when openAsProject is false`() {
+        val file = createTempDirectory("project-open").toFile().resolve("sample.apk").apply {
+            writeText("apk")
+        }
+
+        val action = determineProjectOpenAction(file, openAsProject = false)
+
+        assertIs<ProjectOpenAction.PromptCopy>(action)
+    }
+
+    @Test
+    fun `determineProjectOpenAction opens existing project directory`() {
+        val projectDir = createTempDirectory("project-open").toFile().apply {
+            resolve("project_info.json").writeText("{}")
+        }
+
+        val action = determineProjectOpenAction(projectDir, openAsProject = true)
+
+        val openExisting = assertIs<ProjectOpenAction.OpenExistingProject>(action)
+        assertEquals(projectDir.resolve("project_info.json"), openExisting.projectInfoFile)
+    }
+
+    @Test
+    fun `determineProjectOpenAction imports project archive`() {
+        val archive = createProjectArchive(createTempDirectory("project-open"))
+
+        val action = determineProjectOpenAction(archive, openAsProject = true)
+
+        val importArchive = assertIs<ProjectOpenAction.ImportProjectArchive>(action)
+        assertEquals(archive, importArchive.archiveFile)
+    }
+
+    @Test
+    fun `determineProjectOpenAction falls back to copy prompt for non project directory`() {
+        val folder = createTempDirectory("project-open").toFile()
+
+        val action = determineProjectOpenAction(folder, openAsProject = true)
+
+        assertIs<ProjectOpenAction.PromptCopy>(action)
+    }
+
+    @Test
+    fun `determineProjectOpenAction falls back to copy prompt for non project archive`() {
+        val archive = createTempDirectory("project-open").toFile().resolve("plain.zip").apply {
+            ZipOutputStream(outputStream()).use { zip ->
+                zip.putNextEntry(ZipEntry("classes.dex"))
+                zip.write("dex".encodeToByteArray())
+                zip.closeEntry()
+            }
+        }
+
+        val action = determineProjectOpenAction(archive, openAsProject = true)
+
+        assertIs<ProjectOpenAction.PromptCopy>(action)
+    }
+
+    private fun createProjectArchive(tempDir: Path): File {
+        return tempDir.toFile().resolve("project.zip").apply {
+            ZipOutputStream(outputStream()).use { zip ->
+                zip.putNextEntry(ZipEntry("project_info.json"))
+                zip.write("{}".encodeToByteArray())
+                zip.closeEntry()
+                zip.putNextEntry(ZipEntry("sourceFilePath"))
+                zip.write("sample".encodeToByteArray())
+                zip.closeEntry()
+            }
+        }
+    }
+}
diff --git a/docs/maintenance/implementation-log.ko.md b/docs/maintenance/implementation-log.ko.md
@@ -40,6 +40,7 @@
 | 이슈 `#523` 대용량 Text 탭 렌더링 완화 | Text 탭이 매우 큰 파일을 열 때 전체 바이트를 그대로 highlight하지 않고, 상한이 있는 preview만 decode/highlight하며 원본 크기 안내 문구를 보여주도록 바꿨다 | 큰 텍스트/스몰리/XML 파일을 Text 화면에 띄우는 순간 AnnotatedString과 syntax highlighter가 과도한 메모리를 잡는 경로를 줄였다 | `app/src/main/java/com/kyhsgeekcode/disassembler/ui/tabs/TextTab.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ui/tabs/TextPreviewTest.kt` | 완료 |
 | 이슈 `#95` content URI import 파일 충돌 완화 | content URI를 app-private `imports/` 아래로 복사할 때 같은 display name이 이미 있으면 `_1`, `_2` suffix를 붙인 새 파일로 저장하도록 바꿨다 | 같은 이름의 문서를 여러 번 가져오거나 provider가 동일한 표시 이름을 줄 때 기존 import를 조용히 덮어쓰는 문제를 막아 SAF 기반 import 경계를 더 안전하게 만들었다 | `app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/viewmodel/ImportedFileNameTest.kt` | 완료 |
 | 이슈 `#95` imported project reopen 경계 정리 | exported project ZIP을 import한 뒤 `sourceFilePath`, `generatedFolder`, `project_info.json` 경로를 새 프로젝트 디렉터리 기준으로 재작성하고, temp extract 경로 매핑을 제거하도록 바꿨다 | SAF나 로컬 파일에서 가져온 project archive를 다시 열었을 때 삭제된 temp extract 경로나 예전 경로를 계속 참조하는 문제를 막아 reopen/open 경계를 실제 프로젝트 위치로 닫았다 | `app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ProjectManagerTest.kt` | 완료 |
+| 이슈 `#95` project archive / 기존 project reopen 연결 | chooser의 `Open as project` 흐름이 기존 project 디렉터리와 exported project ZIP을 실제로 열도록 연결하고, project zip은 `project_info.json` 존재 여부로 판별하게 바꿨다 | 이전에는 `openProject` 플래그가 state에만 저장되고 실질 동작이 없어서 reopen 경계가 끊겨 있었는데, 이제 기존 project 디렉터리는 바로 열고 exported project ZIP은 바로 import할 수 있다 | `app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt`, `app/src/main/java/com/kyhsgeekcode/filechooser/model/FileItem.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/viewmodel/ProjectOpenActionTest.kt` | 완료 |
 | 이슈 `#129` `.ar` archive 지원 | 공용 archive extractor를 추가하고, Compose/legacy drawer의 archive 확장 경로를 ZIP 전용 구현에서 generic archive extractor로 교체했다 | archive 판정은 되는데 실제 확장은 ZIP만 되던 불일치를 제거해서 `.ar` 같은 지원 가능한 archive도 실제로 탐색 가능하게 만들었다 | `app/src/main/java/com/kyhsgeekcode/Util.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/ui/FileDrawerTree.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/FileDrawerListItem.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/FileDrawerListAdapter.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ArchiveExtractionTest.kt` | 완료 |
 | 프로젝트 경로/파일명 회귀 방지 | 프로젝트 상대경로 계산과 import 파일명 정규화를 pure helper로 분리 | 단위 테스트가 가능하도록 로직을 분리하고 경계 케이스를 줄였다 | `app/src/main/java/com/kyhsgeekcode/disassembler/project/ProjectManager.kt`, `app/src/main/java/com/kyhsgeekcode/disassembler/viewmodel/MainViewModel.kt` | 완료 |
 | 회귀 테스트 부재 | `ProjectManager`, 저장소 권한, Hex 레이아웃, import 파일명 테스트 추가 | 최소한의 유지보수 안전망을 확보했다 | `app/src/test/java/com/kyhsgeekcode/disassembler/ProjectManagerTest.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/PermissionUtilsTest.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/ui/components/HexViewLayoutTest.kt`, `app/src/test/java/com/kyhsgeekcode/disassembler/viewmodel/ImportedFileNameTest.kt` | 완료 |
@@ -69,6 +70,7 @@
 | text preview 테스트 | 통과 | Text 탭이 큰 파일 바이트 배열을 preview 상한으로 잘라 highlight하는 규칙을 고정 |
 | import destination 파일명 테스트 | 통과 | 같은 display name으로 여러 번 import해도 app-private 파일이 덮어써지지 않는 규칙을 고정 |
 | imported project relocation 테스트 | 통과 | project archive import 후 `sourceFilePath`, `generatedFolder`, `project_info.json` 경로를 새 프로젝트 위치로 다시 맞추는 규칙을 고정 |
+| project open action 테스트 | 통과 | `Open as project`가 기존 project 디렉터리와 exported project ZIP에 대해 올바른 reopen/import 동작을 고르는 규칙을 고정 |
 | architecture mapping 테스트 | 통과 | `x86_64`, `PPC64`가 64-bit mode로 매핑되는 규칙을 고정 |
 | binary manual setup reload 테스트 | 통과 | override autosetup 변경 시 disassembly 재로드 필요 여부를 고정 |
 | project export archive 테스트 | 통과 | ZIP 엔트리가 절대경로를 포함하지 않고 `sourceFilePath`, `baseFolder/...`로 묶이는지 확인 |
