addftool 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

addftool/addf_portal.py

@@ -4,6 +4,8 @@ from addftool.sync import add_sync_args, sync_main
 from addftool.deploy import add_deploy_args, deploy_main
 from addftool.broadcast_folder import add_broadcast_folder_args, broadcast_folder_main
 
+from addftool.blob import add_blob_args, blob_main
+
 
 def get_args():
     parser = argparse.ArgumentParser(description="Addf's tool")
@@ -13,6 +15,7 @@ def get_args():
     add_sync_args(subparsers)
     add_deploy_args(subparsers)
     add_broadcast_folder_args(subparsers)
+    add_blob_args(subparsers)
 
     return parser.parse_args()
 
@@ -27,6 +30,8 @@ def main():
         deploy_main(args)
     elif args.command == "broadcast-folder":
         broadcast_folder_main(args)
+    elif args.command == "blob":
+        blob_main(args)
     else:
         print("Unknown command: ", args.command)
 

addftool/blob.py

@@ -199,13 +199,29 @@ def get_sas_token(api_url, name, container, key, info=False):
         return f"Error: {response.status_code}"
 
 
-def main():
-    # exmaple usage: addfblob install
-    # exmaple usage: addfblob mount -k <key> -a <api> -b <buffer> -m <mount_dir>
-    # exmaple usage: addfblob token -k <key> -a <api>
-    parser = argparse.ArgumentParser(description="Addf's tool")
+def parse_blob_account_and_container_from_url(blob_url):
+    """
+    Parse the blob URL to extract account name and container name.
+    """
+    if not blob_url.startswith("https://"):
+        raise ValueError(f"Invalid blob URL: {blob_url}")
+
+    parts = blob_url.split("/")
+    account_name = parts[2].split(".")[0]
+    container_name = parts[3].strip()
+
+    return account_name, container_name
+
+
+def get_sas_token_for_blob_url(api_url, blob_url, key, info=False):
+    an, cn = parse_blob_account_and_container_from_url(blob_url)
+    if info:
+        print(f"Parse blob URL: {blob_url}, account name: {an}, container name: {cn}")
+    return get_sas_token(api_url, an, cn, key, info=info)
+
 
-    subparsers = parser.add_subparsers(dest='command', help='Sub-command help')
+def add_args(parser):
+    subparsers = parser.add_subparsers(dest='blob_command', help='Sub-command help')
     install_parser = subparsers.add_parser('install', help='Install help')
     # install_parser.add_argument("-o", "--output_script", help="output script", default=None)
     install_parser.add_argument("--packages", help="packages", default="fuse3 blobfuse2 azcopy")
@@ -223,19 +239,33 @@ def main():
     token_parser = subparsers.add_parser('token', help='Token help')
     add_api(token_parser)
 
-    args = parser.parse_args()
+def add_blob_args(subparsers):
+    deploy_parser = subparsers.add_parser('blob', help='Blob help')
+    add_args(deploy_parser)
+
 
+def blob_main(args):
     # check os is linux/unix and current user, set --sudo if current user is not root
     if os.name == 'posix' and os.getuid() != 0:
         args.sudo = True
 
-    if args.command == 'install':
+    if args.blob_command == 'install':
         install_main(args)
-    elif args.command == 'mount':
+    elif args.blob_command == 'mount':
         mount_main(args)
-    elif args.command == 'token':
+    elif args.blob_command == 'token':
         print(get_token(args, info=False))
 
 
+def main():
+    # exmaple usage: addfblob install
+    # exmaple usage: addfblob mount -k <key> -a <api> -b <buffer> -m <mount_dir>
+    # exmaple usage: addfblob token -k <key> -a <api>
+    parser = argparse.ArgumentParser(description="Addf's tool")
+    add_args(parser)
+    args = parser.parse_args()
+    blob_main(args)
+
+
 if __name__ == "__main__":
     main()

addftool/deploy/ssh_server.py

@@ -67,7 +67,10 @@ def configure_ssh_on_ubuntu(port, username, ssh_public_key="", password=""):
             execute_command(command_prefix + "apt-get install -y openssh-server")
 
         print("Modifying SSH configuration...")
+        # if "#Port 22" in sshd_config
         execute_command(command_prefix + f'sed -i "s/#Port 22/Port {port}/" /etc/ssh/sshd_config')
+        # if Port xxx in sshd_config
+        execute_command(command_prefix + f'sed -i "s/Port [0-9]*/Port {port}/" /etc/ssh/sshd_config')
         execute_command(command_prefix + 'sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/" /etc/ssh/sshd_config')
 
         if not os.path.exists("/etc/ssh/ssh_host_rsa_key"):

