rbx.cp 0.5.68__py3-none-any.whl → 0.5.70__py3-none-any.whl

rbx/box/packaging/main.py

@@ -78,6 +78,11 @@ async def polygon(
         '-u',
         help='If set, will upload the package to Polygon.',
     ),
+    preserve_language: bool = typer.Option(
+        False,
+        '--preserve-language',
+        help='If set, will preserve the original language of the statement.',
+    ),
 ):
     from rbx.box.packaging.polygon.packager import PolygonPackager
 
@@ -86,7 +91,10 @@ async def polygon(
     if upload:
         from rbx.box.packaging.polygon.upload import upload_problem
 
-        await upload_problem(name=get_problem_name_with_contest_info())
+        await upload_problem(
+            name=get_problem_name_with_contest_info(),
+            preserve_language=preserve_language,
+        )
 
 
 @app.command('boca', help='Build a package for BOCA.')

rbx/box/packaging/polygon/upload.py

@@ -286,7 +286,7 @@ def _upload_statement_resources(problem: api.Problem, statement: Statement):
         )
 
 
-def _upload_statement(problem: api.Problem):
+def _upload_statement(problem: api.Problem, preserve_language: bool = False):
     pkg = package.find_problem_package_or_die()
 
     languages = set()
@@ -300,9 +300,15 @@ def _upload_statement(problem: api.Problem):
             continue
         if statement.type != StatementType.rbxTeX:
             continue
+        statement_lang = code_to_langs([language])[0]
         console.console.print(
-            f'Uploading statement for language [item]{language}[/item] (polygon language: [item]{code_to_langs([language])[0]}[/item])...'
+            f'Uploading statement for language [item]{language}[/item] (polygon language: [item]{statement_lang}[/item])...'
         )
+        if not preserve_language and statement_lang != 'english':
+            console.console.print(
+                '[warning]By default, Polygon statements are uploaded in English.\n'
+                'If you want to preserve the original language of your statement, use [item]--preserve-language[/item].'
+            )
         blocks = _get_statement_blocks(statement)
         polygon_statement = api.Statement(
             encoding='utf-8',
@@ -316,7 +322,8 @@ def _upload_statement(problem: api.Problem):
             notes=_get_notes_with_explanations(blocks) or '',
         )
         problem.save_statement(
-            lang=code_to_langs([language])[0], problem_statement=polygon_statement
+            lang=statement_lang if preserve_language else 'english',
+            problem_statement=polygon_statement,
         )
 
         _upload_statement_resources(problem, statement)
@@ -326,7 +333,7 @@ def _normalize_problem_name(name: str) -> str:
     return name.replace(' ', '-').replace('_', '-').lower()
 
 
-async def upload_problem(name: str):
+async def upload_problem(name: str, preserve_language: bool = False):
     pkg = package.find_problem_package_or_die()
     name = _normalize_problem_name(name)
     problem = _find_or_create_problem(name)
@@ -345,7 +352,7 @@ async def upload_problem(name: str):
 
     _upload_solutions(problem)
     _upload_testcases(problem)
-    _upload_statement(problem)
+    _upload_statement(problem, preserve_language=preserve_language)
 
     # Commit.
     console.console.print('Committing changes...')

rbx/resources/packagers/boca/compile/java

@@ -115,6 +115,12 @@ if [ -n "$(sed -n -E "/$regex/p" src/$name)" ]; then
   sed -i -E "s/$regex/public class Main\1/" src/Main.java
 fi
 
+echo "Klass is $klass"
+
+cat <<EOF >src/Manifest.txt
+Main-Class: $klass
+EOF
+
 cat <<EOF >compileit.sh
 #!/bin/bash
 javac=$(which javac)
@@ -140,7 +146,7 @@ find . -name "*.java" | while read lin; do
   echo \$? > ../compileit.retcode
 done
 rm -f ../$jarfile
-\$jar cvfe ../$jarfile \$klass *
+\$jar cfm ../$jarfile Manifest.txt *
 exit 0
 EOF
 chmod 755 compileit.sh
@@ -182,6 +188,7 @@ fi
 if [ -f "stderr0" ]; then
   cat "stderr0"
 fi
+
 rm -rf src/
 if [ "$ret" != "0" ]; then
   echo "Compilation Error: $ret"

rbx/resources/packagers/boca/compile/py2

