WIP: refs #22. Refactored project

MusicBucket · May 23, 2019 · 61e2f54 · 61e2f54
1 parent 5e0851d
commit 61e2f54
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 21 deletions.
diff --git a/app/__init__.py → src/bot/__init__.py b/app/__init__.py → src/bot/__init__.py
diff --git a/app/db.py → src/bot/db.py b/app/db.py → src/bot/db.py
diff --git a/app/logger.py → src/bot/logger.py b/app/logger.py → src/bot/logger.py
@@ -1,7 +1,6 @@
 import logging
-from enum import Enum
 
-from app import models
+from src.bot import models
 
 logger = logging.getLogger(__name__)
 

diff --git a/main.py → src/bot/main.py b/main.py → src/bot/main.py
@@ -1,13 +1,12 @@
-from app.db import db
-from app.models import Link, Artist, Genre, User, Chat, Album, Track, AlbumArtist, AlbumGenre, ArtistGenre, \
-    TrackArtist, LastFMUsername
+import logging
 from telegram.ext import Updater, CommandHandler, MessageHandler, Filters, InlineQueryHandler
 from dotenv import load_dotenv
-from os import getenv as getenv
-import logging
+from os import getenv
 
-# Load environment variables from .env file
-from app.music_bucket_bot import MusicBucketBotFactory
+from src.bot.db import db
+from src.bot.models import Link, Artist, Genre, User, Chat, Album, Track, AlbumArtist, AlbumGenre, ArtistGenre, \
+    TrackArtist, LastFMUsername
+from src.bot.music_bucket_bot import MusicBucketBotFactory
 
 load_dotenv()
 

diff --git a/app/models.py → src/bot/models.py b/app/models.py → src/bot/models.py
@@ -4,8 +4,8 @@
 from peewee import Model, CharField, DateTimeField, IntegerField, ForeignKeyField, CompositeKey, ManyToManyField, \
     BooleanField
 
-from app.db import db
-from app.music.music import StreamingServiceType, LinkType
+from src.bot.db import db
+from src.bot.music.music import StreamingServiceType, LinkType
 
 logger = logging.getLogger(__name__)
 

diff --git a/app/music/__init__.py → src/bot/music/__init__.py b/app/music/__init__.py → src/bot/music/__init__.py
diff --git a/app/music/lastfm.py → src/bot/music/lastfm.py b/app/music/lastfm.py → src/bot/music/lastfm.py
diff --git a/app/music/music.py → src/bot/music/music.py b/app/music/music.py → src/bot/music/music.py
diff --git a/app/music/musicbrainz.py → src/bot/music/musicbrainz.py b/app/music/musicbrainz.py → src/bot/music/musicbrainz.py
diff --git a/app/music/spotify.py → src/bot/music/spotify.py b/app/music/spotify.py → src/bot/music/spotify.py
@@ -5,7 +5,7 @@
 from dotenv import load_dotenv
 from spotipy.oauth2 import SpotifyClientCredentials
 
-from app.music.music import LinkType, LinkInfo, EntityType
+from src.bot.music.music import LinkType, LinkInfo, EntityType
 
 # Spotify client init
 load_dotenv()

diff --git a/app/music_bucket_bot.py → src/bot/music_bucket_bot.py b/app/music_bucket_bot.py → src/bot/music_bucket_bot.py
@@ -8,13 +8,13 @@
 from peewee import fn, SQL
 from telegram import InlineQueryResultArticle, InputTextMessageContent
 
-from app.logger import Logger
-from app.models import User, Chat, Link, Track, Artist, Album, Genre, LastFMUsername
-from app.music.lastfm import LastFMClient
-from app.music.music import LinkType, EntityType
-from app.music.musicbrainz import MusicBrainzClient
-from app.music.spotify import SpotifyClient
-from app.responser import Responser
+from src.bot.logger import Logger
+from src.bot.models import User, Chat, Link, Track, Artist, Album, Genre, LastFMUsername
+from src.bot.music.music import LinkType, EntityType
+from src.bot.music.lastfm import LastFMClient
+from src.bot.music.musicbrainz import MusicBrainzClient
+from src.bot.music.spotify import SpotifyClient
+from src.bot.responser import Responser
 
 logger = logging.getLogger(__name__)
 

diff --git a/app/responser.py → src/bot/responser.py b/app/responser.py → src/bot/responser.py
@@ -2,10 +2,10 @@
 import time
 
 from telegram import ParseMode
-
-from app.music.music import LinkType
 from emoji import emojize
 
+from src.bot.music.music import LinkType
+
 logger = logging.getLogger(__name__)
 
 

diff --git a/tests/__init__.py b/tests/__init__.py