replacement of configuration variable acquisition and use os.path.join for files
This commit is contained in:
parent
3aa76bb320
commit
1f92257ca8
@ -18,22 +18,24 @@ app.config.from_pyfile('config.py')
|
||||
|
||||
#### Variables ##################################################################################
|
||||
|
||||
DOSSIER_PERSO= app.config['DOSSIER_APP']
|
||||
DOSSIER_PUBLIC= app.config['DOSSIER_PUBLIC']+'/'
|
||||
extensionimg = app.config['EXT_IMG']
|
||||
DOSSIER_PERSO = app.config.get("DOSSIER_APP")
|
||||
DOSSIER_PUBLIC = app.config.get("DOSSIER_PUBLIC")
|
||||
extensionimg = app.config.get("EXT_IMG")
|
||||
|
||||
DATABASE = app.config['DATABASE']
|
||||
DATABASE = app.config.get("DATABASE")
|
||||
#################################################################################################
|
||||
|
||||
@mygallery.route( '/gallery/')
|
||||
@login_required
|
||||
def gallery():
|
||||
user ='%s' % escape(session['username'])
|
||||
check_and_create(DOSSIER_PUBLIC + user + '/images/')
|
||||
check_and_create(DOSSIER_PUBLIC + user + '/images/thumbnails/')
|
||||
check_and_create(DOSSIER_PERSO + user + '/images/')
|
||||
check_and_create(DOSSIER_PERSO + user + '/images/thumbnails/')
|
||||
THUMBNAILS=DOSSIER_PERSO + user + '/images/thumbnails/'
|
||||
print (DOSSIER_PUBLIC)
|
||||
print (os.path.join(DOSSIER_PUBLIC, user , 'images'))
|
||||
check_and_create(os.path.join(DOSSIER_PUBLIC, user , 'images'))
|
||||
check_and_create(os.path.join(DOSSIER_PUBLIC, user , 'images', 'thumbnails'))
|
||||
check_and_create(os.path.join(DOSSIER_PERSO , user , 'images'))
|
||||
check_and_create(os.path.join(DOSSIER_PERSO, user, 'images','thumbnails'))
|
||||
THUMBNAILS=os.path.join(DOSSIER_PERSO, user, 'images','thumbnails')
|
||||
fichiers = [fich for fich in os.listdir(THUMBNAILS)]
|
||||
return render_template('gallery.html',
|
||||
section='Gallery',
|
||||
@ -44,16 +46,16 @@ def gallery():
|
||||
@mygallery.route('/myfiles/images/<filename>')
|
||||
@login_required
|
||||
def myimg(filename):
|
||||
UTILISATEUR='%s' % escape(session['username'])
|
||||
user = '%s' % escape(session['username'])
|
||||
return send_from_directory(
|
||||
os.path.join(DOSSIER_PERSO, UTILISATEUR, 'images'), filename )
|
||||
os.path.join(DOSSIER_PERSO, user, 'images'), filename )
|
||||
|
||||
@mygallery.route('/myfiles/images/thumbnails/<filename>')
|
||||
@login_required
|
||||
def mythumbnails(filename):
|
||||
UTILISATEUR='%s' % escape(session['username'])
|
||||
user='%s' % escape(session['username'])
|
||||
return send_from_directory(
|
||||
os.path.join(DOSSIER_PERSO, UTILISATEUR, 'images/thumbnails'), filename )
|
||||
os.path.join(DOSSIER_PERSO, user, 'images','thumbnails'), filename )
|
||||
|
||||
@mygallery.route('/remove_privateImage/<filename>')
|
||||
@login_required
|
||||
@ -61,8 +63,8 @@ def remove_privateImage(filename):
|
||||
user = '%s' % escape(session['username'])
|
||||
filename = secure_filename(filename)
|
||||
try:
|
||||
os.remove(DOSSIER_PERSO + user + '/images/thumbnails/' + filename) # on le supprime
|
||||
os.remove(DOSSIER_PERSO + user + '/images/' + filename) # on le supprime
|
||||
os.remove(os.path.join(DOSSIER_PERSO, user, 'images','thumbnails', filename)) # on le supprime
|
||||
os.remove(os.path.join(DOSSIER_PERSO, user, 'images', filename)) # on le supprime
|
||||
except FileNotFoundError:
|
||||
flash(u'Image {filename} inexistante.'.format(filename=filename), 'error')
|
||||
return redirect(url_for('mygallery.gallery'))
|
||||
@ -74,8 +76,8 @@ def remove_publicImage(filename):
|
||||
user = '%s' % escape(session['username'])
|
||||
filename = secure_filename(filename)
|
||||
try:
|
||||
os.remove(DOSSIER_PUBLIC + user + '/images/thumbnails/' + filename) # on le supprime
|
||||
os.remove(DOSSIER_PUBLIC + user + '/images/' + filename) # on le supprime
|
||||
os.remove(os.path.join(DOSSIER_PUBLIC, user, 'images','thumbnails', filename)) # on le supprime
|
||||
os.remove(os.path.join(DOSSIER_PUBLIC, user, 'images', filename)) # on le supprime
|
||||
except FileNotFoundError:
|
||||
flash(u'Image {filename} inexistante.'.format(filename=filename), 'error')
|
||||
return redirect(url_for('mygallery.gallery'))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user