@@ -115,13 +115,13 @@ if [ ! -x "\$cc" ]; then
     exit 47
 fi
 cd src
-"\$cc" -m py_compile "$name"
-pyc_ret=\$?
-if [ "\$pyc_ret" != "0" ]; then
-    echo "python syntax check failed: \$pyc_ret"
-    echo \$pyc_ret > ../compileit.retcode
-    exit 0
-fi
+# "\$cc" -m py_compile "$name"
+# pyc_ret=\$?
+# if [ "\$pyc_ret" != "0" ]; then
+#     echo "python syntax check failed: \$pyc_ret"
+#     echo \$pyc_ret > ../compileit.retcode
+#     exit 0
+# fi
 
 echo "#!/usr/bin/python2" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"

rbx/resources/packagers/boca/compile/py3

@@ -115,13 +115,13 @@ if [ ! -x "\$cc" ]; then
     exit 47
 fi
 cd src
-"\$cc" -m py_compile "$name"
-pyc_ret=\$?
-if [ "\$pyc_ret" != "0" ]; then
-    echo "python syntax check failed: \$pyc_ret"
-    echo \$pyc_ret > ../compileit.retcode
-    exit 0
-fi
+# "\$cc" -m py_compile "$name"
+# pyc_ret=\$?
+# if [ "\$pyc_ret" != "0" ]; then
+#     echo "python syntax check failed: \$pyc_ret"
+#     echo \$pyc_ret > ../compileit.retcode
+#     exit 0
+# fi
 
 echo "#!/usr/bin/python3" | cat - "$name" > "../$exe"
 chmod 755 "../$exe"

{rbx_cp-0.5.68.dist-info → rbx_cp-0.5.70.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.5.68
+Version: 0.5.70
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.68.dist-info → rbx_cp-0.5.70.dist-info}/RECORD

@@ -36,13 +36,13 @@ rbx/box/packaging/boca/extension.py,sha256=EQALNEOv4zVDXSKs_dk11n92y7cBZVn8TogIK
 rbx/box/packaging/boca/packager.py,sha256=kiCcP9roRCiDU0Xr5PDKO83W1yN6cyg-EKMF9fxE0EY,11950
 rbx/box/packaging/boca/upload.py,sha256=_YSPlaz-E57dtt4mOFcTQB9UfyGWeXAW-mXg3YoDQn0,10795
 rbx/box/packaging/contest_main.py,sha256=UsRfIdNmOf0iLUbzgjxzyECfMuCQINstG1SCClGHaUQ,2808
-rbx/box/packaging/main.py,sha256=kLFcMz0xOTZgtJh6P0Rr-zfq0NCbvx7HiQQ_0YmsvGg,3826
+rbx/box/packaging/main.py,sha256=NgFBoqkSRyOwA9srXoUwzrI0F6qxjsmjGAFZ-un8j0M,4073
 rbx/box/packaging/moj/packager.py,sha256=FjghOe5CPlaF1GqK0NZgWVV_eYWpdTmz88bh04yeAyI,8708
 rbx/box/packaging/packager.py,sha256=da2haC1L9cG30myneMrRIAdGubtid0Xmy38BHKPCZZ4,3633
 rbx/box/packaging/polygon/packager.py,sha256=GfZ-Dc2TDKkb3QNnfOy8yxldho2L401Ao06oWg--Gcs,11714
 rbx/box/packaging/polygon/polygon_api.py,sha256=mPKEqiwANJ1nr-JhOgzGMaDhnbljsAgzzPHW6kkf7R4,41016
 rbx/box/packaging/polygon/test.py,sha256=bgEju5PwudgyfwxXJagm8fM6CJVlWM6l_-2q1V-oKaQ,3069
-rbx/box/packaging/polygon/upload.py,sha256=UpZpVvbd0WO3y4MQdFdIwsHCu2dinfcXaIDB3smWanQ,11930
+rbx/box/packaging/polygon/upload.py,sha256=s9AHYe_utRFL681AmDbSaoc-t0PD6TdrIhnoVGa-Xwc,12429
 rbx/box/packaging/polygon/xml_schema.py,sha256=ZgcLyvxggMUccbTNdzflue5G-FTN2_ZmOGGF7FD0Y5A,2851
 rbx/box/presets/__init__.py,sha256=9S7AyCop5aopr5U2ttXxOmvfBU0LHrgg5reyskfhbds,21316
 rbx/box/presets/fetch.py,sha256=900aq9S8e12TlgSenG0iHgtF4OWgqavZsptgI_a1YKM,2508
@@ -144,11 +144,11 @@ rbx/resources/packagers/boca/compare.sh,sha256=a6AmQqwrIq616DHjp_S2l95wO7UiMVy0L
 rbx/resources/packagers/boca/compile/c,sha256=lHLvxzkG_he5jmxWrix0WT80ipMWWUZdOgOQMSpj8oo,4507
 rbx/resources/packagers/boca/compile/cc,sha256=B_18QkUGcjUg6yrTFlTQuMWnHpTWUKPZmFuk7Y0l1VA,4561
 rbx/resources/packagers/boca/compile/cpp,sha256=_1pJTSC7uADu-IIdQCaZyMbH8x01wfgxcdZ36oxXncI,4496
-rbx/resources/packagers/boca/compile/java,sha256=8T5JYBignVPYOUQyjSUb9eVAVe0x9OsLP5HZDL636W4,5178
+rbx/resources/packagers/boca/compile/java,sha256=vh3IeWzvPWrEX0n9AmAHFlpQrq7MX1feLhHfdBP7onU,5259
 rbx/resources/packagers/boca/compile/kt,sha256=3B900QSD4jSXnX91gJbvI4ZmNELHSiBb584Tmx7XtOc,4026
 rbx/resources/packagers/boca/compile/pas,sha256=C5IwZzmZpIos49FrLGafRbdGPODNJn7N5JbnLX_FT_4,4576
-rbx/resources/packagers/boca/compile/py2,sha256=mo-Ar-fzhinDlBOKUQ-0iovKVKX-69obDOe71KIIGTo,4725
-rbx/resources/packagers/boca/compile/py3,sha256=UOXeXKfdoR90wVEWIH9BvETyTOJmSmtpLoR5nJKTeXQ,4725
+rbx/resources/packagers/boca/compile/py2,sha256=UJknN4xiKP8oMN8tRZ92tDlESXgBfRO69QfyUyjijvA,4739
+rbx/resources/packagers/boca/compile/py3,sha256=L5Yzl_G5kTdmx7N7-oW3Dm_sq4uQJleRmFq84WNfZXo,4739
 rbx/resources/packagers/boca/interactive/c,sha256=7AgLVL8TO0vGgpAyNVC08ceG83-_yPO7BIPHGLTerck,5720
 rbx/resources/packagers/boca/interactive/cc,sha256=7AgLVL8TO0vGgpAyNVC08ceG83-_yPO7BIPHGLTerck,5720
 rbx/resources/packagers/boca/interactive/cpp,sha256=BdyAz61YV1ojQGTKOXJXrMfN9zA9r4X3NnCRb4vJIEE,5719
@@ -217,8 +217,8 @@ rbx/testcase.py,sha256=yKOq3CAJZ1YTmInvnoIs0u1iJnRj_X85XiWbLI-p9d8,1951
 rbx/testcase_rendering.py,sha256=nfmv6dSEqd4aR3TsaODwkKGK6AXty_DDKtWf_ejiQpI,2084
 rbx/testing_utils.py,sha256=x_PqD8Zd2PkN91NxVHUnSTs044-1WK5KKtttKQBXpFs,2083
 rbx/utils.py,sha256=SfR844_i0ebRDMkmS_w1YdZiWPc6h2RGADygewlWRbA,4845
-rbx_cp-0.5.68.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-rbx_cp-0.5.68.dist-info/METADATA,sha256=ps9oerjMXMz79YewNRmYBQS-_V7_9g8x1SS_3VwnaKw,3604
-rbx_cp-0.5.68.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rbx_cp-0.5.68.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
-rbx_cp-0.5.68.dist-info/RECORD,,
+rbx_cp-0.5.70.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+rbx_cp-0.5.70.dist-info/METADATA,sha256=4h9GZhPBUyAJtHvIxkHF7APS3MBxLi6XsbcaX7D3UPs,3604
+rbx_cp-0.5.70.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rbx_cp-0.5.70.dist-info/entry_points.txt,sha256=qBTLBOeifT1F00LWaEewRRE_jQPgvH7BUdJfZ-dYsFU,57
+rbx_cp-0.5.70.dist-info/RECORD,,