iotcat
/
PyOne
mirror of https://github.com/IoTcat/PyOne.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

verify=False

Browse Source
master
Abbey 5 years ago
parent 91f9d33cae
commit 17b07f718f
5 changed files with 21 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      app/utils/common.py
  2. 12
      app/utils/file_os.py
  3. 10
      app/utils/header.py
  4. 6
      app/utils/updatefile.py
  5. 8
      app/utils/upload.py

7
app/utils/common.py
Unescape View File

@ -154,8 +154,7 @@ def _thunbnail(id,user):
url=app_url+'v1.0/me/drive/items/{}/thumbnails/0?select=large'.format(id)
else:
url=app_url+'_api/v2.0/me/drive/items/{}/thumbnails/0?select=large'.format(id)
r=browser.get(url,headers=headers)
print r.content
r=browser.get(url,headers=headers,verify=False)
data=json.loads(r.content)
if data.get('large').get('url'):
# return data.get('large').get('url').replace('thumbnail','videotranscode').replace('&width=800&height=800','')+'&format=dash&track=audio&transcodeAhead=0&part=initsegment&quality=audhigh'
@ -177,7 +176,7 @@ def _getdownloadurl(id,user):
url=app_url+'v1.0/me/drive/items/'+id
else:
url=app_url+'_api/v2.0/me/drive/items/'+id
r=browser.get(url,headers=headers)
r=browser.get(url,headers=headers,verify=False)
data=json.loads(r.content)
if data.get('@microsoft.graph.downloadUrl'):
downloadUrl=data.get('@microsoft.graph.downloadUrl')
@ -307,7 +306,7 @@ def _remote_content(fileid,user):
else:
downloadUrl,play_url=GetDownloadUrl(fileid,user)
if downloadUrl:
r=browser.get(downloadUrl)
r=browser.get(downloadUrl,verify=False)
# r.encoding='utf-8'
if r.encoding=='ISO-8859-1':
content=r.content

12
app/utils/file_os.py
Unescape View File

@ -15,7 +15,7 @@ def DeleteRemoteFile(fileid,user=GetConfig('default_pan')):
url=app_url+'v1.0/me/drive/items/'+fileid
else:
url=app_url+'_api/v2.0/me/drive/items/'+fileid
r=browser.delete(url,headers=headers)
r=browser.delete(url,headers=headers,verify=False)
if r.status_code==204:
DeleteLocalFile(fileid)
return True
@ -51,7 +51,7 @@ def CreateFolder(folder_name,grand_path,user=GetConfig('default_pan')):
"folder": {},
"@microsoft.graph.conflictBehavior": "rename"
}
r=browser.post(url,headers=headers,data=json.dumps(payload))
r=browser.post(url,headers=headers,data=json.dumps(payload),verify=False)
data=json.loads(r.content)
if data.get('id'):
#插入数据
@ -102,7 +102,7 @@ def CreateFile(filename,path,content,user=GetConfig('default_pan')):
url=app_url+'v1.0/me/drive/items/root:{}:/content'.format(remote_file)
else:
url=app_url+'_api/v2.0/me/drive/items/root:{}:/content'.format(remote_file)
r=browser.put(url,headers=headers,data=content,timeout=10)
r=browser.put(url,headers=headers,data=content,timeout=10,verify=False)
data=json.loads(r.content)
if data.get('id'):
AddResource(data,user)
@ -129,7 +129,7 @@ def EditFile(fileid,content,user=GetConfig('default_pan')):
else:
url=app_url+'_api/v2.0/me/drive/items/{}/content'.format(fileid)
try:
r=browser.put(url,headers=headers,data=content,timeout=10)
r=browser.put(url,headers=headers,data=content,timeout=10,verify=False)
data=json.loads(r.content)
if data.get('id'):
info['status']=0
@ -185,7 +185,7 @@ def MoveFile(fileid,new_folder_path,user=GetConfig('default_pan')):
},
"name": GetName(fileid)
}
r=browser.patch(url,headers=headers,data=json.dumps(payload))
r=browser.patch(url,headers=headers,data=json.dumps(payload),verify=False)
data=json.loads(r.content)
if data.get('id'):
new_value={'parent':parent,'grandid':grandid,'path':path}
@ -217,7 +217,7 @@ def ReName(fileid,new_name,user=GetConfig('default_pan')):
payload={
"name": new_name
}
r=browser.patch(url,headers=headers,data=json.dumps(payload))
r=browser.patch(url,headers=headers,data=json.dumps(payload),verify=False)
data=json.loads(r.content)
if data.get('id'):
it=mon_db.items.find_one({'id':fileid})

10
app/utils/header.py
Unescape View File

