Support AtCoderProblems (virtual contests)

Author: ShotaKashihara

Sources/AtCoderCLI/main.swift

@@ -5,7 +5,7 @@ import SwiftShell
 struct Command: ParsableCommand {
     static var configuration = CommandConfiguration(
         abstract: "AtCoder CLI for Swift.",
-        version: "1.0.9",
+        version: "1.0.10",
         subcommands: [
             New.self,
             Submit.self,

Sources/AtCoderLibrary/API/OjApiCommand.swift

@@ -2,15 +2,16 @@ import Foundation
 import SwiftShell
 
 enum OjApiCommand {
-    static func getAllTasks(name: String, ojApiPath: String) throws -> (contest: Contest, problems: [Problem]) {
-        let contest = try OjApiCommand.getContest(name: name, ojApiPath: ojApiPath)
+    static func getAllTasks(url: String, ojApiPath: String) throws -> (contest: Contest, problems: [Problem]) {
+        let contest = try OjApiCommand.getContest(url: url, ojApiPath: ojApiPath)
         var problems = [Problem]()
         let operation = BlockOperation()
         var error: Error?
         contest.problems.forEach { problem in
             operation.addExecutionBlock {
                 do {
-                    let problem = try OjApiCommand.getProblem(name: name, alphabet: problem.context.alphabet, url: problem.url, ojApiPath: ojApiPath)
+                    let problem = try OjApiCommand.getProblem(url: problem.url, ojApiPath: ojApiPath)
+                        .apply(context: problem.context)
                     problems.append(problem)
                 } catch(let e) {
                     error = e
@@ -55,9 +56,9 @@ private extension OjApiCommand {
         }
     }
 
-    static func getContest(name: String, ojApiPath: String) throws -> Contest {
+    static func getContest(url: String, ojApiPath: String) throws -> Contest {
         try precheck(path: ojApiPath)
-        let result = run(ojApiPath, "get-contest", "https://atcoder.jp/contests/\(name)")
+        let result = run(ojApiPath, "get-contest", url)
         guard result.succeeded else {
             throw result.stderror
         }
@@ -66,7 +67,7 @@ private extension OjApiCommand {
         return response.result
     }
 
-    static func getProblem(name: String, alphabet: String, url: URL, ojApiPath: String) throws -> Problem {
+    static func getProblem(url: URL, ojApiPath: String) throws -> Problem {
         try precheck(path: ojApiPath)
         let result = run(ojApiPath, "get-problem", url.absoluteString)
         guard result.succeeded else {

Sources/AtCoderLibrary/API/Response.swift

@@ -42,6 +42,10 @@ struct Problem: Decodable {
         let input: String
         let output: String
     }
+    
+    func apply(context: Context) -> Self {
+        .init(url: url, tests: tests, name: name, context: context, memoryLimit: memoryLimit, timeLimit: timeLimit)
+    }
 }
 
 struct Context: Decodable {

Sources/AtCoderLibrary/Command/New.swift

@@ -8,17 +8,21 @@ public struct New: ParsableCommand {
         abstract: "Create a new contest project."
     )
 
-    @Argument(help: "Name of the contest to create.\nex. \"abc111\"")
+    @Argument(help: "Name of the contest to create.\nex. 'abc123'")
     var contestName: String
 
+    @Option(name: .shortAndLong, help: "Contest URL. \nIf no value is given, then 'https://atcoder.jp/contests/:contest_name' is used.")
+    var contestUrl: String?
+
     @Flag(name: .shortAndLong, help: "Open Package.swift after creation.")
     var open: Bool = false
 
     @Option(help: "Specify the path to oj-api.")
     var ojApiPath: String = "oj-api"
 
     public mutating func run() throws {
-        let (contest, problems) = try OjApiCommand.getAllTasks(name: contestName, ojApiPath: ojApiPath)
+        let contestUrl = self.contestUrl ?? "https://atcoder.jp/contests/\(contestName)"
+        let (contest, problems) = try OjApiCommand.getAllTasks(url: contestUrl, ojApiPath: ojApiPath)
         try FileManager.default.createDirectory(atPath: contestName, withIntermediateDirectories: true)
         FileManager.default.changeCurrentDirectoryPath(contestName)
 

Sources/AtCoderLibrary/Command/New/Generator/Test.swift

@@ -1,8 +1,14 @@
 struct Test: Generator {
     let problem: Problem
-    var className: String { "\(problem.context.alphabet)Tests" }
-    var fileName: String { "\(className).swift" }
-    var directory: String? { "Tests/\(className)" }
+    var className: String {
+        if Int(problem.context.alphabet) != nil {
+            // [!] Class name can not start with a number.
+            return "_\(problem.context.alphabet)Tests"
+        }
+        return "\(problem.context.alphabet)Tests"
+    }
+    var fileName: String { "\(problem.context.alphabet)Tests.swift" }
+    var directory: String? { "Tests/\(problem.context.alphabet)Tests" }
     var source: String {
         """
         import XCTest