Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
13891a03
Commit
13891a03
authored
Apr 13, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor Blob and add BlobViewer::Base
parent
7f625f06
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
151 additions
and
56 deletions
+151
-56
app/models/blob.rb
app/models/blob.rb
+70
-56
app/models/blob_viewer/base.rb
app/models/blob_viewer/base.rb
+81
-0
No files found.
app/models/blob.rb
View file @
13891a03
...
@@ -3,8 +3,10 @@ class Blob < SimpleDelegator
...
@@ -3,8 +3,10 @@ class Blob < SimpleDelegator
CACHE_TIME
=
60
# Cache raw blobs referred to by a (mutable) ref for 1 minute
CACHE_TIME
=
60
# Cache raw blobs referred to by a (mutable) ref for 1 minute
CACHE_TIME_IMMUTABLE
=
3600
# Cache blobs referred to by an immutable reference for 1 hour
CACHE_TIME_IMMUTABLE
=
3600
# Cache blobs referred to by an immutable reference for 1 hour
# The maximum size of an SVG that can be displayed.
MAXIMUM_TEXT_HIGHLIGHT_SIZE
=
1
.
megabyte
MAXIMUM_SVG_SIZE
=
2
.
megabytes
RICH_VIEWERS
=
[
].
freeze
attr_reader
:project
attr_reader
:project
...
@@ -43,82 +45,94 @@ class Blob < SimpleDelegator
...
@@ -43,82 +45,94 @@ class Blob < SimpleDelegator
end
end
def
no_highlighting?
def
no_highlighting?
size
&&
size
>
1
.
megabyte
size
&&
size
>
MAXIMUM_TEXT_HIGHLIGHT_SIZE
end
end
def
only_display_raw
?
def
too_large
?
size
&&
truncated?
size
&&
truncated?
end
end
def
extension
def
raw_size
extname
.
downcase
.
delete
(
'.'
)
if
valid_lfs_pointer?
lfs_size
else
size
end
end
end
def
svg?
def
raw_binary?
text?
&&
language
&&
language
.
name
==
'SVG'
if
valid_lfs_pointer?
!
rich_viewer
&
.
text_based?
else
binary?
end
end
end
def
pdf?
def
extension
extension
==
'pdf'
@extension
||=
extname
.
downcase
.
delete
(
'.'
)
end
end
def
ipython_notebook
?
def
video
?
text?
&&
language
&
.
name
==
'Jupyter Notebook'
UploaderHelper
::
VIDEO_EXT
.
include?
(
extension
)
end
end
def
sketch
?
def
readable_text
?
binary?
&&
extension
==
'sketch'
text?
&&
!
valid_lfs_pointer?
&&
!
too_large?
end
end
def
stl
?
def
valid_lfs_pointer
?
extension
==
'stl'
lfs_pointer?
&&
project
.
lfs_enabled?
end
end
def
markup
?
def
invalid_lfs_pointer
?
text?
&&
Gitlab
::
MarkupHelper
.
markup?
(
name
)
lfs_pointer?
&&
!
project
.
lfs_enabled?
end
end
def
size_within_svg_limits?
def
simple_viewer_class
size
<=
MAXIMUM_SVG_SIZE
if
empty?
BlobViewer
::
Empty
elsif
raw_binary?
BlobViewer
::
Download
else
# text
BlobViewer
::
Text
end
end
end
def
video?
def
rich_viewer_class
UploaderHelper
::
VIDEO_EXT
.
include?
(
extname
.
downcase
.
delete
(
'.'
))
if
invalid_lfs_pointer?
||
empty?
end
nil
def
to_partial_path
(
project
)
if
lfs_pointer?
if
project
.
lfs_enabled?
'download'
else
'text'
end
elsif
image?
'image'
elsif
svg?
'svg'
elsif
pdf?
'pdf'
elsif
ipython_notebook?
'notebook'
elsif
sketch?
'sketch'
elsif
stl?
'stl'
elsif
markup?
if
only_display_raw?
'too_large'
else
'markup'
end
elsif
text?
if
only_display_raw?
'too_large'
else
'text'
end
else
else
'download'
rich_viewers_classes
.
find
{
|
viewer_class
|
viewer_class
.
can_render?
(
self
)
}
end
end
def
simple_viewer
@simple_viewer
||=
simple_viewer_class
.
new
(
self
)
end
def
rich_viewer
return
@rich_viewer
if
defined?
(
@rich_viewer
)
@rich_viewer
||=
rich_viewer_class
&
.
new
(
self
)
end
def
rendered_as_text?
(
override_max_size:
false
)
simple_viewer
.
is_a?
(
BlobViewer
::
Text
)
&&
!
simple_viewer
.
render_error
(
override_max_size:
override_max_size
)
end
def
show_viewer_switcher?
simple_viewer
.
is_a?
(
BlobViewer
::
Text
)
&&
rich_viewer
end
private
def
rich_viewers_classes
if
valid_lfs_pointer?
RICH_VIEWERS
elsif
binary?
RICH_VIEWERS
.
reject
(
&
:text_based?
)
else
# text
RICH_VIEWERS
.
select
(
&
:text_based?
)
end
end
end
end
end
end
app/models/blob_viewer/base.rb
0 → 100644
View file @
13891a03
module
BlobViewer
class
Base
class_attribute
:partial_name
,
:type
,
:extensions
,
:client_side
,
:text_based
,
:switcher_icon
,
:switcher_title
,
:max_size
,
:absolute_max_size
delegate
:partial_path
,
:rich?
,
:simple?
,
:client_side?
,
:text_based?
,
to: :class
attr_reader
:blob
def
initialize
(
blob
)
@blob
=
blob
end
def
self
.
partial_path
"projects/blob/viewers/
#{
partial_name
}
"
end
def
self
.
rich?
type
==
:rich
end
def
self
.
simple?
type
==
:simple
end
def
self
.
client_side?
client_side
end
def
server_side?
!
client_side?
end
def
self
.
text_based?
text_based
end
def
self
.
can_render?
(
blob
)
!
extensions
||
extensions
.
include?
(
blob
.
extension
)
end
def
can_override_max_size?
too_large?
&&
!
too_large?
(
override_max_size:
true
)
end
def
relevant_max_size
if
too_large?
(
override_max_size:
true
)
absolute_max_size
elsif
too_large?
max_size
end
end
def
render_error
(
override_max_size:
false
)
if
too_large?
(
override_max_size:
override_max_size
)
:too_large
elsif
server_side_but_stored_in_lfs?
:server_side_but_stored_in_lfs
end
end
def
prepare!
if
server_side?
&&
blob
.
project
blob
.
load_all_data!
(
blob
.
project
.
repository
)
end
end
private
def
too_large?
(
override_max_size:
false
)
if
override_max_size
blob
.
raw_size
>
absolute_max_size
else
blob
.
raw_size
>
max_size
end
end
def
server_side_but_stored_in_lfs?
!
client_side?
&&
blob
.
valid_lfs_pointer?
end
end
end
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