ADDED aside.py Index: aside.py ================================================================== --- aside.py +++ aside.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python3 +#-*- coding: utf-8 -*- + +import re, configparser, json, signal +from urllib import request, parse + +YANDEX_TRANSLATE_JSON = "http://translate.yandex.net/api/v1/tr.json/translate?" +YANDEX_SPELL_JSON = "http://speller.yandex.net/services/spellservice.json/checkText?" +TEST_CONNECT = "http://ya.ru/" +CHECK_MANY_SPACE = re.compile(r"\s+") +DEFCTEST = 10 + +def get_config_data(filename): + global DEFCTEST + result = {'database': None, 'defuser': None, 'defctest': DEFCTEST, 'debug': False} + config = configparser.ConfigParser() + try: + config.read(filename) + for sec in config.sections(): + if 'dbname' in config[sec]: + result['database'] = config[sec]['dbname'] + if 'default_user' in config[sec]: + result['defuser'] = config[sec]['default_user'] + if 'test_count' in config[sec]: + result['defctest'] = int(config[sec]['test_count']) + if 'debug' in config[sec]: + result['debug'] = config[sec].getboolean('debug') + except (ValueError, KeyError, IndexError, TypeError) as er: + pass + return result + +def prepare_str(input_str): + global CHECK_MANY_SPACE + result = CHECK_MANY_SPACE.sub(" ", input_str.strip()) + return result + +def get_command(raw_str): + result = prepare_str(raw_str) + # return [command, str_params] + command = result.split(" ", 1) + if len(command) == 1: + command.append([]) + return command + +def get_translate(for_translate, trans_type): + global YANDEX_TRANSLATE_JSON + result = False + prepate_url = request.pathname2url(for_translate) + trans_types = {'en': 'en-ru', 'ru': 'ru-en'} + params = {'lang': trans_types[trans_type], 'text': for_translate} + prepate_url = parse.urlencode(params, encoding="utf-8") + try: + conn = request.urlopen(YANDEX_TRANSLATE_JSON + prepate_url) + except Exception as e: + print("Not connection\nError:") + print(e) + return result + if conn.status == 200: + try: + from_url = conn.read().decode('utf-8') + result = json.loads(from_url) + except Exception as e: + print(e) + conn.close() + return result + +def check_spell(for_spelling, spell_type='en'): + global YANDEX_SPELL_JSON + result = False + # options = IGNORE_DIGITS(2) + IGNORE_DIGITS(4) + IGNORE_CAPITALIZATION(512) + [BY_WORDS(256)] + params = {'lang': spell_type, 'text': for_spelling, 'format': 'plane', 'options': 518} + prepate_url = parse.urlencode(params, encoding="utf-8") + erro_codes = ("ERROR_UNKNOWN_WORD", + "ERROR_REPEAT_WORD", + "ERROR_CAPITALIZATION", + "ERROR_TOO_MANY_ERRORS") + try: + conn = request.urlopen(YANDEX_SPELL_JSON + prepate_url, None, 1) + if conn.status == 200: + from_url = conn.read().decode('utf-8') + result = json.loads(from_url) + except Exception as e: + print("Not connection\nError: ".format(e)) + return result + else: + conn.close() + if len(result) > 0: + print("Spelling: ", end="") + for_result = [] + for res in result: + for_result.append("{0} -> {1}".format(res['word'], res['s'])) + print("; ".join(for_result)) + return 0 + +def get_test_connection(): + global TEST_CONNECT + print("check connection...") + try: + conn = request.urlopen(TEST_CONNECT) + result = True if conn.getcode() == 200 else False + except Exception as e: + print('Test connection False,', e) + return False + conn.close() + return result + +def check_ans(answer, enter): + global CHECK_MANY_SPACE + a1 = CHECK_MANY_SPACE.sub(" ", answer.lower().strip()) + a2 = CHECK_MANY_SPACE.sub(" ", enter.lower().strip()) + return (a1 == a2) ADDED condt.conf Index: condt.conf ================================================================== --- condt.conf +++ condt.conf @@ -0,0 +1,8 @@ +[database] +dbname=db.sqlite +# developing mode (on/off, 1/0, yes/no) +debug=yes + +[user] +default_user=test +test_count=10 ADDED condt.py Index: condt.py ================================================================== --- condt.py +++ condt.py @@ -0,0 +1,749 @@ +#!/usr/bin/env python3 +#-*- coding: utf-8 -*- + +import sqlite3, hashlib, getpass, datetime, csv, random +from aside import * + +# please, change this stirg for your application +SALT = 'r8Uts$jLs74Lgh49_h75&w@dFsS4sgpm3Kqq[' +EXPORT_NAME = 'condict_export_' +TEST_NUM = 5 +DEBUG = False + +class IncorrectDbData(Exception): pass +class DublicationDbData(Exception): pass + +class BaseConDict(object): + """Base Console Dictionary class""" + def __init__(self, name, dbfile, debug): + global DEBUG + DEBUG = debug + self.connect = sqlite3.connect(dbfile) + self.online = False + self.name = name + def __repr__(self): + return "".format(self.name) + def __str__(self): + return "".format(self.name) + def __bool__(self): + valid = True if self.user_id else False + return valid + def __del__(self): + self.connect.close() + def prer(self, error): + global DEBUG + if DEBUG: print(error) + +class Condt(BaseConDict): + """Condt - class for ConDict""" + COMMANDS = {'.help': {'desc': 'list commands', 'command': None, + 'full': 'output list commands'}, + '.chname': {'desc': 'change current user name', 'command': None, + 'full': 'change current info: login and name'}, + '.chpassword': {'desc': 'change current password', 'command': None, + 'full': 'change password for current password'}, + '.list': {'desc': 'list users words', 'command': None, + 'full': 'list user words/patterns, ".list" or ".list pattern"'}, + '.en': {'desc': 'dictionary mode English to Russian', 'command': None, + 'full': 'yandex translate English to Russian'}, + '.ru': {'desc': 'dictionary mode Russian to English', 'command': None, + 'full': 'yandex translate Russian to English'}, + '.add': {'desc': 'add new words', 'command': None, + 'full': 'add new word/pattern'}, + '.connect': {'desc': 'test connection', 'command': None, + 'full': 'test internet connection'}, + '.export': {'desc': 'export user dictionary', 'command': None, + 'full': 'export user dictionary to CSV file, encoding UTF-8'}, + '.import': {'desc': 'import user dictionary', 'command': None, + 'full': 'import user dictionary from CSV file, encoding UTF-8'}, + '.edit': {'desc': 'edit words', 'command': None, + 'full': 'edit word/pattern, search by ID ".edit ID"'}, + '.delete': {'desc': 'delete words', 'command': None, + 'full': 'delete word/pattern, search by ID, ".delete ID"'}, + '.exit': {'desc': 'quit from program', 'command': None, + 'full': 'quit form program'}, + '.test': {'desc': 'start test (default en)', 'command': None, + 'full': 'start en-ru test'}, + '.testru': {'desc': 'start ru-test', 'command': None, + 'full': 'start ru-en test'}, + '.testmix': {'desc': 'start en-ru test', 'command': None, + 'full': 'start mix test'}, + '.testinfo': {'desc': 'information by test', 'command': None, + 'full': 'full test information by test ID'}, + '.testlist': {'desc': 'list of tests', 'command': None, + 'full': 'this command print list of your tests'}, + '.info': {'desc': 'information about dictionary', 'command': None, + 'full': 'print information: user info, dictionary info, test info'}, + } + def __init__(self, name, dbfile, debug, ctest=10): + super().__init__(name, dbfile, debug) + self.__pcounter = 3 + self.ctest = ctest + self.init_command() + self.user_id = self.get_user() + self.command_connect() + + def get_user(self): + """get user ID by name and password""" + sqlstr="SELECT id FROM user WHERE name=(?) AND password=(?)" + cur = self.connect.cursor() + ch_user_id = self.check_name(cur) + if ch_user_id: + ch_user_id = ch_user_id + user_id = self.handling_action(cur, ch_user_id) + else: + user_id = self.handling_add(cur) + cur.close() + return user_id + + def init_command(self): + """commands list""" + self.COMMANDS['.help']['command'] = self.command_help + self.COMMANDS['.exit']['command'] = self.command_exit + self.COMMANDS['.chname']['command'] = self.command_chname + self.COMMANDS['.chpassword']['command'] = self.command_chpassword + self.COMMANDS['.list']['command'] = self.command_list + self.COMMANDS['.en']['command'] = self.command_en + self.COMMANDS['.ru']['command'] = self.command_ru + self.COMMANDS['.add']['command'] = self.command_add + self.COMMANDS['.connect']['command'] = self.command_connect + self.COMMANDS['.export']['command'] = self.command_export + self.COMMANDS['.import']['command'] = self.command_import + self.COMMANDS['.edit']['command'] = self.command_edit + self.COMMANDS['.delete']['command'] = self.command_delete + self.COMMANDS['.test']['command'] = self.command_testen + self.COMMANDS['.testru']['command'] = self.command_testru + self.COMMANDS['.testmix']['command'] = self.command_testmix + self.COMMANDS['.testlist']['command'] = self.command_testlist + self.COMMANDS['.testinfo']['command'] = self.command_testinfo + self.COMMANDS['.info']['command'] = self.command_info + + def hash_pass(self, password): + """create password hash: text => hast string""" + result = bytes(password.strip() + SALT, 'utf-8') + result = bytes(hashlib.md5(result).hexdigest(), 'utf-8') + return hashlib.sha1(result).hexdigest() + + def check_name(self, cur): + """get user id by name - unique field""" + uid = None + try: + cur.execute("SELECT id FROM user WHERE name=(?)", (self.name,)) + uid = cur.fetchone() + if uid: uid = uid[0] + except (sqlite3.DatabaseError, IndexError) as er: + self.prer(er) + return None + return uid + + def check_password(self, cur, user_id, password): + """check password""" + try: + cur.execute("SELECT id FROM user WHERE id=(?) AND password=(?)", (user_id, self.hash_pass(password))) + except sqlite3.DatabaseError as er: + self.prer(er) + return None + return cur.fetchone() + + def handling_action(self, cur, ch_user_id): + """password request""" + print('"{0}", please enter your password:'.format(self.name)) + self.password = input("Password:") if DEBUG else getpass.getpass() + while(self.__pcounter > 0): + user_id = self.check_password(cur, ch_user_id, self.password) + if user_id: + return user_id[0] + else: + action = input('Invalid password, there are actions "Exit"/"Press password again" [e/P]:') + if action in ('', 'P', 'p'): + self.__pcounter -= 1 + self.password = input("Password:") if DEBUG else getpass.getpass() + elif action in ('e', 'E'): + break + else: + print('select an option...') + return None + + def handling_add(self, cur): + """add new user, if not found name""" + while(True): + want_add = input('Are you want add new user? [Y/n]') + if want_add in ('', 'y', 'Y'): + name = input("You login [{0}]:".format(self.name)) + if name == '': + name = self.name + fullname = input("You full name (optional):") + password = input("Password:") if DEBUG else getpass.getpass() + transaction_ok = False + try: + with self.connect: + cur.execute("INSERT INTO user (name, password, full) VALUES (?,?,?)", (name, self.hash_pass(password), fullname)) + except sqlite3.DatabaseError as er: + print('Incorrect information, change data') + continue + if cur.rowcount == -1: + print('Incorrect information, change data') + continue + self.name = name + self.password = self.hash_pass(password) + return cur.lastrowid + elif want_add in ('n', 'N'): + break + else: + print('select an option...') + return None + + def handling_command(self, command): + """parser for user command""" + command, arg = get_command(command) + if command not in self.COMMANDS.keys(): + # call en-ru translate + if command == '' or command[0] == '.': return None + arg = command + ' ' + arg if arg else command + result = self.COMMANDS['.en']['command'](arg) + else: + result = self.COMMANDS[command]['command'](arg) + return result + + def command_help(self, arg=None): + """callback for .help command""" + if arg: + s = '.' + arg + result = self.COMMANDS.get(s) + if result: + print("'{0}'\t{1}".format(s,result['full'])) + else: + print('not found, use ".help"') + else: + for key, item in self.COMMANDS.items(): + print("{0:.<30}{1}".format(key, item['desc'])) + return 'help' + + def command_exit(self, arg=None): + # pass + return 0 + + def command_chname(self, arg=None): + """change user name""" + cur = self.connect.cursor() + while(True): + name = input("You login:") + fullname = input("You full name (optional):") + try: + if name == '': + raise IncorrectDbData() + with self.connect: + cur.execute("UPDATE user SET name=(?), full=(?) WHERE id=(?)", (name, fullname, self.user_id)) + except (sqlite3.DatabaseError, IncorrectDbData) as er: + print('Incorrect information, change data') + e = input('Do you wand exit from name update [N/y]?') + if e in ('y', 'Y'): + break + continue + self.name = name + print("You name updated successfully") + break + cur.close() + return 'chname' + + def command_chpassword(self, arg=None): + """change user password""" + cur = self.connect.cursor() + while(True): + password_old = input("Old password:") if DEBUG else getpass.getpass() + try: + if self.check_password(cur, self.user_id, password_old): + password1 = input("New password:") if DEBUG else getpass.getpass() + password2 = input("New password again:") if DEBUG else getpass.getpass() + if password1 != password2: + raise IncorrectDbData() + else: + with self.connect: + cur.execute("UPDATE user SET password=(?) WHERE id=(?)", (self.hash_pass(password1), self.user_id)) + else: + raise IncorrectDbData() + except (sqlite3.DatabaseError, IncorrectDbData) as er: + print('Incorrect information, please change data') + e = input('Do you wand exit from password update [N/y]?') + if e in ('y', 'Y'): + break + continue + self.password = password1 + print("You password updated successfully") + break + cur.close() + return 'chpassword' + + def command_en(self, text): + """en-ru translate""" + print(self.command_enru(text, 'en')) + return 'en' + def command_ru(self, text): + """ru-en translate""" + print(self.command_enru(text, 'ru')) + return 'ru' + def command_enru(self, text, tr_type): + """translate, only with online""" + global DEBUG + # found in offline DB + alreadyEx = self.alreadyex(text, tr_type) + if alreadyEx: + if DEBUG: print("[offline]") + return alreadyEx[0] + if not self.online: + return "Offline, please test connect with '.connect' command" + check_spell(text, tr_type) + result = get_translate(text, tr_type) + if not result or result['code'] != 200: + self.command_connect() + return "Error, not foud translate" + return result['text'] + + def command_list(self, pattern=None): + """print user dictionary""" + cur = self.connect.cursor() + sql_list = "SELECT `translate`.`id`, `term`.`en`, `translate`.`rus`, `progress`.`all`, `progress`.`error` FROM `translate` LEFT JOIN `term` ON (`translate`.`term`=`term`.`token`) LEFT JOIN `progress` ON (`progress`.`translate_id`=`translate`.`id`) WHERE `translate`.`user_id`=(?) " + params = (self.user_id,) + result_text, result_param = "Get {0} rows", [0] + if pattern: + sql_list += " AND `term`.`en` LIKE (?)" + params = (self.user_id, pattern + '%') + result_text = "Get {0} rows for pattern '{1}%'" + result_param.append(pattern) + sql_list += " ORDER BY `translate`.`created` DESC, `term`.`token`" + try: + cur.execute(sql_list, params) + i = 1 + for row in cur.fetchall(): + print("{0}. ID={1} all {2}, error {3}".format(i, row[0], row[3], row[4])) + print("\t(en) {0}\n\t(ru) {1}".format(row[1], row[2])) + i +=1 + result_param[0] = i - 1 + print(result_text.format(*result_param)) + except (sqlite3.DatabaseError, IncorrectDbData) as er: + print('Sorry, error') + return 'list' + cur.close() + return 'list' + + def check_default(self, defaultVar, addStr=''): + result = input(addStr + ' [' + defaultVar + ']:') if defaultVar else input(addStr +': ') + if not result: + if not defaultVar: + raise IncorrectDbData() + else: + result = defaultVar + return prepare_str(result) + + def command_add(self, en_words=None): + """add new user pattern""" + cur = self.connect.cursor() + print('Please enter your patterns:') + while True: + try: + en = self.check_default(en_words, 'En') + # check en translate + if self.alreadyex(en): raise DublicationDbData + # get translate + try: + ru_words = self.command_enru(en, 'en')[0] + except Exception as e: + if DEBUG: print(e) + ru_words = None + ru = self.check_default(ru_words, 'Ru') + with self.connect: + translate_id = self.command_add_kinds(cur, en, ru) + except DublicationDbData: + print('Words already contained in database. For search use ".list {0}"'.format(en)) + break + except (sqlite3.DatabaseError, IncorrectDbData) as er: + self.prer(er) + print('Incorrect information, change data') + ent = input('Do you wand enter new words [Y/n]?') + if ent in ('n', 'N'): + break + continue + # may be use "else" + print("Words added successfully, ID={0}".format(translate_id)) + break + cur.close() + return 'add' + + def alreadyex(self, enru, typetr='en'): + """check en words in DB""" + cur = self.connect.cursor() + if typetr == 'en': + addstr = "SELECT `rus` FROM `translate` WHERE `term`=(?) AND `user_id`=(?)" + params = (hashlib.md5(bytes(enru, 'utf-8')).hexdigest(), self.user_id) + else: + addstr = "SELECT `term`.`en` FROM `translate` LEFT JOIN `term` ON (`translate`.`term`=`term`.`token`) WHERE `translate`.`rus` LIKE (?) AND `translate`.`user_id`=(?) LIMIT 1;" + params = (prepare_str(enru), self.user_id) + cur.execute(addstr, params) + result = cur.fetchone() + cur.close() + return result + + def command_add_kinds(self, cur, en, ru): + """SQL queries for add-command""" + token = hashlib.md5(bytes(en, 'utf-8')).hexdigest() + # search token + sql_list = "SELECT `token` FROM `term` WHERE `token`=(?)" + cur.execute(sql_list, (token,)) + if not cur.fetchone(): + # insert in to tables + sql_list1 = "INSERT INTO `term` (`token`, `en`) VALUES ((?), (?))" + cur.execute(sql_list1, (token, prepare_str(en))) + # done in self.alreadyex + # cur.execute("SELECT `id` FROM `translate` WHERE `term`=(?) AND `user_id`=(?)", (token, self.user_id)) + # if cur.fetchone(): raise DublicationDbData() + # add translate row + sql_list2 = "INSERT INTO `translate` (`term`, `user_id`, `rus`) VALUES (?, ?, ?)" + cur.execute(sql_list2, (token, self.user_id, prepare_str(ru))) + translate_id = cur.lastrowid + # add progress row + sql_list3 = "INSERT INTO `progress` (`translate_id`) VALUES (?)" + cur.execute(sql_list3, (translate_id,)) + return translate_id + + def command_export(self, arg=None): + """export all user dictionary in CSV file""" + global EXPORT_NAME, DEBUG + if arg: + export_name = arg + else: + d = datetime.date.today() + export_name = EXPORT_NAME + d.strftime("%Y_%m_%d") + ".csv" + try: + cur = self.connect.cursor() + writer_csv = csv.writer(open(export_name, 'w', newline='', encoding='utf-8'), dialect='excel', delimiter=';', quoting=csv.QUOTE_ALL) + writer_csv.writerow(['ENGLISH','RUSSIAN']) + sql_list = "SELECT `term`.`en`, `translate`.`rus` FROM `translate` LEFT JOIN `term` ON (`translate`.`term`=`term`.`token`) WHERE `translate`.`user_id`=(?) ORDER BY `term`.`en`, `translate`.`rus`" + cur.execute(sql_list, (self.user_id,)) + results = cur.fetchall() + for result in results: + writer_csv.writerow(result) + except Exception as er: + self.prer(er) + print("Export error") + else: + print("Export finished, successfully export {0} record(s) to file: {1}".format(len(results), export_name)) + cur.close() + return 'export' + + def command_edit(self, translate_id): + """Edit translate words form DB, search by ID""" + # search id + cur = self.connect.cursor() + try: + translate_id = int(translate_id) + result = self.check_user_translate(cur, translate_id) + if not result: + raise IncorrectDbData() + else: + result = result[0] + # enter en-ru + en = input('En [' + result[0] + ']:') + if not en: en = result[0] + ru = input('Ru [' + result[1] + ']:') + if not ru: ru = result[1] + # new token + need_del = False + token = hashlib.md5(bytes(en, 'utf-8')).hexdigest() + with self.connect: + if token != result[2]: + cur.execute("INSERT INTO `term` (`token`, `en`) VALUES ((?), (?))", (token, prepare_str(en))) + need_del = True + # translate + cur.execute("UPDATE `translate` SET `rus`=(?), `term`=(?) WHERE `term`=(?) AND `user_id`=(?)", (prepare_str(ru), token, result[2], self.user_id)) + # delete recodrs in term if it needed + if need_del: + cur.execute("SELECT `id` FROM `translate` WHERE `term`=(?) LIMIT 1", (result[2],)) + if not cur.fetchone(): cur.execute("DELETE FROM `term` WHERE `token`=(?)", (result[2],)) + except IncorrectDbData as e: + self.prer(er) + print('Record not found for current user.') + except (TypeError, ValueError, sqlite3.DatabaseError) as er: + self.prer(er) + print("Error, use '.edit ID' (ID is numerical)") + else: + print('Successfully update') + cur.close() + return 'edit' + + def command_delete(self, id_or_pattern): + """Delete translate words form DB, search by ID or pattern (several rows)""" + cur = self.connect.cursor() + try: + try: + pattern = int(id_or_pattern) + by_pattern = False + except ValueError as e: + pattern = id_or_pattern + by_pattern = True + result = self.check_user_translate(cur, pattern, by_pattern) + if not result: raise IncorrectDbData() + print('Records for delete:') + id_for_del = [] + for row in result: + # id, token + id_for_del.append((row[3], row[2])) + print("ID={0}:\t'{1}'".format(row[3], row[0])) + correction = input("It is right [N/y]?") + if correction not in ('Y', 'y'): + return 'delete' + # delete for correction information + with self.connect: + for rec in id_for_del: + # delete translate + cur.execute("DELETE FROM `translate` WHERE `id`=(?)", (rec[0],)) + # delete progress + cur.execute("DELETE FROM `progress` WHERE `translate_id`=(?)", (rec[0],)) + # del from term if it needed + cur.execute("SELECT `term` FROM `translate` WHERE `term`=(?) LIMIT 1", (rec[1],)) + if not cur.fetchone(): + cur.execute("DELETE FROM `term` WHERE `token`=(?)", (rec[1],)) + except IncorrectDbData as er: + self.prer(er) + print('Record not found for current user.') + except (sqlite3.DatabaseError, TypeError) as er: + self.prer(er) + print("Error, use '.delete [ID or pattern]' (ID is numerical)") + else: + print('Successfully update') + cur.close() + return 'delete' + + def command_connect(self, arg=None): + """test connection, set user status""" + result = get_test_connection() + if result: + print("Ok connection") + else: + print("Error connection") + self.online = result + return 'connect' + + def check_user_translate(self, cur, for_search, by_pattern=False): + """search user pattern""" + sql_str = "SELECT `term`.`en`, `translate`.`rus`, `term`.`token`, `translate`.`id` FROM `translate` LEFT JOIN `term` ON (`translate`.`term`=`term`.`token`) " + if by_pattern: + pattern = for_search + '%' + sql_str += "WHERE `term`.`en` LIKE (?) AND `user_id`=(?) ORDER BY `translate`.`id`" + else: + pattern = for_search + sql_str += "WHERE `translate`.`id`=(?) AND `user_id`=(?) ORDER BY `translate`.`id`" + cur.execute(sql_str, (pattern, self.user_id)) + return cur.fetchall() + + def command_import(self, import_name): + """import user dict to CSV""" + start = False + cur = self.connect.cursor() + uniqCount, dublCount = 0, 0 + try: + read_csv = csv.reader(open(import_name, newline='', encoding='utf-8'), dialect='excel', delimiter=';', quoting=csv.QUOTE_ALL) + with self.connect: + for row in read_csv: + if not start: + start = True + continue + if len(row) < 2: continue + en = row[0] + ru = row[1] + # check term + token = hashlib.md5(bytes(prepare_str(en), 'utf-8')).hexdigest() + # check translate + cur.execute("SELECT `term` FROM `translate` WHERE `user_id`=(?) AND `term`=(?)", (self.user_id, token)) + if not cur.fetchone(): + # check term + cur.execute("SELECT `token` FROM `term` WHERE `token`=(?)", (token,)) + if not cur.fetchone(): + cur.execute("INSERT INTO `term` (`token`, `en`) VALUES ((?), (?))", (token, prepare_str(en))) + cur.execute("INSERT INTO `translate` (term,user_id,rus) VALUES (?,?,?)", (token, self.user_id, prepare_str(ru))) + translate_id = cur.lastrowid + cur.execute("INSERT INTO `progress` (`translate_id`) VALUES (?)", (translate_id,)) + print("Added: {0}".format(en)) + uniqCount += 1 + else: + print("Dublicate record: {0}".format(en)) + dublCount += 1 + except sqlite3.DatabaseError as er: + self.prer(er) + print("DB error for {0}".format(en)) + except (TypeError, IOError) as er: + self.prer(er) + print("Please write '.import import_file.csv'") + else: + print("Successfully import {0} new record(s), with {1} duplicates.".format(uniqCount, dublCount)) + cur.close() + return 'import' + + def command_testen(self, arg): + self.command_test(arg, 0) + return 'test-en' + def command_testru(self, arg): + self.command_test(arg, 1) + return 'test-ru' + def command_testmix(self, arg): + self.command_test(arg, 2) + return 'test-mix' + + def command_test(self, arg=None, type_test=0): + """start user test""" + cur = self.connect.cursor() + created = datetime.datetime.now() + name = '' + try: + arg = int(arg) if arg else self.ctest + except (TypeError, ValueError) as e: + arg = self.ctest + # start test + types_test = ('en-ru', 'ru-en', 'mix') + print("Start test, type: '{0}', count: {1}".format(types_test[type_test], arg)) + try: + with self.connect: + # insert `test` + cur.execute("INSERT INTO `test` (`user_id`, `name`, `created`) VALUES (?,?,?)", (self.user_id, types_test[type_test], created)) + test_id = cur.lastrowid + alreadyq, to_save, progress = [], [], [] + for i in range(1, arg+1): + # 0-en, 1-ru, 2-mix + question, answer, translate_id = self.gen_question(cur, type_test, alreadyq) + if question is None: + print("too few words") + break + alreadyq.append(str(translate_id)) + print('\nQuestion {0}: {1}'.format(i,question)) + enter = input('translate: ') + # check error + er = False if check_ans(answer, enter) else True + result_row = {"test_id": test_id, "num": i, "question": question, 'answer': answer, 'enter': enter, 'error': er} + to_save.append(result_row) + progress_error = 1 if er else 0 + progress.append({'translate_id': translate_id, 'error': progress_error}) + # save results + cur.executemany("INSERT INTO `result` (`test_id`,`number`,`question`,`answer`,`enter`,`error`) VALUES (:test_id, :num, :question, :answer, :enter, :error)", to_save) + # update test + cur.execute("UPDATE `test` SET `finished`=(?) WHERE `id`=(?)", (datetime.datetime.now(), test_id)) + # update progress + cur.executemany("UPDATE `progress` SET `all`=`all`+1, `error`=`error`+:error WHERE `translate_id`=:translate_id", progress) + except sqlite3.DatabaseError as er: + self.prer(er) + print("Error") + else: + print("Test successfully finished, ID={}.".format(test_id)) + self.print_test_result(to_save, test_id, False) + cur.close() + + def print_test_result(self, tests, test_id, print_right=False): + """print test info""" + right, error = 0, 0 + print("*******YOUR RESULT********") + for q in tests: + if q['error']: + error += 1 + print("Q#{0} (Error): {1}\n[correct] {2}\n[you] {3}\n".format(q['num'],q['question'],q['answer'],q['enter'])) + else: + right += 1 + if print_right: + print("Q#{0}: {1}\n[correct] {2}\n[you] {3}\n".format(q['num'],q['question'],q['answer'],q['enter'])) + print("**************************") + print("Test ID={2}. Result: {0} error(s) from {1}".format(error,(right + error), test_id)) + + def gen_question(self, cur, type_test, alreadyq): + """genaration question for any test""" + sql_list = "SELECT `translate`.`id`, `term`.`en`, `translate`.`rus` FROM `translate` LEFT JOIN `term` ON (`translate`.`term`=`term`.`token`) WHERE `translate`.`user_id`=" + str(self.user_id) + " AND (`translate`.`id` NOT IN (" + ", ".join(alreadyq) + "))" + cur.execute(sql_list) + for_search = cur.fetchall() + if not for_search: + return None, None, None + row = for_search[random.randint(0,len(for_search)-1)] + # 0 => en, 1 => ru, 2 => mix + translate_id = row[0] + if type_test == 0: + question, answer = row[1], row[2] + elif type_test == 1: + question, answer = row[2], row[1] + else: + i = random.randint(1,2) + j = 1 if i == 2 else 2 + question, answer = row[i], row[j] + return question, answer, translate_id + + def command_testlist(self, arg=None): + """print user tests""" + global TEST_NUM + cur = self.connect.cursor() + try: + arg = int(arg) if arg else TEST_NUM + sql_list = "SELECT `test`.`id`, `test`.`name`, `test`.`created`, `test`.`finished` FROM `test` WHERE `test`.`user_id`=(?) ORDER BY `test`.`created` DESC, `test`.`finished` DESC LIMIT (?);" + cur.execute(sql_list, (self.user_id, arg)) + i = 1 + print("Your tests:") + for row in cur.fetchall(): + created = datetime.datetime.strptime(row[2], "%Y-%m-%d %H:%M:%S.%f") + finished = datetime.datetime.strptime(row[3], "%Y-%m-%d %H:%M:%S.%f") + cur.execute("SELECT COUNT(*) FROM `result` WHERE `result`.`test_id`=(?) AND `result`.`error`=1", (row[0],)) + results = cur.fetchone() + error = results[0] if results else 0 + cur.execute("SELECT COUNT(*) FROM `result` WHERE `result`.`test_id`=(?)", (row[0],)) + results = cur.fetchone() + allres = results[0] if results else 0 + print("{0}. ID={1}, type: {2}, {5} error(s) from {6}\n created: {3}, finished: {4}\n".format(i, row[0], row[1], created.strftime("%d.%m.%Y %H:%M:%S"), finished.strftime("%d.%m.%Y %H:%M:%S"), error, allres)) + i +=1 + except (ValueError, TypeError) as er: + self.prer(er) + print("Error, use <.testlist N> (N - number)") + except sqlite3.DatabaseError as er: + self.prer(er) + print("Error") + cur.close() + return 'tetslist' + + def command_testinfo(self, arg=None): + cur = self.connect.cursor() + try: + test_id = int(arg) + # test info + sql_list = "SELECT `test`.`id`, `test`.`name`, `test`.`created`, `test`.`finished` FROM `test` WHERE `test`.`user_id`=(?) AND `test`.`id`=(?);" + cur.execute(sql_list, (self.user_id, test_id)) + test = cur.fetchone() + if not test: + print("Empty test") + return "test_info" + created = datetime.datetime.strptime(test[2], "%Y-%m-%d %H:%M:%S.%f") + finished = datetime.datetime.strptime(test[3], "%Y-%m-%d %H:%M:%S.%f") + print("ID={0}, type: {1}, created: {2}, finished: {3}\n".format(test[0], test[1], created.strftime("%d.%m.%Y %H:%M:%S"), finished.strftime("%d.%m.%Y %H:%M:%S"))) + # results + cur.execute("SELECT `result`.`number`, `result`.`question`, `result`.`answer`, `result`.`enter`, `result`.`error` FROM `result` WHERE `result`.`test_id`=(?) ORDER BY `result`.`number`;", (test_id,)) + for_print = [] + for row in cur.fetchall(): + for_print.append({'num': row[0], 'question': row[1], 'answer': row[2], 'enter': row[3], 'error': row[4]}) + self.print_test_result(for_print, test_id, True) + except (ValueError, TypeError) as er: + self.prer(er) + print("Error, use <.tesinfo ID> (ID - number)") + except sqlite3.DatabaseError as er: + self.prer(er) + print("Error") + cur.close() + return 'testinfo' + + def command_info(self, arg=None): + cur = self.connect.cursor() + # user + cur.execute("SELECT `name`, `full` FROM `user` WHERE `id`=(?)", (self.user_id,)) + result = cur.fetchone() + print("{0}: {1}".format(*result)) + cur.execute("SELECT COUNT(*) FROM `translate` WHERE `user_id`=(?) GROUP BY `user_id`", (self.user_id,)) + result = cur.fetchone() + print("There are {0} records in user dictionary".format(result[0])) + cur.execute("SELECT COUNT(*) FROM `test` WHERE `user_id`=(?) GROUP BY `user_id`", (self.user_id,)) + result = cur.fetchone() + cur.execute("SELECT COUNT(`result`.`id`) FROM `result` LEFT JOIN `test` ON (`result`.`test_id`=`test`.`id`) WHERE `test`.`user_id`=(?) GROUP BY `test`.`user_id`", (self.user_id,)) + results = cur.fetchone() + print("There are {0} tests, with {1} results".format(result[0], results[0])) + cur.close() + return 'info' + + ADDED db.sql Index: db.sql ================================================================== --- db.sql +++ db.sql @@ -0,0 +1,57 @@ +DROP TABLE progress; +DROP TABLE result; +DROP TABLE term; +DROP TABLE test; +DROP TABLE translate; +DROP TABLE user; + +CREATE TABLE progress ( + "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, + "translate_id" INTEGER NOT NULL, + "all" INTEGER DEFAULT (0), + "error" INTEGER DEFAULT (0) +); +CREATE TABLE result ( + "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, + "test_id" INTEGER NOT NULL, + "number" INTEGER NOT NULL, + "question" VARCHAR, + "answer" VARCHAR, + "enter" VARCHAR, + "error" BOOL, + "created" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP +); +CREATE TABLE term ( + "token" VARCHAR(40) NOT NULL UNIQUE, + "en" VARCHAR NOT NULL +); +CREATE TABLE test ( + "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, + "user_id" INTEGER NOT NULL, + "name" VARCHAR(64) NOT NULL, + "created" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + "finished" TIMESTAMP +); +CREATE TABLE translate ( + "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, + "term" VARCHAR(40) NOT NULL, + "user_id" INTEGER NOT NULL, + "rus" VARCHAR NOT NULL, + "created" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP +); +CREATE TABLE user ( + "id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, + "name" VARCHAR NOT NULL, + "password" VARCHAR NOT NULL, + "full" TEXT +); +CREATE INDEX "progress_result" ON "progress" ("all" ASC, "error" ASC); +CREATE INDEX "progress_translate" ON "progress" ("translate_id" ASC); +CREATE INDEX "result_test" ON "result" ("test_id" ASC, "number" DESC, "error" ASC, "created" DESC); +CREATE INDEX "term_token" ON "term" ("en" ASC); +CREATE INDEX "test_user" ON "test" ("user_id" ASC, "created" DESC, "finished" DESC); +CREATE INDEX "translate_created" ON "translate" ("created" DESC); +CREATE INDEX "translate_rus" ON "translate" ("term" ASC, "user_id" ASC, "rus" ASC); +CREATE INDEX "translate_term" ON "translate" ("term" ASC, "user_id" ASC); +CREATE UNIQUE INDEX "user_name" ON "user" ("name" ASC); +CREATE INDEX "user_passwod" ON "user" ("password" ASC); ADDED db.sqlite Index: db.sqlite ================================================================== --- db.sqlite +++ db.sqlite cannot compute difference between binary files ADDED dict.csv Index: dict.csv ================================================================== --- dict.csv +++ dict.csv @@ -0,0 +1,1 @@ +"ENGLISH";"RUSSIAN" ADDED license.txt Index: license.txt ================================================================== --- license.txt +++ license.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. ADDED main.py Index: main.py ================================================================== --- main.py +++ main.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 +#-*- coding: utf-8 -*- + +from aside import * +from condt import Condt +import getpass, os + +CONF_NAME = 'condt.conf' +PREFIX = "{0}@condict[{1}]$" +WELCOM = """**************************************************** +*** Good day. *** +*** For help, use the command ".help", nice work.*** +****************************************************""" + +def main(): + global CONF_NAME, PREFIX + # user-name query + config = get_config_data(CONF_NAME) + if not config['database'] or not os.path.exists(config['database']): + print("Not fount SQLite database") + return 1 + # get name + user = config['defuser'] if config['defuser'] else input("User name:") + # create object + account = Condt(user, config['database'], config['debug'], config['defctest']) + if not account: + print('Validation error, by...') + return 0 + print(WELCOM) + while (True): + conn_status = 'online' if account.online else 'offline' + prefix = PREFIX.format(account.name, conn_status) + command = input(prefix) + get_command = account.handling_command(command) + if get_command is None: + print('Sorry, unknown command: "{0}"\nuse ".help" for more information'.format(command)) + continue + if not get_command: + print("By {0}!".format(account.name)) + return 0 + +if __name__ == "__main__": + try: + main() + except KeyboardInterrupt: + print('Press Ctrl+C, Bye') Index: readme ================================================================== --- readme +++ readme @@ -1,6 +1,14 @@ -Simple Console Dictionary +ConDict is simple Console Dictionary Uses: -- SQLite http://www.sqlite.org/ -- Python http://www.python.org/ -- Yandex translate http://api.yandex.ru/translate/doc/dg/reference/translate.xml -- Fossil http://www.fossil-scm.org/ +- SQLite3 + http://www.sqlite.org/ +- Python3 + http://www.python.org/ +- Yandex translate + http://api.yandex.ru/translate/doc/dg/reference/translate.xml +- Fossil + http://www.fossil-scm.org/ + +Test user: + login: test + password: 123