Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libcloudstorage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
libcloudstorage
Commits
2b6d2570
Commit
2b6d2570
authored
Feb 05, 2018
by
Paweł Wegner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cloudbrowser: added show file info action.
parent
811994e5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
127 additions
and
8 deletions
+127
-8
bin/cloudbrowser/qml/ItemPage.qml
bin/cloudbrowser/qml/ItemPage.qml
+95
-1
bin/cloudbrowser/qml/main.qml
bin/cloudbrowser/qml/main.qml
+4
-0
bin/cloudbrowser/src/CloudItem.cpp
bin/cloudbrowser/src/CloudItem.cpp
+20
-0
bin/cloudbrowser/src/CloudItem.h
bin/cloudbrowser/src/CloudItem.h
+4
-2
src/Utility/Item.cpp
src/Utility/Item.cpp
+4
-5
No files found.
bin/cloudbrowser/qml/ItemPage.qml
View file @
2b6d2570
...
@@ -13,6 +13,11 @@ Kirigami.ScrollablePage {
...
@@ -13,6 +13,11 @@ Kirigami.ScrollablePage {
anchors.fill
:
parent
anchors.fill
:
parent
supportsRefreshing
:
true
supportsRefreshing
:
true
onIsCurrentPageChanged
:
{
if
(
isCurrentPage
)
root
.
selected_item
=
list_view
.
currentItem
?
list_view
.
currentItem
.
item
:
null
;
}
onRefreshingChanged
:
{
onRefreshingChanged
:
{
if
(
refreshing
)
{
if
(
refreshing
)
{
list
.
update
(
cloud
,
item
);
list
.
update
(
cloud
,
item
);
...
@@ -114,14 +119,102 @@ Kirigami.ScrollablePage {
...
@@ -114,14 +119,102 @@ Kirigami.ScrollablePage {
visible
:
list_view
.
currentItem
&&
list_view
.
currentItem
.
item
.
type
!==
"
directory
"
&&
visible
:
list_view
.
currentItem
&&
list_view
.
currentItem
.
item
.
type
!==
"
directory
"
&&
item
.
supports
(
"
download
"
)
item
.
supports
(
"
download
"
)
iconName
:
"
document-save
"
iconName
:
"
document-save
"
text
:
"
Download
"
+
(
list_view
.
currentItem
?
list_view
.
currentItem
.
item
.
filename
:
""
)
text
:
"
Download
"
onTriggered
:
{
onTriggered
:
{
download_dialog
.
filename
=
list_view
.
currentItem
.
item
.
filename
;
download_dialog
.
filename
=
list_view
.
currentItem
.
item
.
filename
;
download_dialog
.
open
();
download_dialog
.
open
();
}
}
},
Kirigami.Action
{
visible
:
list_view
.
currentItem
iconName
:
"
help-about
"
text
:
"
File information
"
onTriggered
:
{
file_info_sheet
.
open
();
}
}
}
]
]
Kirigami.OverlaySheet
{
id
:
file_info_sheet
Item
{
implicitWidth
:
Math
.
min
(
page
.
width
*
0.8
,
400
)
implicitHeight
:
childrenRect
.
height
-
50
Text
{
id
:
file_name
width
:
parent
.
width
font.pointSize
:
18
padding
:
10
text
:
root
.
selected_item
?
root
.
selected_item
.
filename
:
""
elide
:
Text
.
ElideRight
wrapMode
:
Text
.
Wrap
}
Column
{
anchors.top
:
file_name
.
bottom
width
:
parent
.
implicitWidth
*
0.8
anchors.horizontalCenter
:
parent
.
horizontalCenter
Rectangle
{
width
:
parent
.
width
height
:
childrenRect
.
height
border.width
:
1
anchors.leftMargin
:
10
Column
{
width
:
parent
.
width
Item
{
visible
:
root
.
selected_item
?
root
.
selected_item
.
size
!==
-
1
:
""
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.margins
:
10
height
:
50
Text
{
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.left
:
parent
.
left
font.pointSize
:
12
text
:
"
size
"
}
Text
{
function
show_size
(
size
)
{
if
(
size
<
1024
)
return
size
+
"
B
"
;
else
if
(
size
<
1024
*
1024
)
return
(
size
/
1024
).
toFixed
(
2
)
+
"
KB
"
;
else
if
(
size
<
1024
*
1024
*
1024
)
return
(
size
/
(
1024
*
1024
)).
toFixed
(
2
)
+
"
MB
"
;
else
return
(
size
/
(
1024
*
1024
*
1024
)).
toFixed
(
2
)
+
"
GB
"
;
}
font.pointSize
:
16
text
:
root
.
selected_item
?
show_size
(
root
.
selected_item
.
size
)
:
""
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.right
:
parent
.
right
}
}
Item
{
visible
:
root
.
selected_item
?
root
.
selected_item
.
timestamp
!==
""
:
false
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.margins
:
10
height
:
50
Text
{
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.left
:
parent
.
left
font.pointSize
:
12
text
:
"
last modified
"
}
Text
{
font.pointSize
:
16
text
:
root
.
selected_item
?
root
.
selected_item
.
timestamp
:
""
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.right
:
parent
.
right
}
}
}
}
}
}
}
Kirigami.OverlaySheet
{
Kirigami.OverlaySheet
{
id
:
create_directory_sheet
id
:
create_directory_sheet
ColumnLayout
{
ColumnLayout
{
...
@@ -221,6 +314,7 @@ Kirigami.ScrollablePage {
...
@@ -221,6 +314,7 @@ Kirigami.ScrollablePage {
id
:
list_view
id
:
list_view
model
:
list
.
list
model
:
list
.
list
currentIndex
:
-
1
currentIndex
:
-
1
onCurrentItemChanged
:
root
.
selected_item
=
currentItem
.
item
onCurrentIndexChanged
:
currentEdit
=
-
1
onCurrentIndexChanged
:
currentEdit
=
-
1
footerPositioning
:
ListView
.
OverlayFooter
footerPositioning
:
ListView
.
OverlayFooter
footer
:
Kirigami.ItemViewHeader
{
footer
:
Kirigami.ItemViewHeader
{
...
...
bin/cloudbrowser/qml/main.qml
View file @
2b6d2570
...
@@ -16,6 +16,7 @@ Kirigami.ApplicationWindow {
...
@@ -16,6 +16,7 @@ Kirigami.ApplicationWindow {
property
real
last_volume
:
1
property
real
last_volume
:
1
property
int
player_count
:
0
property
int
player_count
:
0
property
int
footer_height
:
ad_loaded
&&
ad_visible
?
50
:
0
property
int
footer_height
:
ad_loaded
&&
ad_visible
?
50
:
0
property
CloudItem
selected_item
id
:
root
id
:
root
width
:
Math
.
min
(
800
,
screen
.
desktopAvailableWidth
)
width
:
Math
.
min
(
800
,
screen
.
desktopAvailableWidth
)
...
@@ -188,6 +189,9 @@ Kirigami.ApplicationWindow {
...
@@ -188,6 +189,9 @@ Kirigami.ApplicationWindow {
id
:
contextDrawer
id
:
contextDrawer
height
:
parent
.
height
-
footer_height
height
:
parent
.
height
-
footer_height
handle.anchors.bottomMargin
:
footer_height
handle.anchors.bottomMargin
:
footer_height
title
:
selected_item
?
selected_item
.
filename
:
"
Actions
"
}
}
pageStack.initialPage
:
mainPageComponent
pageStack.initialPage
:
mainPageComponent
pageStack.interactive
:
!
visible_player
pageStack.interactive
:
!
visible_player
...
...
bin/cloudbrowser/src/CloudItem.cpp
View file @
2b6d2570
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
#include "Request/ListDirectory.h"
#include "Request/ListDirectory.h"
#include <QDateTime>
#undef CreateDirectory
#undef CreateDirectory
using
namespace
cloudstorage
;
using
namespace
cloudstorage
;
...
@@ -11,6 +13,24 @@ CloudItem::CloudItem(const Provider& p, IItem::Pointer item, QObject* parent)
...
@@ -11,6 +13,24 @@ CloudItem::CloudItem(const Provider& p, IItem::Pointer item, QObject* parent)
QString
CloudItem
::
filename
()
const
{
return
item_
->
filename
().
c_str
();
}
QString
CloudItem
::
filename
()
const
{
return
item_
->
filename
().
c_str
();
}
qint64
CloudItem
::
size
()
const
{
if
(
item_
->
size
()
==
IItem
::
UnknownSize
)
return
-
1
;
else
return
static_cast
<
qint64
>
(
item_
->
size
());
}
QString
CloudItem
::
timestamp
()
const
{
if
(
item_
->
timestamp
()
==
IItem
::
UnknownTimeStamp
)
return
""
;
else
{
auto
timestamp
=
std
::
chrono
::
system_clock
::
to_time_t
(
item_
->
timestamp
());
QDateTime
date
;
date
.
setTime_t
(
timestamp
);
return
date
.
toString
(
Qt
::
SystemLocaleShortDate
);
}
}
QString
CloudItem
::
type
()
const
{
QString
CloudItem
::
type
()
const
{
switch
(
item_
->
type
())
{
switch
(
item_
->
type
())
{
case
IItem
::
FileType
::
Unknown
:
case
IItem
::
FileType
::
Unknown
:
...
...
bin/cloudbrowser/src/CloudItem.h
View file @
2b6d2570
...
@@ -23,7 +23,8 @@ struct Provider {
...
@@ -23,7 +23,8 @@ struct Provider {
class
CloudItem
:
public
QObject
{
class
CloudItem
:
public
QObject
{
public:
public:
Q_PROPERTY
(
QString
filename
READ
filename
CONSTANT
)
Q_PROPERTY
(
QString
filename
READ
filename
CONSTANT
)
Q_PROPERTY
(
uint64_t
size
READ
size
CONSTANT
)
Q_PROPERTY
(
qint64
size
READ
size
CONSTANT
)
Q_PROPERTY
(
QString
timestamp
READ
timestamp
CONSTANT
)
Q_PROPERTY
(
QString
type
READ
type
CONSTANT
)
Q_PROPERTY
(
QString
type
READ
type
CONSTANT
)
CloudItem
(
const
Provider
&
,
cloudstorage
::
IItem
::
Pointer
,
CloudItem
(
const
Provider
&
,
cloudstorage
::
IItem
::
Pointer
,
...
@@ -32,7 +33,8 @@ class CloudItem : public QObject {
...
@@ -32,7 +33,8 @@ class CloudItem : public QObject {
cloudstorage
::
IItem
::
Pointer
item
()
const
{
return
item_
;
}
cloudstorage
::
IItem
::
Pointer
item
()
const
{
return
item_
;
}
const
Provider
&
provider
()
const
{
return
provider_
;
}
const
Provider
&
provider
()
const
{
return
provider_
;
}
QString
filename
()
const
;
QString
filename
()
const
;
uint64_t
size
()
const
{
return
item_
->
size
();
}
qint64
size
()
const
;
QString
timestamp
()
const
;
QString
type
()
const
;
QString
type
()
const
;
Q_INVOKABLE
bool
supports
(
QString
operation
)
const
;
Q_INVOKABLE
bool
supports
(
QString
operation
)
const
;
ListDirectoryCacheKey
key
()
const
;
ListDirectoryCacheKey
key
()
const
;
...
...
src/Utility/Item.cpp
View file @
2b6d2570
...
@@ -44,7 +44,7 @@ namespace cloudstorage {
...
@@ -44,7 +44,7 @@ namespace cloudstorage {
constexpr
size_t
IItem
::
UnknownSize
;
constexpr
size_t
IItem
::
UnknownSize
;
const
IItem
::
TimeStamp
IItem
::
UnknownTimeStamp
=
const
IItem
::
TimeStamp
IItem
::
UnknownTimeStamp
=
std
::
chrono
::
system_clock
::
time_point
::
min
(
);
std
::
chrono
::
system_clock
::
from_time_t
(
0
);
namespace
{
namespace
{
bool
find
(
const
std
::
string
*
array
,
int
length
,
std
::
string
str
)
{
bool
find
(
const
std
::
string
*
array
,
int
length
,
std
::
string
str
)
{
...
@@ -90,8 +90,8 @@ std::string Item::toString() const {
...
@@ -90,8 +90,8 @@ std::string Item::toString() const {
json
[
"filename"
]
=
filename
();
json
[
"filename"
]
=
filename
();
json
[
"type"
]
=
static_cast
<
int
>
(
type
());
json
[
"type"
]
=
static_cast
<
int
>
(
type
());
json
[
"id"
]
=
id
();
json
[
"id"
]
=
id
();
json
[
"timestamp"
]
=
json
[
"timestamp"
]
=
static_cast
<
Json
::
UInt64
>
(
st
atic_cast
<
Json
::
UInt64
>
(
timestamp
().
time_since_epoch
().
count
(
));
st
d
::
chrono
::
system_clock
::
to_time_t
(
timestamp
()
));
json
[
"size"
]
=
static_cast
<
Json
::
Int64
>
(
size
());
json
[
"size"
]
=
static_cast
<
Json
::
Int64
>
(
size
());
if
(
!
mime_type
().
empty
())
json
[
"mime_type"
]
=
mime_type
();
if
(
!
mime_type
().
empty
())
json
[
"mime_type"
]
=
mime_type
();
if
(
!
parents
().
empty
())
{
if
(
!
parents
().
empty
())
{
...
@@ -110,8 +110,7 @@ IItem::Pointer IItem::fromString(const std::string& str) {
...
@@ -110,8 +110,7 @@ IItem::Pointer IItem::fromString(const std::string& str) {
auto
item
=
util
::
make_unique
<
Item
>
(
auto
item
=
util
::
make_unique
<
Item
>
(
json
[
"filename"
].
asString
(),
json
[
"id"
].
asString
(),
json
[
"filename"
].
asString
(),
json
[
"id"
].
asString
(),
json
[
"size"
].
asInt64
(),
json
[
"size"
].
asInt64
(),
std
::
chrono
::
system_clock
::
time_point
(
std
::
chrono
::
system_clock
::
from_time_t
(
json
[
"timestamp"
].
asUInt64
()),
std
::
chrono
::
seconds
(
json
[
"timestamp"
].
asUInt64
())),
static_cast
<
IItem
::
FileType
>
(
json
[
"type"
].
asInt
()));
static_cast
<
IItem
::
FileType
>
(
json
[
"type"
].
asInt
()));
item
->
set_thumbnail_url
(
json
[
"thumbnail_url"
].
asString
());
item
->
set_thumbnail_url
(
json
[
"thumbnail_url"
].
asString
());
item
->
set_hidden
(
json
[
"hidden"
].
asBool
());
item
->
set_hidden
(
json
[
"hidden"
].
asBool
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment