Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2020-1-CloudComputing
/
C_Team_KhuDrive
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Authored by
김재형
2020-06-17 23:27:16 +0900
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
b8e24d94ce704c005fa5279ba0901aa1230e31a5
b8e24d94
2 parents
aeed33ce
4c475b80
Merge branch 'develop'
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
backend/api/views.py
backend/api/views.py
View file @
b8e24d9
...
...
@@ -195,7 +195,7 @@ class ItemViewSet(viewsets.ViewSet):
s3_bucket
=
AWS_STORAGE_BUCKET_NAME
item
=
Item
.
objects
.
filter
(
item_id
=
pk
)
object_name
=
item
.
get
()
.
name
object_name
=
str
(
item
.
get
()
.
item_id
)
data
=
serializers
.
serialize
(
"json"
,
item
)
json_data
=
json
.
loads
(
data
)
...
...
@@ -299,7 +299,8 @@ class ItemViewSet(viewsets.ViewSet):
return
Response
({
'message'
:
'item is not existed.'
},
status
=
status
.
HTTP_204_NO_CONTENT
)
if
child
.
is_folder
==
True
:
return
Response
({
'message'
:
'item is folder'
},
status
=
status
.
HTTP_204_NO_CONTENT
)
copiedName
=
child
.
name
+
"_복사본_"
+
str
(
datetime
.
now
()
.
strftime
(
'
%
Y-
%
m-
%
d
%
H:
%
M'
))
name
=
child
.
name
.
split
(
"."
)
copiedName
=
name
[
0
]
+
"_복사본_"
+
str
(
datetime
.
now
()
.
strftime
(
'
%
Y-
%
m-
%
d
%
H:
%
M'
))
+
"."
+
name
[
-
1
]
copiedItem
=
Item
(
is_folder
=
False
,
name
=
copiedName
,
path
=
child
.
path
,
parent
=
parent_id
,
user_id
=
child
.
user_id
,
size
=
child
.
size
,
status
=
child
.
status
)
copiedItem
.
save
()
...
...
@@ -403,11 +404,13 @@ class ItemViewSet(viewsets.ViewSet):
upload_item
=
Item
(
name
=
file_name
,
size
=
file_size
,
user_id
=
1
,
file_type
=
file_type
,
parent
=
file_parent
)
upload_item
.
save
()
file_id
=
str
(
upload_item
.
item_id
)
date_long
=
datetime
.
utcnow
()
.
strftime
(
'
%
Y
%
m
%
dT000000Z'
)
presigned_post
=
s3
.
generate_presigned_post
(
s3_bucket
,
file_
name
,
file_
id
,
{
"acl"
:
"private"
,
"Content-Type"
:
file_type
,
...
...
@@ -434,7 +437,7 @@ class ItemViewSet(viewsets.ViewSet):
data
=
{
"signed_url"
:
presigned_post
,
'url'
:
'
%
s/
%
s'
%
(
presigned_post
[
"url"
],
file_
name
),
'url'
:
'
%
s/
%
s'
%
(
presigned_post
[
"url"
],
file_
id
),
'item'
:
res
}
...
...
@@ -476,7 +479,6 @@ class SharedItemViewSet(viewsets.ModelViewSet):
return
Response
({
'message'
:
'This file is already shared'
},
status
=
status
.
HTTP_200_OK
)
sharedfile
=
SharedItem
(
item_id
=
pk
,
password
=
password
,
expires
=
expires
)
sharedfile
.
save
()
sharedfile
=
SharedItem
.
objects
.
get
(
item_id
=
pk
)
# sf = serializers.serialize("json", sharedfile)
item
=
Item
.
objects
.
filter
(
item_id
=
pk
)
...
...
@@ -486,7 +488,7 @@ class SharedItemViewSet(viewsets.ModelViewSet):
print
(
json_data
)
res
=
json_data
[
0
][
'fields'
]
res
[
'id'
]
=
json_data
[
0
][
'pk'
]
return
Response
({
"shared"
:
sharedfile
.
created_time
,
'data'
:
res
},
status
=
status
.
HTTP_200_OK
)
return
Response
({
"shared"
:
sharedfile
.
pk
,
'data'
:
res
},
status
=
status
.
HTTP_200_OK
)
item
=
ItemViewSet
.
as_view
({
...
...
Please
register
or
login
to post a comment