Skip to content

Commit

Permalink
now also deletes the files. tested.
Browse files Browse the repository at this point in the history
  • Loading branch information
takotab committed Mar 29, 2019
1 parent 098103d commit 8fc7d1e
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cloudfile/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .save import save
from .restore import restore, download
from .add_file import add_file
from .google_drive import upload_file, get_service
from .google_drive import upload_file, get_service, delete_google_file
7 changes: 5 additions & 2 deletions cloudfile/add_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
from .google_drive import upload_file


def add_file(file: str, cloudf: CloudFile = None, hard=False):
def add_file(file: str, cloudf: CloudFile = None, hard=False, unit_test=False):
if cloudf is None:
cloudf = CloudFile()
assert os.path.isfile(file)
return cloudf.upload_file(file)
url, file_id = cloudf.upload_file(file)
if unit_test:
return cloudf, url, file_id
return url
4 changes: 2 additions & 2 deletions cloudfile/cloudfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def __setitem__(self, key, item):
self.dct[key] = item

def upload_file(self, file):
link = upload_file(self.get_service(), file)
link, file_id = upload_file(self.get_service(), file)
self.dct[file] = link
self.save_json()
return link
return link, file_id

6 changes: 5 additions & 1 deletion cloudfile/google_drive.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def upload_file(drive_service, file):
)
print(f"File ID: {file_id}, link:{url}")

return url
return url, file_id


def add_link_permision(drive_service, file_id):
Expand All @@ -78,6 +78,10 @@ def callback(request_id, response, exception):
batch.execute()


def delete_google_file(drive_service, file_id):
drive_service.files().delete(fileId=file_id).execute()


"""
# Call the Drive v3 API
results = (
Expand Down
3 changes: 2 additions & 1 deletion cloudfile/restore.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def restore(cloudf: CloudFile = None, hard=False):

def download(dir: str, url: str):
path_to = get_path_to(dir)
wget.download(url, out=path_to)
file_dir = wget.download(url, out=path_to)
os.rename(src=file_dir, dst=dir)
print(f"Downloaded {dir} from {url}")


Expand Down
3 changes: 2 additions & 1 deletion tests/test_add_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ def test_add_file():
filename = "foo/bar_new.txt"
with open(filename, "w") as f:
f.write("hello world")
url = cloudfile.add_file(filename)
cloudf, url, file_id = cloudfile.add_file(filename, unit_test=True)
os.remove(filename)
cloudfile.download(filename, url)
assert os.path.isfile(filename)
cloudfile.delete_google_file(cloudf.service, file_id)
del_folder("foo")

0 comments on commit 8fc7d1e

Please sign in to comment.