Merge branch 'sqlite-server' of https://github.com/yamanq/smearcar-db
This commit is contained in:
Kenneth Jao
commit
6eb93ec13a
2
SmearcarDB/.gitignore
vendored
2
SmearcarDB/.gitignore
vendored
@ -112,3 +112,5 @@ venv.bak/
|
||||
|
||||
# Other
|
||||
*.p
|
||||
*.txt
|
||||
*.db
|
||||
|
||||
@ -1,72 +1,219 @@
|
||||
import pickle
|
||||
from flask import Flask
|
||||
from flask import render_template, jsonify, request
|
||||
import ulid
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
import time
|
||||
|
||||
app = Flask(__name__)
|
||||
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///data.db'
|
||||
app.config.update(
|
||||
DEBUG=True,
|
||||
TEMPLATES_AUTO_RELOAD=True
|
||||
)
|
||||
db = SQLAlchemy(app)
|
||||
|
||||
try:
|
||||
with open("save.p", "rb") as f:
|
||||
database = pickle.load(f)
|
||||
# Can be commented out after non-id languages are all converted
|
||||
for item in database['values']:
|
||||
if not 'id' in item:
|
||||
item['id'] = ulid.new().str
|
||||
except (FileNotFoundError) as e:
|
||||
database = {'languages': [],
|
||||
'phonemes': [],
|
||||
'values': []}
|
||||
|
||||
def saveDatabase():
|
||||
# Save copy under separate name
|
||||
with open("newestsave.p", "wb") as f:
|
||||
pickle.dump(database, f)
|
||||
class Frequency(db.Model):
|
||||
language_id = db.Column(db.Integer, db.ForeignKey('language.id'), primary_key=True)
|
||||
phoneme_id = db.Column(db.Integer, db.ForeignKey('phoneme.id'), primary_key=True)
|
||||
value = db.Column(db.Float(6), nullable=False)
|
||||
phoneme = db.relationship('Phoneme')
|
||||
|
||||
|
||||
class Language(db.Model):
|
||||
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
|
||||
name = db.Column(db.String(100), nullable=False)
|
||||
source = db.Column(db.LargeBinary)
|
||||
phonemes = db.relationship('Frequency')
|
||||
|
||||
|
||||
class Phoneme(db.Model):
|
||||
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
|
||||
name = db.Column(db.String(5), nullable=False, unique=True)
|
||||
|
||||
|
||||
class Update(db.Model):
|
||||
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
|
||||
author = db.Column(db.String(30), nullable=False)
|
||||
title = db.Column(db.String(100), nullable=False)
|
||||
content = db.Column(db.Text, nullable=False)
|
||||
date = db.Column(db.BigInteger, nullable=False,
|
||||
default=int(time.time()*1000))
|
||||
|
||||
|
||||
def generate_key():
|
||||
pass
|
||||
|
||||
|
||||
class Editor(db.Model):
|
||||
id = db.Column(db.Integer, primary_key=True, autoincrement=True)
|
||||
description = db.Column(db.String(75), nullable=False)
|
||||
authority = db.Column(db.Integer, nullable=False, default=1)
|
||||
# 0: Full Access
|
||||
# 1: Edit values and Add files
|
||||
# 2: Edit values
|
||||
# 3: No Access
|
||||
|
||||
token = db.Column(db.String(32), nullable=False, default=generate_key)
|
||||
date = db.Column(db.BigInteger, nullable=False,
|
||||
default=int(time.time()*1000))
|
||||
|
||||
|
||||
def database():
|
||||
final = {'values': []}
|
||||
final['languages'] = [f.name for f in Language.query.all()]
|
||||
final['phonemes'] = [f.name for f in Phoneme.query.all()]
|
||||
for language in Language.query.all():
|
||||
languageobject = {'name': language.name,
|
||||
'source': language.source,
|
||||
'phonemes': {}}
|
||||
languageobject['name'] = language.name
|
||||
for frequency in language.phonemes:
|
||||
languageobject['phonemes'][frequency.phoneme.name] = frequency.value
|
||||
final['values'].append(languageobject)
|
||||
return final
|
||||
|
||||
|
||||
def phoneme_add(info):
|
||||
"""Add or edit value associated with phoneme."""
|
||||
# info = {
|
||||
# language_id: language_id,
|
||||
# phoneme: phoneme_name,
|
||||
# value: phoneme_value
|
||||
# }
|
||||
phoneme = Phoneme.query.filter_by(name=info['phoneme']).first()
|
||||
language = Language.query.filter_by(id=info['language_id']).first()
|
||||
if phoneme:
|
||||
link = Frequency.query.filter_by(
|
||||
language_id=language.id,
|
||||
phoneme_id=phoneme.id).first()
|
||||
link.value = info['value']
|
||||
else:
|
||||
phoneme = Phoneme(name=info['phoneme'])
|
||||
link = Frequency(value=info['value'])
|
||||
link.phoneme = phoneme
|
||||
language.phonemes.append(link)
|
||||
db.session.add_all([phoneme, link])
|
||||
|
||||
|
||||
def phoneme_remove(info):
|
||||
"""Remove a phoneme from a language."""
|
||||
# info = {
|
||||
# language_id: language_id,
|
||||
# phoneme_id: phoneme_id
|
||||
# }
|
||||
phoneme = Phoneme.query.filter_by(id=info['phoneme_id']).first()
|
||||
language = Language.query.filter_by(id=info['language_id']).first()
|
||||
frequency = Frequency.query.filter_by(
|
||||
phoneme_id=info['phoneme_id'], language_id=info['language_id']).first()
|
||||
|
||||
if Frequency.query.filter_by(phoneme_id=info['phoneme_id']).count() == 1:
|
||||
# Delete phoneme
|
||||
db.session.delete(phoneme)
|
||||
|
||||
language.phonemes = [frequency for frequency in language.phonemes
|
||||
if frequency.phoneme_id != info['phoneme_id']]
|
||||
db.session.delete(frequency)
|
||||
|
||||
|
||||
def language_name_edit(info):
|
||||
"""Edit the name of a Language."""
|
||||
# info = {
|
||||
# language_id: language_id,
|
||||
# language_name: name
|
||||
# }
|
||||
language = Language.query.filter_by(id=info['language_id']).first()
|
||||
language.name = info['language_name']
|
||||
|
||||
|
||||
def language_source_add(info):
|
||||
"""Add or replace a source"""
|
||||
# info = {
|
||||
# language_id: language_id,
|
||||
# language_source = source
|
||||
# }
|
||||
language = Language.query.filter_by(id=info['language_id']).first()
|
||||
language.source = info['language_source']
|
||||
|
||||
|
||||
patch_functions = {
|
||||
"phoneme_add": phoneme_add, # Add and edit value
|
||||
"phoneme_remove": phoneme_remove, # Remove association and/or phoneme
|
||||
"language_name_edit": language_name_edit, # Change language name
|
||||
"language_source_add": language_source_add # Add/edit source
|
||||
}
|
||||
|
||||
|
||||
# Render the client at the default URL
|
||||
@app.route("/")
|
||||
def initial():
|
||||
return render_template('index.html')
|
||||
|
||||
|
||||
# GET method for files
|
||||
@app.route("/server/<lang_id>")
|
||||
def file_return(lang_id):
|
||||
return Language.query.filter_by(id=lang_id).first().source
|
||||
|
||||
|
||||
# Place for client to communicate with the server
|
||||
@app.route("/server", methods=["GET", "POST", "PATCH"])
|
||||
# TODO add more methods
|
||||
def backend():
|
||||
# GET method returns the latest database
|
||||
if request.method == "GET":
|
||||
return jsonify(database)
|
||||
# # GET method returns the latest database
|
||||
# if request.method == "GET":
|
||||
# return jsonify(database())
|
||||
|
||||
# POST method appends input to database['values']
|
||||
elif request.method == "POST":
|
||||
newlanguage = request.get_json()
|
||||
newlanguage['id'] = ulid.new().str
|
||||
database['values'].append(newlanguage)
|
||||
if request.method == "POST":
|
||||
recieved = request.get_json()
|
||||
language = Language(name=recieved['name'], source=recieved['source'])
|
||||
db.session.add(language)
|
||||
|
||||
# Add new phonemes
|
||||
newphonemes = list(newlanguage[ 'phonemes' ])
|
||||
uniquephonemes = list(set(newphonemes) - set(database[ 'phonemes' ]))
|
||||
database['phonemes'] = database['phonemes'] + uniquephonemes
|
||||
|
||||
# Add new language
|
||||
newlangname = {newlanguage['name']}
|
||||
uniquelanguages = list(newlangname - set(database['languages']))
|
||||
database['languages'] = database['languages'] + uniquelanguages
|
||||
|
||||
saveDatabase()
|
||||
return jsonify(database)
|
||||
for phoneme, value in recieved['phonemes'].items():
|
||||
with db.session.no_autoflush:
|
||||
search = Phoneme.query.filter_by(name=phoneme).first()
|
||||
if not search:
|
||||
search = Phoneme(name=phoneme)
|
||||
db.session.add(search)
|
||||
link = Frequency(value=value, phoneme=search)
|
||||
language.phonemes.append(link)
|
||||
db.session.add(link)
|
||||
db.session.commit()
|
||||
# return jsonify(database())
|
||||
|
||||
# PATCH method inputs edited language and returns updated database
|
||||
elif request.method == "PATCH":
|
||||
newlanguage = request.get_json()
|
||||
database['values'] = [newlanguage if language['id'] == newlanguage['id'] else language for language in database['values']]
|
||||
saveDatabase()
|
||||
return jsonify(database)
|
||||
recieved = request.get_json()
|
||||
patch_functions[recieved['action']](recieved['data'])
|
||||
db.session.commit()
|
||||
|
||||
return jsonify(database())
|
||||
|
||||
|
||||
# Manipulate Updates
|
||||
@app.route("/updates", methods=["GET", "POST", "PATCH"])
|
||||
def updates():
|
||||
|
||||
if request.method == "POST":
|
||||
recieved = request.get_json()
|
||||
update = Update(author=recieved['author'],
|
||||
title=recieved['title'],
|
||||
content=recieved['content'])
|
||||
db.session.add(update)
|
||||
|
||||
elif request.method == "PATCH":
|
||||
update = Update.query.filter_by(id=recieved['id']).first()
|
||||
update.name = recieved['author']
|
||||
update.title = recieved['title']
|
||||
update.content = recieved['content']
|
||||
|
||||
db.session.commit()
|
||||
return jsonify([{"author": update.name,
|
||||
"id": update.id,
|
||||
"title": update.title,
|
||||
"content": update.content,
|
||||
"date": update.date}
|
||||
for update in Update.query.all()])
|
||||
|
||||
else:
|
||||
return
|
||||
|
||||
if __name__ == "__main__":
|
||||
app.run(host="0.0.0.0")
|
||||
|
||||
@ -24,6 +24,28 @@ var dropOp = {
|
||||
|
||||
var dropOpStore = {};
|
||||
|
||||
// Left This so that the post function can be reused
|
||||
|
||||
// function temporary(data) {
|
||||
// for(var i = 0; i < data.length; i++) {
|
||||
// $.ajax({
|
||||
// url: serverURL + '/server',
|
||||
// type: 'POST',
|
||||
// data: JSON.stringify(data[i]),
|
||||
// dataType: "json",
|
||||
// contentType: 'application/json;charset=UTF-8'
|
||||
// })
|
||||
// .then(
|
||||
// function success(data) {
|
||||
// console.log(data);
|
||||
// },
|
||||
// function error(e) {
|
||||
// console.log(e);
|
||||
// }
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
|
||||
function createNav() {
|
||||
for (var i = 0; i < navi.length; i++) { // Create navigation tabs.
|
||||
var side = document.getElementById("sidebar");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user