@ -200,7 +200,7 @@ def ReFreshToken(refresh_token,user=GetConfig('default_pan')):
if od_type=='cn':
data+='&resource={}'.format(GetAppUrl(user))
url=GetOAuthUrl(od_type)
r=browser.post(url,data=data,headers=headers)
r=browser.post(url,data=data,headers=headers,verify=False)
return json.loads(r.text)
@ -486,7 +486,7 @@ class GetItemThread(Thread):
token=GetToken(user=self.user)
headers={'Authorization': 'Bearer {}'.format(token)}
headers.update(default_headers)
r=browser.get(url,headers=headers,timeout=10)
r=browser.get(url,headers=headers,timeout=10,verify=False)
data=json.loads(r.content)
if data.get('folder'):
if data['name']!='root':
@ -504,7 +504,7 @@ class GetItemThread(Thread):
headers.update(default_headers)
try:
self.CheckPathSize(url.replace('children?expand=thumbnails',''))
r=browser.get(url,headers=headers,timeout=10)
r=browser.get(url,headers=headers,timeout=10,verify=False)
data=json.loads(r.content)
if data.get('error'):
InfoLogger().print_r('error:{}! waiting 180s'.format(data.get('error').get('message')))
@ -658,7 +658,7 @@ class GetItemThread(Thread):
url=app_url+u'_api/v2.0/me/drive/root:{}:/'.format(path)
headers={'Authorization': 'Bearer {}'.format(token)}
headers.update(default_headers)
r=browser.get(url,headers=headers)
r=browser.get(url,headers=headers,verify=False)
data=json.loads(r.content)
return data
@ -667,7 +667,7 @@ class GetItemThread(Thread):
token=GetToken(user=self.user)
headers={'Authorization': 'Bearer {}'.format(token)}
headers.update(default_headers)
r=browser.get(url,headers=headers)
r=browser.get(url,headers=headers,verify=False)
data=json.loads(r.content)
return data

6
app/utils/updatefile.py
Unescape View File

@ -140,7 +140,7 @@ def GetRootid(user=GetConfig('default_pan')):
headers={'Authorization': 'Bearer {}'.format(token)}
headers.update(default_headers)
r=browser.get(url,headers=headers)
r=browser.get(url,headers=headers,verify=False)
data=json.loads(r.content)
redis_client.set(key,data['id'],3600)
return data['id']
@ -156,7 +156,7 @@ def FileExists(filename,user=GetConfig('default_pan')):
search_url=app_url+"v1.0/me/drive/root/search(q='{}')".format(convert2unicode(filename))
else:
search_url=app_url+"_api/v2.0/me/drive/root/search(q='{}')".format(convert2unicode(filename))
r=browser.get(search_url,headers=headers)
r=browser.get(search_url,headers=headers,verify=False)
jsondata=json.loads(r.text)
if len(jsondata['value'])==0:
return False
@ -173,6 +173,6 @@ def FileInfo(fileid,user=GetConfig('default_pan')):
search_url=app_url+"v1.0/me/drive/items/{}".format(fileid)
else:
search_url=app_url+"_api/v2.0/me/drive/items/{}".format(fileid)
r=browser.get(search_url,headers=headers)
r=browser.get(search_url,headers=headers,verify=False)
jsondata=json.loads(r.text)
return jsondata

8
app/utils/upload.py
Unescape View File

@ -15,7 +15,7 @@ def _upload(filepath,remote_path,user=GetConfig('default_pan')): #remote_path li
else:
url=app_url+'_api/v2.0/me/drive/root:{}:/content'.format(urllib.quote(convert2unicode(remote_path)))
timeCalc=TimeCalculator()
r=browser.put(url,headers=headers,data=open(filepath,'rb'))
r=browser.put(url,headers=headers,data=open(filepath,'rb'),verify=False)
# r=CurlUpload(url,headers,open(filepath,'rb'))
try:
data=json.loads(r.content)
@ -68,7 +68,7 @@ def _upload_part(uploadUrl, filepath,filesize, offset, length,trytime=1,request_
headers.update(default_headers)
try:
timeCalc=TimeCalculator()
r=browser.put(uploadUrl,headers=headers,data=filebin)
r=browser.put(uploadUrl,headers=headers,data=filebin,verify=False)
# r=CurlUpload(uploadUrl,headers,filebin)
data=json.loads(r.content)
speed=CalcSpeed(length,timeCalc.PassNow())['kb']
@ -117,7 +117,7 @@ def CreateUploadSession(path,user=GetConfig('default_pan')):
}
InfoLogger().print_r('create upload session for :{}'.format(path))
try:
r=browser.post(url,headers=headers,data=json.dumps(data))
r=browser.post(url,headers=headers,data=json.dumps(data),verify=False)
retdata=json.loads(r.content)
if r.status_code==409:
InfoLogger().print_r('file exists')
@ -230,7 +230,7 @@ def Upload(filepath,remote_path=None,user=GetConfig('default_pan')):
def ContinueUpload(filepath,uploadUrl,user):
headers={'Content-Type':'application/json'}
headers.update(default_headers)
r=browser.get(uploadUrl,headers=headers)
r=browser.get(uploadUrl,headers=headers,verify=False)
data=json.loads(r.text)
offset=data.get('nextExpectedRanges')[0].split('-')[0]
expires_on=time.mktime(parse(data.get('expirationDateTime')).timetuple())

Write Preview
Loading…
Cancel
Save