addftool/deploy/vscode_server.py

@@ -36,9 +36,9 @@ def deploy_vscode_server(install_tunnel=True):
     # Start VS Code Tunnel if requested
     if install_tunnel:
         print("Starting VS Code Tunnel...")
-        execute_command("code tunnel --accept-server-license-terms")
     
     print("VS Code installation completed successfully!")
+    print("You can start VS Code by running 'code' in the terminal., such as: \"code tunnel --accept-server-license-terms\"")
 
 
 def add_deploy_vscode_server_args(parser):

addftool/tool.py

@@ -71,9 +71,5 @@ def main():
             print("No such init option")
 
 
-def pull():
-    execute_command("git pull origin")
-
-
 if __name__ == "__main__":
     main()

{addftool-0.2.2.dist-info → addftool-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: addftool
-Version: 0.2.2
+Version: 0.2.4
 Requires-Dist: cryptography
 Requires-Dist: requests
 Requires-Dist: PyYAML

{addftool-0.2.2.dist-info → addftool-0.2.4.dist-info}/RECORD

@@ -1,19 +1,19 @@
 addftool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-addftool/addf_portal.py,sha256=pw6ivnwMfmK4WC-1Gs5cMndXKQRbMm6VvDyxXJDNrm4,991
-addftool/blob.py,sha256=NZOItDyFUIdV1tfhJZJJBEzGy296CE5NCictTzP4OPc,8282
+addftool/addf_portal.py,sha256=6XjwGs5m2mRVDWVvCPOiqn1NlxDcGBTQ9Kr_0g5RsJc,1130
+addftool/blob.py,sha256=YT3eZrC9mdYtntDlwEI5MUHFw98wKtBC_pHEdtqvsv4,9206
 addftool/broadcast_folder.py,sha256=bEOr-8Q14DhZFS658hab4U-9HvAW3EGluEriilIdEXQ,11976
 addftool/sync.py,sha256=ZpYxbM8uiPFrV7ODmOaM7asVPCWaxBixA-arVc-1kfs,14045
-addftool/tool.py,sha256=EuKQ2t2InN7yB-_oYLcdsA7vRqzRGTunwIxplUSqEG0,2054
+addftool/tool.py,sha256=FmxRY3-pP0_Z0zCUAngjmEMmPUruMftg_iUlB1t2TnQ,2001
 addftool/util.py,sha256=zlNLu8Be8cGIpNRqBw8_0q7nFxWlsJ9cToN62ohjdXE,2335
 addftool/deploy/__init__.py,sha256=UL8b-Idt7lStlMiOm8oTZ65fdzYz99Fgzq2Gaw8WsZc,1544
 addftool/deploy/azure.py,sha256=_o_9Eh8cVwLDAqvfyRYBtQRHs_Gul-nCs2ZXttwO1bk,1301
-addftool/deploy/ssh_server.py,sha256=f2T8fgwACVljPfdcimMywUjsFnLCWRde7iWPAILpRz8,5463
-addftool/deploy/vscode_server.py,sha256=9KoWQdK3ESgKtdACEHTng2OuQKlIZjh_R_qJNT-XOv8,2609
+addftool/deploy/ssh_server.py,sha256=7glpJJNROskpqPkeYrTc2MbVzRendUZLv-ZgPs6HCq8,5641
+addftool/deploy/vscode_server.py,sha256=tLtSvlcK2fEOaw6udWt8dNELVhwv9F59hF5DJJ-1Nak,2666
 addftool/process/__init__.py,sha256=Dze8OrcyjQlAbPrjE_h8bMi8W4b3OJyZOjTucPrkJvM,3721
 addftool/process/utils.py,sha256=JldxnwanLJOgxaPgmCJh7SeBRaaj5rFxWWxh1hpsvbA,2609
 addftool/ssh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-addftool-0.2.2.dist-info/METADATA,sha256=UAlfwCvT_leVPhIku998LlT2f23Gd4ugq9Yh4Dzlt3E,170
-addftool-0.2.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-addftool-0.2.2.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
-addftool-0.2.2.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
-addftool-0.2.2.dist-info/RECORD,,
+addftool-0.2.4.dist-info/METADATA,sha256=Mxypih4dkYUmHFyyVBqbZLVf4CYJqapkfHMJ2zCMVh0,170
+addftool-0.2.4.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+addftool-0.2.4.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
+addftool-0.2.4.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
+addftool-0.2.4.dist-info/RECORD,,