addftool 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

addftool/blob.py

@@ -3,6 +3,7 @@ import requests
 import os
 import json
 import yaml
+import tempfile
 from cryptography.fernet import Fernet
 
 from .util import execute_command
@@ -59,10 +60,10 @@ def install_main(args):
         args.packages = " ".join(to_install)
 
     # generate install script
-    if args.output_script is not None:
-        script_writer = open(args.output_script, "w")
-    else:
-        script_writer = None
+    # if args.output_script is not None:
+    #     script_writer = open(args.output_script, "w")
+    # else:
+    script_writer = None
     
     # get ubuntu version
     ubuntu_version = get_ubuntu_version()
@@ -128,13 +129,33 @@ def mount_main(args):
     create_dir_for_current_user(args.buffer, sudo=args.sudo)
     create_dir_for_current_user(args.mount, sudo=args.sudo)
 
-    # write config file into /tmp/config.yaml
+    # write config file into tempfile
 
-    temp_config = "/tmp/config.yaml"
+    temp_config_dir = tempfile.mktemp()
+    print("Create temp config dir: ", temp_config_dir)
+    os.makedirs(temp_config_dir, exist_ok=True)
+    temp_config = os.path.join(temp_config_dir, "blobfuse2.yaml")
     with open(temp_config, 'w') as stream:
         yaml.dump(template, stream)
+    
+    print("Create config file: ", temp_config)
 
     command = f"blobfuse2 mount {args.mount} --config-file={temp_config}"
+    if args.allow_other:
+        command += " --allow-other"
+        # to avoid "Error: fusermount3: option allow_other only allowed if 'user_allow_other' is set in /etc/fuse.conf"
+        # check if 'user_allow_other' is set in /etc/fuse.conf
+        exist_user_allow_other = False
+        with open("/etc/fuse.conf") as f:
+            for line in f:
+                if line.startswith("user_allow_other"):
+                    exist_user_allow_other = True
+                    break
+        if not exist_user_allow_other:
+            print("Add user_allow_other to /etc/fuse.conf")
+            pre_command = "echo 'user_allow_other' | sudo tee -a /etc/fuse.conf"
+            execute_command(pre_command)
+
     execute_command(command)
 
 
@@ -179,7 +200,7 @@ def main():
 
     subparsers = parser.add_subparsers(dest='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("-o", "--output_script", help="output script", default=None)
     install_parser.add_argument("--packages", help="packages", default="fuse3 blobfuse2 azcopy")
     install_parser.add_argument("--sudo", help="sudo", action="store_true")
 
@@ -188,6 +209,7 @@ def main():
     mount_parser.add_argument("-b", "--buffer", help="buffer dir", required=True)
     mount_parser.add_argument("-m", "--mount", help="mount dir", required=True)
     mount_parser.add_argument("-t", "--template", help="yaml template file", default=None)
+    mount_parser.add_argument("-o", "--allow-other", help="allow other", action="store_true", default=False)
     mount_parser.add_argument("--sudo", help="sudo", action="store_true")
 
     token_parser = subparsers.add_parser('token', help='Token help')

{addftool-0.0.4.dist-info → addftool-0.0.6.dist-info}/METADATA

@@ -1,8 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: addftool
-Version: 0.0.4
-License-File: LICENSE
+Version: 0.0.6
 Requires-Dist: cryptography
 Requires-Dist: requests
 Requires-Dist: PyYAML
-

addftool-0.0.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+addftool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+addftool/blob.py,sha256=S5dk20Gn2Ne3UVkKwpI11xSTOndO1W3wVRsJrJmhNOQ,7741
+addftool/tool.py,sha256=EuKQ2t2InN7yB-_oYLcdsA7vRqzRGTunwIxplUSqEG0,2054
+addftool/util.py,sha256=Q3A68vJDxgfeNiEFmk54HuMuworVndocXpSbVpvGMfc,362
+addftool-0.0.6.dist-info/METADATA,sha256=lNcNL-m1MkGnzmWEPZuJmf6ncJICUBZyq07HtWESqlU,126
+addftool-0.0.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+addftool-0.0.6.dist-info/entry_points.txt,sha256=h5TlQy4AQw-J55HqI7FRkIVRUfw-x3pStFWCoYtoCTM,78
+addftool-0.0.6.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
+addftool-0.0.6.dist-info/RECORD,,

{addftool-0.0.4.dist-info → addftool-0.0.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

addftool-0.0.4.dist-info/LICENSE

@@ -1,19 +0,0 @@
-Copyright (c) 2018 The Python Packaging Authority
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

addftool-0.0.4.dist-info/RECORD

@@ -1,10 +0,0 @@
-addftool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-addftool/blob.py,sha256=5gdXzv_8RQOjCEo1ihsP3S3e7nrfqKWwfpxGw7pipXs,6690
-addftool/tool.py,sha256=EuKQ2t2InN7yB-_oYLcdsA7vRqzRGTunwIxplUSqEG0,2054
-addftool/util.py,sha256=Q3A68vJDxgfeNiEFmk54HuMuworVndocXpSbVpvGMfc,362
-addftool-0.0.4.dist-info/LICENSE,sha256=7EI8xVBu6h_7_JlVw-yPhhOZlpY9hP8wal7kHtqKT_E,1074
-addftool-0.0.4.dist-info/METADATA,sha256=If4J7R9OXA8e0OXs02shLes0NUmSK5pk4hsYyG48qKg,149
-addftool-0.0.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-addftool-0.0.4.dist-info/entry_points.txt,sha256=h5TlQy4AQw-J55HqI7FRkIVRUfw-x3pStFWCoYtoCTM,78
-addftool-0.0.4.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
-addftool-0.0.4.dist-info/RECORD,,