mirror of
https://github.com/jackeilles/xygt.git
synced 2024-11-22 14:52:39 +01:00
dict name wrong
This commit is contained in:
parent
b736c2445b
commit
0e7fb3cfcf
1 changed files with 42 additions and 0 deletions
|
@ -120,6 +120,48 @@ def idInfo(id):
|
||||||
# Return the mongodb info about the file, removing IP if its present
|
# Return the mongodb info about the file, removing IP if its present
|
||||||
return check
|
return check
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
def userInfo(id):
|
||||||
|
# Grab user entry from userID
|
||||||
|
user = Config.users.find_one({"userid": id})
|
||||||
|
|
||||||
|
username = user['user']
|
||||||
|
userid = id
|
||||||
|
|
||||||
|
# Search for all files from that userID
|
||||||
|
files = Config.files.find({"userid": userid}, {"_id": False, "ip": False})
|
||||||
|
list = {}
|
||||||
|
|
||||||
|
# Create file listing
|
||||||
|
for file in files:
|
||||||
|
list.update({
|
||||||
|
file["id"]: {
|
||||||
|
"filename": file["filename"],
|
||||||
|
"mimetype": file["mimetype"],
|
||||||
|
"filesize": file["filesize"],
|
||||||
|
"retention": file["retention"],
|
||||||
|
"creation": file["date"],
|
||||||
|
"expiry": file["expiry"]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
# Search for all URL's from that userID
|
||||||
|
url = Config.url.find({"userid": userid})
|
||||||
|
|
||||||
|
# Format all into one JSON
|
||||||
|
return {
|
||||||
|
"user": {
|
||||||
|
"username": username,
|
||||||
|
"userid": userid
|
||||||
|
},
|
||||||
|
"files": {
|
||||||
|
"count": len(files),
|
||||||
|
"list": list
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
>>>>>>> 3063133 (dict name wrong)
|
||||||
def randomHex():
|
def randomHex():
|
||||||
hexRand = ''.join(secrets.choice('0123456789abcdef') for _ in range(6))
|
hexRand = ''.join(secrets.choice('0123456789abcdef') for _ in range(6))
|
||||||
return hexRand
|
return hexRand
|
||||||
|
|
Loading…
Reference in a new issue