Merge pull request #4 from code4teaching/cursor/open-strk-files-293e

iOS 1.5.3: .strk-Dateien öffnen

Author: cursor[bot]

CHANGELOG.md

@@ -15,7 +15,7 @@ The format is loosely inspired by Keep a Changelog.
 ### Added
 
 - **File menu:** New, Open, Open Recent, Save, Save As, Print, and Close on the menu bar / keyboard (`Cmd+N/O/S/Shift+S/P/W`), including on Mac (Designed for iPad). Open Recent uses the same list as the toolbar.
-- **Files:** double-click or Open With a `.visustruct` file in Finder / Files opens it in VisuStruct. The simulation layout is unchanged.
+- **Files:** double-click or Open With a `.visustruct` or `.strk` file in Finder / Files opens it in VisuStruct (same XML as the Java Struktogrammeditor). The simulation layout is unchanged.
 
 ### Fixed
 

README.md

@@ -14,7 +14,7 @@ Visual **Nassi–Shneiderman** structograms for **Mac, iPad, and iPhone**. Same
 
 **[visustruct.org](https://visustruct.org)** · **Build & layout:** [VisuStruct-iOS/README.md](VisuStruct-iOS/README.md) · **Changes:** [CHANGELOG.md](CHANGELOG.md)
 
-The **[Java VisuStruct](https://github.com/code4teaching/VisuStruct)** editor is based on [kekru/struktogrammeditor](https://github.com/kekru/struktogrammeditor) (MIT). **Sources and releases for Java** are maintained only in that repository (always current there). This **SwiftUI** app is a **reimplementation**: same **`.visustruct`** / XML as Java, not a port of that codebase.
+The **[Java VisuStruct](https://github.com/code4teaching/VisuStruct)** editor is based on [kekru/struktogrammeditor](https://github.com/kekru/struktogrammeditor) (MIT). **Sources and releases for Java** are maintained only in that repository (always current there). This **SwiftUI** app is a **reimplementation**: same **`.visustruct`** / XML as Java (and it opens legacy **`.strk`** files), not a port of that codebase.
 
 ---
 

VisuStruct-iOS/README.md

@@ -44,7 +44,7 @@ The open-source **[Java / Swing editor](https://github.com/code4teaching/VisuStr
 ## Features (current)
 
 - Tabs, palette, **drag & drop**, text inspector, undo/redo  
-- Open / save **`.visustruct`**, share **PNG**, **print** where supported  
+- Open **`.visustruct`** / **`.strk`**, save **`.visustruct`**, share **PNG**, **print** where supported  
 - Broad **multi-language UI** coverage via **`Localizable.strings`** + **`Settings.bundle`** (English/German maintained as authoring sources; additional locales ship as translations).
 - **Clipboard actions** for diagram blocks (copy/cut/paste) plus keyboard/menu shortcuts where the platform supports first-class editing commands.
 - **Instruction modes** with uniform prefixes across languages:

VisuStruct-iOS/VisuStructCore/Package.swift

@@ -14,6 +14,11 @@ let package = Package(
         .target(
             name: "VisuStructCore",
             path: "Sources/VisuStructCore"
+        ),
+        .testTarget(
+            name: "VisuStructCoreTests",
+            dependencies: ["VisuStructCore"],
+            path: "Tests/VisuStructCoreTests"
         )
     ]
 )

VisuStruct-iOS/VisuStructCore/Tests/VisuStructCoreTests/VisuStructXMLCodecTests.swift

@@ -0,0 +1,20 @@
+import XCTest
+import VisuStructCore
+
+final class VisuStructXMLCodecTests: XCTestCase {
+    func testDecodesLegacyStruktogrammeditorXML() throws {
+        let xml = """
+        <?xml version="1.0" encoding="UTF-8"?>
+        <struktogramm caption="Beispiel">
+          <strelem typ="0" zx="0" zy="0">
+            <text>x = 1</text>
+          </strelem>
+        </struktogramm>
+        """
+        let doc = try VisuStructXMLCodec.decode(data: Data(xml.utf8))
+        XCTAssertEqual(doc.caption, "Beispiel")
+        XCTAssertEqual(doc.elements.count, 1)
+        XCTAssertEqual(doc.elements[0].type, .anweisung)
+        XCTAssertEqual(doc.elements[0].textLines, ["x = 1"])
+    }
+}

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct.xcodeproj/project.pbxproj

@@ -468,7 +468,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEVELOPMENT_ASSET_PATHS = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -503,7 +503,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 14;
+				CURRENT_PROJECT_VERSION = 15;
 				DEVELOPMENT_ASSET_PATHS = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/About/AboutVisuStructView.swift

@@ -92,6 +92,9 @@ struct AboutVisuStructView: View {
                         Text(lang.tr("about_dateiformat_heading"))
                             .font(.headline)
                         aboutDateiformatExplainer
+                        Text(lang.tr("about_dateiformat_strk"))
+                            .font(.subheadline)
+                            .foregroundStyle(.secondary)
                     }
 
                     Divider()

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/ContentView.swift

@@ -128,11 +128,10 @@ struct ContentView: View {
         )
     }
 
-    /// Finder / Dateien: Doppelklick bzw. „Öffnen mit“ auf `.visustruct`.
+    /// Finder / Dateien: Doppelklick bzw. „Öffnen mit“ auf `.visustruct` oder `.strk`.
     private func openIncomingDocument(from url: URL) {
         guard url.isFileURL else { return }
-        let ext = url.pathExtension.lowercased()
-        guard ext == "visustruct" || ext == "xml" else { return }
+        guard VisuStructDiagramFile.isOpenableDiagram(url: url) else { return }
         if isSimulationMode {
             endSimulationMode()
         }

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/Documents/VisuStructFileDocuments.swift

@@ -2,15 +2,42 @@ import SwiftUI
 import UniformTypeIdentifiers
 import VisuStructCore
 
-// MARK: - FileDocument (einheitlich .visustruct / XML wie Java)
+// MARK: - Dateiendungen (.visustruct nativ, .strk älterer Struktogrammeditor)
+
+enum VisuStructDiagramFile {
+    static let nativeFilenameExtension = "visustruct"
+    static let legacyFilenameExtension = "strk"
+
+    static func isOpenableDiagram(url: URL) -> Bool {
+        switch url.pathExtension.lowercased() {
+        case nativeFilenameExtension, legacyFilenameExtension, "xml":
+            return true
+        default:
+            return false
+        }
+    }
+
+    static func stripKnownExtension(from name: String) -> String {
+        let trimmed = name.trimmingCharacters(in: .whitespacesAndNewlines)
+        let lower = trimmed.lowercased()
+        for suffix in [".\(nativeFilenameExtension)", ".\(legacyFilenameExtension)"] {
+            if lower.hasSuffix(suffix) {
+                return String(trimmed.dropLast(suffix.count)).trimmingCharacters(in: .whitespacesAndNewlines)
+            }
+        }
+        return trimmed
+    }
+}
+
+// MARK: - FileDocument (einheitlich .visustruct / XML wie Java; .strk lesbar)
 
 struct VisuStructFileDocument: FileDocument, Sendable {
     /// Export/Speichern: eigene Endung, damit der Dialog nicht zusätzlich `.xml` anhängt.
     static var preferredExportContentType: UTType {
         if let declared = UTType("org.visustruct.diagram") {
             return declared
         }
-        if let v = UTType(filenameExtension: "visustruct") {
+        if let v = UTType(filenameExtension: VisuStructDiagramFile.nativeFilenameExtension) {
             return v
         }
         return .xml
@@ -20,13 +47,25 @@ struct VisuStructFileDocument: FileDocument, Sendable {
         var types: [UTType] = [.xml]
         if let declared = UTType("org.visustruct.diagram") {
             types.insert(declared, at: 0)
-        } else if let v = UTType(filenameExtension: "visustruct") {
+        } else if let v = UTType(filenameExtension: VisuStructDiagramFile.nativeFilenameExtension) {
             types.insert(v, at: 0)
         }
+        if let strk = UTType(filenameExtension: VisuStructDiagramFile.legacyFilenameExtension),
+           !types.contains(strk) {
+            types.insert(strk, at: min(1, types.count))
+        }
         return types
     }
 
-    static var writableContentTypes: [UTType] { readableContentTypes }
+    static var writableContentTypes: [UTType] {
+        var types: [UTType] = [.xml]
+        if let declared = UTType("org.visustruct.diagram") {
+            types.insert(declared, at: 0)
+        } else if let v = UTType(filenameExtension: VisuStructDiagramFile.nativeFilenameExtension) {
+            types.insert(v, at: 0)
+        }
+        return types
+    }
 
     var document: VisuStructDocument
 

VisuStruct-iOS/VisuStructXcodeOpen/VisuStruct/Export/DiagramSnapshotAndExport.swift

@@ -8,12 +8,7 @@ enum DiagramExportFilename {
     /// Gleiche Semantik wie `DiagramSheetTabsModel.stripVisuStructExtension` — hier freistehend,
     /// damit Dateinamen-Helfer nicht `@MainActor`-isolierte Typen aufrufen müssen.
     private static func stripVisuStructExtension(from name: String) -> String {
-        let t = name.trimmingCharacters(in: .whitespacesAndNewlines)
-        let suffix = ".visustruct"
-        if t.lowercased().hasSuffix(suffix) {
-            return String(t.dropLast(suffix.count)).trimmingCharacters(in: .whitespacesAndNewlines)
-        }
-        return t
+        VisuStructDiagramFile.stripKnownExtension(from: name)
     }
 
     /// Vorschlag für „Speichern unter …“ / Teilen — je nach Einstellung nur Titel oder `yyyy-MM-dd-<Titel>`.