Skip to content

Commit 881759b

Browse files
authored
fix files without parents
1 parent b79b3a6 commit 881759b

File tree

3 files changed

+30
-31
lines changed

3 files changed

+30
-31
lines changed

PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: john smith <hidden at mail dot com>
22
pkgname="python-grive"
33
_pkgname="grive"
4-
pkgver=0.1.2
4+
pkgver=0.1.3
55
pkgrel=1
66
pkgdesc="Grive (Python) for Google-Drive"
77
arch=('any')

debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: python3-grive
2-
Version: 0.1.2
2+
Version: 0.1.3
33
Architecture: all
44
Maintainer: John Smith
55
Installed-Size: 0

grive

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -224,34 +224,35 @@ def valid_fullpath(fullname):
224224
def walk_tree_list_remote(items, parent_id, name):
225225
global tree_list
226226
for item in items:
227-
if item['parents'][0] == parent_id:
228-
if valid_filename(item['name']):
229-
item_tmp = {}
230-
item_tmp['id'] = item['id']
231-
item_tmp['mimeType'] = item['mimeType']
232-
item_tmp['parent'] = parent_id
233-
# fix name for exporting media
234-
if item['mimeType'] in GOOGLE_MIME_TYPES.keys():
235-
item_tmp['name'] = name + item['name'] + GOOGLE_MIME_TYPES[item['mimeType']][1]
236-
else:
237-
item_tmp['name'] = name + item['name']
238-
# check for dubbel names
239-
if dict_search_name(tree_list, item_tmp['name']) == None:
240-
if item['mimeType'] == 'application/vnd.google-apps.folder': # if folder
241-
tree_list.append(item_tmp)
242-
walk_tree_list_remote(items, item['id'], item_tmp['name'] + '/')
243-
elif not item['mimeType'].startswith('application/vnd.google-apps.'):
244-
item_tmp['md5Checksum'] = item['md5Checksum']
245-
item_tmp['modifiedEpoch'] = time.mktime(time.strptime(item['modifiedTime'], '%Y-%m-%dT%H:%M:%S.%fZ'))
246-
tree_list.append(item_tmp)
247-
elif item['mimeType'] in GOOGLE_MIME_TYPES.keys():
248-
item_tmp['modifiedEpoch'] = time.mktime(time.strptime(item['modifiedTime'], '%Y-%m-%dT%H:%M:%S.%fZ'))
249-
tree_list.append(item_tmp)
227+
if 'parents' in item:
228+
if item['parents'][0] == parent_id:
229+
if valid_filename(item['name']):
230+
item_tmp = {}
231+
item_tmp['id'] = item['id']
232+
item_tmp['mimeType'] = item['mimeType']
233+
item_tmp['parent'] = parent_id
234+
# fix name for exporting media
235+
if item['mimeType'] in GOOGLE_MIME_TYPES.keys():
236+
item_tmp['name'] = name + item['name'] + GOOGLE_MIME_TYPES[item['mimeType']][1]
250237
else:
251-
logging.debug('Skip unsupported Google File...')
252-
else:
253-
logging.debug('Skipp dubbel adding item "' + item_tmp['name'] + '" to remote List...')
254-
sendmessage(cloudName + ' (WARNING, DUBBELD ITEM!)', 'Skipping: ' + item_tmp['name'])
238+
item_tmp['name'] = name + item['name']
239+
# check for dubbel names
240+
if dict_search_name(tree_list, item_tmp['name']) == None:
241+
if item['mimeType'] == 'application/vnd.google-apps.folder': # if folder
242+
tree_list.append(item_tmp)
243+
walk_tree_list_remote(items, item['id'], item_tmp['name'] + '/')
244+
elif not item['mimeType'].startswith('application/vnd.google-apps.'):
245+
item_tmp['md5Checksum'] = item['md5Checksum']
246+
item_tmp['modifiedEpoch'] = time.mktime(time.strptime(item['modifiedTime'], '%Y-%m-%dT%H:%M:%S.%fZ'))
247+
tree_list.append(item_tmp)
248+
elif item['mimeType'] in GOOGLE_MIME_TYPES.keys():
249+
item_tmp['modifiedEpoch'] = time.mktime(time.strptime(item['modifiedTime'], '%Y-%m-%dT%H:%M:%S.%fZ'))
250+
tree_list.append(item_tmp)
251+
else:
252+
logging.debug('Skip unsupported Google File...')
253+
else:
254+
logging.debug('Skipp dubbel adding item "' + item_tmp['name'] + '" to remote List...')
255+
sendmessage(cloudName + ' (WARNING, DUBBELD ITEM!)', 'Skipping: ' + item_tmp['name'])
255256

256257
def get_tree_list_remote():
257258
global tree_list
@@ -719,7 +720,6 @@ def syncThread():
719720
if item.get('mimeType') in GOOGLE_MIME_TYPES.keys():
720721
if item['todo'] == 'CHECK_FILE':
721722
item_static = dict_search_name(list_static, item['name'])
722-
logging.debug('Check (exported) File: ' + item['name'])
723723
if item_remote['id'] != item_static['id']:
724724
item['todo'] = 'DOWNLOAD_REPLACE'
725725
if item_remote['modifiedEpoch'] != item_local['modifiedEpoch']:
@@ -733,7 +733,6 @@ def syncThread():
733733
list_static.append(check_save_item(item_remote))
734734
else:
735735
if item['todo'] == 'CHECK_FILE':
736-
logging.debug('Check File: ' + item['name'])
737736
item_static = dict_search_name(list_static, item['name'])
738737
if item_remote['id'] != item_static['id']:
739738
item['todo'] = 'DOWNLOAD_REPLACE'

0 commit comments

Comments
 (0)