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
M
mp3wavweb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
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
mp3wavweb
mp3wavweb
Commits
3c1bde8b
Commit
3c1bde8b
authored
Mar 03, 2014
by
Per Cederqvist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use UTF-8 when accessing the file system.
parent
9fefd2e3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
mp3wavweb.py
mp3wavweb.py
+7
-5
wav2mp3d.py
wav2mp3d.py
+7
-6
No files found.
mp3wavweb.py
View file @
3c1bde8b
...
...
@@ -165,14 +165,14 @@ class PathHandler(object):
path_parts
=
self
.
path_parts
(
ext_override
)
real_file
=
os
.
path
.
join
(
mp3wavcfg
.
BASE
,
*
path_parts
)
try
:
return
os
.
stat
(
real_file
),
real_file
return
os
.
stat
(
real_file
.
encode
(
"utf-8"
)
),
real_file
except
FileNotFoundError
:
pass
if
self
.
extension
(
ext_override
)
==
".mp3"
:
mp3file
=
os
.
path
.
join
(
mp3wavcfg
.
BASE
,
"mp3-cache"
,
*
path_parts
)
try
:
return
os
.
stat
(
mp3file
),
mp3file
return
os
.
stat
(
mp3file
.
encode
(
"utf-8"
)
),
mp3file
except
FileNotFoundError
:
pass
...
...
@@ -221,7 +221,9 @@ def handle_directory(environ, start_response, ph, real_dir):
mp3s
=
{}
dirs
=
set
()
for
fn
in
os
.
listdir
(
real_dir
):
for
fn
in
os
.
listdir
(
real_dir
.
encode
(
"utf-8"
)):
fn
=
fn
.
decode
(
"utf-8"
)
# Don't expose the cache directory directly.
if
fn
==
"mp3-cache"
:
...
...
@@ -229,7 +231,7 @@ def handle_directory(environ, start_response, ph, real_dir):
realfile
=
os
.
path
.
join
(
real_dir
,
fn
)
try
:
status
=
os
.
stat
(
realfile
)
status
=
os
.
stat
(
realfile
.
encode
(
"utf-8"
)
)
except
os
.
error
:
continue
...
...
@@ -299,7 +301,7 @@ def handle_file(environ, start_response, ph, real_file):
start_response
(
"403 Forbidden"
,
[])
return
[]
file
=
open
(
real_file
,
"r"
)
file
=
open
(
real_file
.
encode
(
"utf-8"
)
,
"r"
)
start_response
(
"200 OK"
,
[(
"Content-Type"
,
content_type
)])
if
'wsgi.file_wrapper'
in
environ
:
...
...
wav2mp3d.py
View file @
3c1bde8b
...
...
@@ -54,7 +54,7 @@ def work():
handle_message
(
sock
,
msg
)
def
exists
(
fn
):
return
os
.
path
.
isfile
(
os
.
path
.
join
(
mp3wavcfg
.
BASE
,
fn
))
return
os
.
path
.
isfile
(
os
.
path
.
join
(
mp3wavcfg
.
BASE
,
fn
)
.
encode
(
"utf-8"
)
)
def
handle_message
(
client
,
msg
):
global
queue
...
...
@@ -96,14 +96,14 @@ def encode(fn):
result_file
=
os
.
path
.
join
(
mp3wavcfg
.
BASE
,
"mp3-cache"
,
fn
+
".mp3"
)
result_dir
=
os
.
path
.
dirname
(
result_file
)
try
:
os
.
makedirs
(
result_dir
)
os
.
makedirs
(
result_dir
.
encode
(
"utf-8"
)
)
except
os
.
error
as
e
:
if
e
.
errno
!=
errno
.
EEXIST
:
raise
cmd
=
[
"lame"
,
"--preset"
,
"standard"
,
"--nohist"
,
os
.
path
.
join
(
mp3wavcfg
.
BASE
,
fn
+
".wav"
),
result_file
+
".tmp"
]
os
.
path
.
join
(
mp3wavcfg
.
BASE
,
fn
+
".wav"
)
.
encode
(
"utf-8"
)
,
(
result_file
+
".tmp"
).
encode
(
"utf-8"
)
]
lame
=
subprocess
.
Popen
(
args
=
cmd
,
bufsize
=
0
,
stdin
=
subprocess
.
DEVNULL
,
stderr
=
subprocess
.
PIPE
)
percent_match
=
re
.
compile
(
".*
\\
(([0-9]+)%
\\
)"
)
...
...
@@ -117,10 +117,11 @@ def encode(fn):
c
.
send
((
"progress"
,
m
.
group
(
1
)))
x
=
lame
.
wait
()
if
x
==
0
:
os
.
rename
(
result_file
+
".tmp"
,
result_file
)
os
.
rename
((
result_file
+
".tmp"
).
encode
(
"utf-8"
),
result_file
.
encode
(
"utf-8"
))
else
:
try
:
os
.
remove
(
result_file
+
".tmp"
)
os
.
remove
(
(
result_file
+
".tmp"
).
encode
(
"utf-8"
)
)
except
OSError
:
pass
sys
.
exit
(
x
)
...
...
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