Compare commits
1 Commits
projekcija
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| c5d4cbdfd8 |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "Projekcija",
|
||||
"description": "Aplikacija za projekcijo besedil pesmi na zaslon.",
|
||||
"version": "0.7.0",
|
||||
"version": "0.7.1",
|
||||
"authors": [
|
||||
"Uroš Urbanija (izvorna zasnova)",
|
||||
"Valentin Korenjak (nadgradnje in vzdrževanje)"
|
||||
|
||||
@@ -34,12 +34,12 @@ import urllib.request
|
||||
import tempfile
|
||||
from db_schema import create_tables
|
||||
|
||||
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
APPINFO_PATH = os.path.join(BASE_DIR, 'appinfo.json')
|
||||
|
||||
DB_PATH = 'songs.db'
|
||||
SETTINGS_PATH = 'settings.json'
|
||||
|
||||
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
|
||||
class SongProjector:
|
||||
def __init__(self, root):
|
||||
self.root = root
|
||||
@@ -726,7 +726,7 @@ class SongProjector:
|
||||
def show_app_info_tkinter(self):
|
||||
"""Prikaže informacije o aplikaciji v glavnem oknu (ukaz 9900)."""
|
||||
try:
|
||||
with open('appinfo.json', 'r', encoding='utf-8') as f:
|
||||
with open(APPINFO_PATH, 'r', encoding='utf-8') as f:
|
||||
info = json.load(f)
|
||||
|
||||
self.cursor.execute("SELECT COUNT(*) FROM songs")
|
||||
|
||||
@@ -204,8 +204,10 @@ def toggle_split():
|
||||
def get_app_info():
|
||||
"""Vrne informacije o aplikaciji iz appinfo.json"""
|
||||
try:
|
||||
# appinfo.json je v korenskem imeniku projekta
|
||||
with open('appinfo.json', 'r', encoding='utf-8') as f:
|
||||
# appinfo.json je v korenskem imeniku projekta (nad web/)
|
||||
base_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
appinfo_path = os.path.join(base_dir, 'appinfo.json')
|
||||
with open(appinfo_path, 'r', encoding='utf-8') as f:
|
||||
info = json.load(f)
|
||||
|
||||
# Dodaj število pesmi v bazi
|
||||
|
||||
Reference in New Issue
Block a user