Bug Fix & PyPI

Author: Calvin Xu

mach3/cli.py

@@ -4,11 +4,7 @@
 from mach3.db_index import add_entries
 import sqlalchemy
 from textwrap import dedent
-try:
-    from mach3.db_query import index_search
-except sqlalchemy.exc.NoSuchTableError:
-    print("No index database found. Please index this directory first.")
-    exit(0)
+from mach3.db_query import index_search
 from mach3.mkv_interface import mkv_play
 
 
@@ -32,7 +28,11 @@ def main(index, search, help, dir_query):
         click.echo("Indexing complete")
     elif search:
         click.echo("Searching {} from index".format(dir_query))
-        options = index_search(dir_query)
+        try:
+            options = index_search(dir_query)
+        except NameError:
+            click.echo("No index database found. Please index this directory first: $ mach3 -i")
+            exit(0)
         if len(options) == 0:
             click.echo("I cannot find anything for you, Misaka tries and fails.")
             exit(0)

mach3/db_query.py

@@ -1,15 +1,18 @@
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
+import sqlalchemy
 
 engine = create_engine('sqlite:///index_mach3.db', echo=False)
 
 Base = declarative_base(engine)
 
-
-class Subtitle(Base):
-    __tablename__ = "subtitle"
-    __table_args__ = {"autoload": True}
+try:
+    class Subtitle(Base):
+        __tablename__ = "subtitle"
+        __table_args__ = {"autoload": True}
+except sqlalchemy.exc.NoSuchTableError:
+    print("No index database found. Please index this directory first: $ mach3 -i")
 
 
 def loadSession():

setup.py

@@ -3,22 +3,20 @@
 """
 from setuptools import find_packages, setup
 
-dependencies = ['click', 'ass', 'sqlalchemy']
-
 setup(
     name='mach3',
-    version='0.1.0',
+    version='0.1.1.0.4',
     url='https://github.com/Calvin-Xu/mach3-cli',
-    license='BSD',
+    download_url = 'https://github.com/Calvin-Xu/mach3-cli/archive/0.1.tar.gz',
+    license='MIT',
     author='Pinlin Xu',
     author_email='[email protected]',
     description='Recursively parse and index subtitle text for future use.',
     long_description=__doc__,
     packages=find_packages(exclude=['tests']),
-    include_package_data=True,
     zip_safe=False,
     platforms='any',
-    install_requires=dependencies,
+    install_requires=['click', 'ass', 'SQLAlchemy'],
     python_requires='>=3',
     entry_points={
         'console_scripts': [