Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
djrandom-py
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ale
djrandom-py
Commits
eed4cfe3
Commit
eed4cfe3
authored
13 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
add a faster MP3.get_many() method
parent
f4e9e40b
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
server/djrandom/frontend/views.py
+1
-1
1 addition, 1 deletion
server/djrandom/frontend/views.py
server/djrandom/model/mp3.py
+6
-0
6 additions, 0 deletions
server/djrandom/model/mp3.py
server/djrandom/test/test_model.py
+11
-0
11 additions, 0 deletions
server/djrandom/test/test_model.py
with
18 additions
and
1 deletion
server/djrandom/frontend/views.py
+
1
−
1
View file @
eed4cfe3
...
...
@@ -42,7 +42,7 @@ def autocomplete_search():
def
songs_fragment
():
hashes
=
request
.
form
.
get
(
'
h
'
,
''
)
if
hashes
:
mp3s
=
[
MP3
.
query
.
get
(
h
)
for
h
in
hashes
.
split
(
'
,
'
)
]
mp3s
=
MP3
.
get_many
(
hashes
.
split
(
'
,
'
)
)
else
:
mp3s
=
[]
return
render_template
(
'
songs_fragment.html
'
,
songs
=
mp3s
)
...
...
This diff is collapsed.
Click to expand it.
server/djrandom/model/mp3.py
+
6
−
0
View file @
eed4cfe3
...
...
@@ -69,6 +69,12 @@ class MP3(Base):
data
[
'
track_num
'
]
=
self
.
track_num
return
data
@classmethod
def
get_many
(
cls
,
hashes
):
order
=
dict
((
sha1
,
idx
)
for
idx
,
sha1
in
enumerate
(
hashes
))
mp3s
=
cls
.
query
.
filter
(
cls
.
sha1
.
in_
(
hashes
))
return
sorted
(
mp3s
,
key
=
lambda
x
:
order
[
x
.
sha1
])
def
mark_as_duplicate
(
self
,
duplicate_of
):
self
.
state
=
self
.
DUPLICATE
self
.
duplicate_of
=
duplicate_of
...
...
This diff is collapsed.
Click to expand it.
server/djrandom/test/test_model.py
+
11
−
0
View file @
eed4cfe3
...
...
@@ -75,6 +75,17 @@ class MP3Test(DbTestCase):
result_ids
=
set
(
x
.
sha1
for
x
in
results
)
self
.
assertEquals
(
set
([
'
1001
'
,
'
1002
'
]),
result_ids
)
def
test_mp3_get_many
(
self
):
for
i
in
range
(
1
,
4
):
mp3
,
_
=
create_mp3
(
unicode
(
i
))
Session
.
add
(
mp3
)
Session
.
commit
()
hashes
=
[
u
'
3
'
,
u
'
1
'
,
u
'
2
'
]
results
=
MP3
.
get_many
(
hashes
)
result_hashes
=
[
x
.
sha1
for
x
in
results
]
self
.
assertEquals
(
hashes
,
result_hashes
)
def
test_mp3_get_with_bad_metadata
(
self
):
pass
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment