Merge remote-tracking branch 'Comic/comic_server'

# Conflicts:
#	cps/helper.py
#	cps/static/js/archive.js
#	cps/static/js/io.js
#	cps/static/js/kthoom.js
#	cps/static/js/unrar.js
#	cps/static/js/untar.js
#	cps/static/js/unzip.js
#	cps/templates/config_edit.html
#	cps/templates/detail.html
#	cps/templates/readcbr.html
#	cps/templates/stats.html
#	cps/ub.py
#	cps/web.py
#	optional-requirements.txt

cps/ub.py

@@ -311,6 +311,7 @@ class Settings(Base):
     config_ebookconverter = Column(Integer, default=0)
     config_converterpath = Column(String)
     config_calibre = Column(String)
+    config_rarfile_location = Column(String)
 
     def __repr__(self):
         pass
@@ -383,6 +384,7 @@ class Config:
             self.config_mature_content_tags = u''
         if data.config_logfile:
             self.config_logfile = data.config_logfile
+        self.config_rarfile_location = data.config_rarfile_location
 
     @property
     def get_main_dir(self):
@@ -566,6 +568,13 @@ def migrate_Database():
         conn = engine.connect()
         conn.execute("ALTER TABLE book_shelf_link ADD column 'order' INTEGER DEFAULT 1")
         session.commit()
+    try:
+        session.query(exists().where(Settings.config_rarfile_location)).scalar()
+        session.commit()
+    except exc.OperationalError:  # Database is not compatible, some rows are missing
+        conn = engine.connect()
+        conn.execute("ALTER TABLE Settings ADD column `config_rarfile_location` String DEFAULT ''")
+        session.commit()
     try:
         create = False
         session.query(exists().where(User.sidebar_view)).scalar()