Skip to content

Better implementation for .driveignore #123

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Better implementation for .driveignore #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73117b3
Better implementation for .driveignore
giacoliva Nov 20, 2022
3515f26
timezone setting and check for file in trash
giacoliva Apr 14, 2023
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
49 changes: 37 additions & 12 deletions drive_cli/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from mimetypes import MimeTypes
from pick import Picker
from datetime import datetime
from dateutil import tz
from googleapiclient.discovery import build
from googleapiclient.http import MediaIoBaseDownload, MediaFileUpload
from httplib2 import Http
Expand Down Expand Up @@ -166,16 +167,22 @@ def write_needed(dir_name, item):

def push_needed(drive, item_path):
drive_time = time.mktime(time.strptime(
drive['modifiedTime'], '%Y-%m-%dT%H:%M:%S.%fZ')) + float(19800.00)
local_time = os.path.getmtime(item_path) - float(19801.00)
drive['modifiedTime'], '%Y-%m-%dT%H:%M:%S.%fZ')) #+ float(19800.00)
# utc to local time
dt = datetime.strptime(drive['modifiedTime'], '%Y-%m-%dT%H:%M:%S.%fZ')
dt = dt.replace(tzinfo=tz.tzutc()).astimezone(tz.tzlocal())
drive_time = time.mktime(dt.timetuple())
local_time = os.path.getmtime(item_path) #- float(19801.00)
data = drive_data()
sync_time = data[item_path]['time']
if (type(sync_time) is not float):
sync_time = sync_time['time']
if sync_time < local_time:
if sync_time < drive_time:
input = ''
while(input != 's' and input != 'o'):
input = click.prompt("Conflict: both local and online copy of " +
dir_name + " has been modified\npress o to OVERWRITE s to SKIP")
item_path + " has been modified\npress o to OVERWRITE s to SKIP")
if(input == 'o'):
return True
else:
Expand Down Expand Up @@ -254,7 +261,7 @@ def get_child(cwd):
service = build('drive', 'v3', http=creds.authorize(Http()))
page_token = None
drive_lis = {}
query = "'" + data[cwd]['id'] + "' in parents"
query = "'" + data[cwd]['id'] + "' in parents and trashed = false"
while True:
children = service.files().list(q=query,
spaces='drive',
Expand Down Expand Up @@ -437,16 +444,34 @@ def pull_content(cwd, fid):
drive_data(data)


def list_local(cwd):
def list_local(cwd, untracked = []):
local_lis = os.listdir(cwd)
drive_ignore_path = os.path.join(cwd, '.driveignore')
if os.path.isfile(drive_ignore_path):
file = open(drive_ignore_path, 'r')
untracked_files = file.readlines()
for f in untracked_files:
local_lis.remove(f[:-1])
untracked_files = [os.path.join(cwd, exp_to_regex(x)) for x in file.readlines()]
untracked = untracked + untracked_files
file.close()
return local_lis
for uf in untracked:
for lf in local_lis:
if exp_matchfile(uf, os.path.join(cwd, lf)):
todelete = True
for neguf in untracked:
if neguf[0] == '!':
if exp_matchfile(neguf[1:], os.path.join(cwd, lf)):
todelete = False
break
if todelete:
local_lis.remove(lf)
return local_lis, untracked


def exp_to_regex(exp):
return exp[:-1].replace('**', '(...)').replace('*', '([^/]*)').replace('(...)', '(.*)')


def exp_matchfile(exp, filename):
return re.search(exp, filename) is not None


def list_status(cwd, sync_time):
Expand All @@ -469,9 +494,9 @@ def list_status(cwd, sync_time):
click.secho("No changes made since the last sync")


def push_content(cwd, fid):
def push_content(cwd, fid, untracked = []):
drive_lis = get_child(cwd)
local_lis = list_local(cwd)
local_lis, untracked = list_local(cwd, untracked)
data = drive_data()
for item in local_lis:
item_path = os.path.join(cwd, item)
Expand All @@ -484,7 +509,7 @@ def push_content(cwd, fid):
if child_cwd not in data.keys():
data[child_cwd] = {'id': child_id, 'time': time.time()}
data = drive_data(data)
push_content(child_cwd, child_id)
push_content(child_cwd, child_id, untracked)
else:
item_path = os.path.join(cwd, item)
if item not in drive_lis.keys():
Expand Down