Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated packages required and fixed bugs created by updating package versions #106

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ argument: Path_to_file+file_name
```sh
> ./uds.py --list
Name Size Encoded ID
------------------------ ----- --------- ---------------------------------
------------------------ ----- --------- ---------------------------------
Ubuntu.Desktop.16.04.iso 810 MB 1.1 GB 1fc6JGpX6vUWiwflL1jBxM1YpuMHFAms8
Ubuntu.Desktop.18.10.iso 1.1 GB 1.3 GB 1RzzVfN9goHMTkM1Hf1FUWUVS_2R3GK7D

Also supports searching with a query!

> ./uds.py --list "18"
Name Size Encoded ID
------------------------ ----- --------- ---------------------------------
------------------------ ----- --------- ---------------------------------
Ubuntu.Desktop.18.10.iso 1.1 GB 1.3 GB 1RzzVfN9goHMTkM1Hf1FUWUVS_2R3GK7D
```

Expand Down Expand Up @@ -97,8 +97,8 @@ Deleted 1fc6JGpX6vUWiwflL1jBxM1YpuMHFAms8

argument: id_of_file
```
## Alpha Extensions

## Alpha Extensions

### Grab

Expand Down Expand Up @@ -135,14 +135,14 @@ argument: name_of_file
```sh
> ./uds.py --update

Name Encoded Size
Name Encoded Size
--------- -------- -----
file_name 1.1 GB 810 MB
file_name 1.1 GB 810 MB

"User.txt"
Name Encoded Size
Name Encoded Size
--------- -------- -----
file_name 1.1 GB 810 MB
file_name 1.1 GB 810 MB

"data.txt"
{
Expand Down Expand Up @@ -183,7 +183,6 @@ argument[1]: name_in_files, or wildcard "?" without quotes
argument[2]: directory, default is current directory of UDS
```


### Batch

```sh
Expand Down
4 changes: 3 additions & 1 deletion api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
from googleapiclient.discovery import build
from googleapiclient.errors import HttpError
from httplib2 import Http
from oauth2client import file, client, tools


from custom_exceptions import FileNotUDSError
from file_parts import UDSFile
from oauth2client import file, client, tools



class GoogleAPI:
Expand Down
9 changes: 5 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
tabulate==0.8.2
httplib2==0.18.0
cryptography==3.2
httplib2==0.11.3
cryptography==2.3.1
google_api_python_client==1.7.5
oauth2client==4.1.3
oauth2client
tqdm==4.31.1
wcwidth
wcwidth
google_auth_oauthlib
2 changes: 1 addition & 1 deletion uds.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
except ImportError:
Error.formatter(PythonVersionError, ".".join(str(v) for v in sys.version_info[:2]))

if not os.path.exists(os.path.join(os.getcwd() + "/client_secret.json")):
if not os.path.exists(os.path.join(os.getcwd(), "client_secret.json")):
Error.formatter(NoClientSecretError)

DOWNLOADS_FOLDER = "downloads"
Expand Down