use isort to sort imports

tools/BagAndDrag/bag.py

@@ -7,16 +7,17 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
-import os
-import requests
-import pickle
-import logging
-import sys
 import contextlib
-import pymysql
 import json
-import traceback
+import logging
+import os
+import pickle
+import sys
 import time
+import traceback
+
+import pymysql
+import requests
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(filename)s [%(levelname)s]: %(message)s')
 

tools/BagAndDrag/cfkv.py

@@ -7,10 +7,11 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
-import pymysql
 import json
 import os
 
+import pymysql
+
 con = pymysql.Connect(host="127.0.0.1", user="root", password="root", charset="utf8mb4", database="yyets",
                       cursorclass=pymysql.cursors.DictCursor)
 cur = con.cursor()

tools/BagAndDrag/convert_db.py

@@ -9,13 +9,13 @@ __author__ = "Benny <benny.think@gmail.com>"
 
 # convert to mongodb and con_sqlite
 
+import json
 import sqlite3
+from typing import List
+
 import pymongo
 import pymysql
 import tqdm
-import json
-
-from typing import List
 
 con_mysql = pymysql.Connect(host="127.0.0.1", user="root", password="root", charset="utf8mb4", database="yyets",
                             cursorclass=pymysql.cursors.DictCursor

tools/BagAndDrag/drag.py

@@ -10,12 +10,14 @@ __author__ = "Benny <benny.think@gmail.com>"
 import argparse
 import logging
 import time
-import requests
 import traceback
 from concurrent.futures import ThreadPoolExecutor
+
+import requests
 from tqdm import tqdm
 
-from bag import SHARE_URL, API_DATA, load_cookies, is_cookie_valid, login, insert_db, insert_error
+from bag import (API_DATA, SHARE_URL, insert_db, insert_error, is_cookie_valid,
+                 load_cookies, login)
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(filename)s [%(levelname)s]: %(message)s')
 s = requests.session()

tools/management/ui.py

@@ -7,10 +7,10 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
+import json
 import time
 
 import PySimpleGUI as sg
-import json
 
 # All the stuff inside your window.
 channel_map = {

yyetsbot/fansub.py

@@ -4,24 +4,24 @@
 
 __author__ = 'Benny <benny.think@gmail.com>'
 
-import os
-import logging
-import pickle
-import sys
-import json
-import hashlib
 import contextlib
+import hashlib
+import json
+import logging
+import os
+import pickle
 import re
+import sys
 
-import requests
+import fakeredis
 import pymongo
 import redis
-import fakeredis
+import requests
 from bs4 import BeautifulSoup
 
-from config import (WORKERS, REDIS, FANSUB_ORDER, FIX_SEARCH, MONGO,
+from config import (CK180_SEARCH, FANSUB_ORDER, FIX_SEARCH, MONGO,
-                    ZHUIXINFAN_SEARCH, ZHUIXINFAN_RESOURCE, NEWZMZ_SEARCH, NEWZMZ_RESOURCE,
+                    NEWZMZ_RESOURCE, NEWZMZ_SEARCH, REDIS, WORKERS,
-                    CK180_SEARCH)
+                    ZHUIXINFAN_RESOURCE, ZHUIXINFAN_SEARCH)
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(filename)s [%(levelname)s]: %(message)s')
 

yyetsbot/utils.py

@@ -4,15 +4,16 @@
 
 __author__ = 'Benny <benny.think@gmail.com>'
 
-import os
-import sys
-import pickle
 import json
 import logging
-import requests
+import os
-import redis
+import pickle
+import sys
 
-from config import AJAX_LOGIN, USERNAME, PASSWORD, REDIS
+import redis
+import requests
+
+from config import AJAX_LOGIN, PASSWORD, REDIS, USERNAME
 
 r = redis.StrictRedis(host=REDIS, decode_responses=True)
 

yyetsbot/yyetsbot.py

@@ -5,23 +5,23 @@
 __author__ = 'Benny <benny.think@gmail.com>'
 
 import io
-import time
-import re
-import logging
 import json
+import logging
+import re
 import tempfile
+import time
 from urllib.parse import quote_plus
 
 import telebot
 from apscheduler.schedulers.background import BackgroundScheduler
-from telebot import types, apihelper
+from telebot import apihelper, types
 from tgbot_ping import get_runtime
 
 import fansub
-from utils import (save_error_dump, get_error_dump, reset_request,
+from config import (FANSUB_ORDER, MAINTAINER, PROXY, REPORT, TOKEN,
-                   today_request, show_usage, redis_announcement
+                    YYETS_SEARCH_URL)
-                   )
+from utils import (get_error_dump, redis_announcement, reset_request,
-from config import PROXY, TOKEN, YYETS_SEARCH_URL, MAINTAINER, REPORT, FANSUB_ORDER
+                   save_error_dump, show_usage, today_request)
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(filename)s [%(levelname)s]: %(message)s')
 if PROXY:

yyetsweb/Mongo.py

@@ -8,31 +8,33 @@
 __author__ = "Benny <benny.think@gmail.com>"
 
 import contextlib
-import sys
-import pathlib
-import pymongo
-import os
-import time
-from http import HTTPStatus
-from datetime import timedelta, date
-from bson.objectid import ObjectId
-from urllib.parse import unquote
-import re
 import logging
+import os
+import pathlib
+import re
+import sys
+import time
+from datetime import date, timedelta
+from http import HTTPStatus
+from urllib.parse import unquote
 
-from bs4 import BeautifulSoup
+import pymongo
 import requests
+from bs4 import BeautifulSoup
+from bson.objectid import ObjectId
 from passlib.handlers.pbkdf2 import pbkdf2_sha256
 
-from database import (AnnouncementResource, BlacklistResource, CommentResource, ResourceResource,
+from database import (AnnouncementResource, BlacklistResource, CaptchaResource,
-                      GrafanaQueryResource, MetricsResource, NameResource, OtherResource, DoubanResource,
+                      CommentChildResource, CommentNewestResource,
-                      TopResource, UserLikeResource, UserResource, CaptchaResource, Redis,
+                      CommentResource, DoubanResource, GrafanaQueryResource,
-                      CommentChildResource, CommentNewestResource)
+                      MetricsResource, NameResource, OtherResource, Redis,
+                      ResourceResource, TopResource, UserLikeResource,
+                      UserResource)
 from utils import ts_date
 
 lib_path = pathlib.Path(__file__).parent.parent.joinpath("yyetsbot").resolve().as_posix()
 sys.path.append(lib_path)
-from fansub import ZhuixinfanOnline, ZimuxiaOnline, NewzmzOnline, CK180Online
+from fansub import CK180Online, NewzmzOnline, ZhuixinfanOnline, ZimuxiaOnline
 
 mongo_host = os.getenv("mongo") or "localhost"
 DOUBAN_SEARCH = "https://www.douban.com/search?cat=1002&q={}"

yyetsweb/SQLite.py

@@ -8,9 +8,9 @@
 __author__ = "Benny <benny.think@gmail.com>"
 
 import json
+import logging
 import os
 import sqlite3
-import logging
 
 from database import ResourceResource
 

yyetsweb/database.py

@@ -7,16 +7,16 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
+import base64
 import json
 import logging
+import os
 import random
 import re
-import os
 import string
-import base64
 
-import redis
 import fakeredis
+import redis
 from captcha.image import ImageCaptcha
 
 predefined_str = re.sub(r"[1l0oOI]", "", string.ascii_letters + string.digits)

yyetsweb/handler.py

@@ -7,23 +7,22 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
+import importlib
 import json
 import logging
 import os
 import re
 import time
-import importlib
-import filetype
-
 from concurrent.futures import ThreadPoolExecutor
 from datetime import date, timedelta
 from hashlib import sha1
 from http import HTTPStatus
 
+import filetype
+from tornado import escape, gen, web
 from tornado.concurrent import run_on_executor
-from tornado import web, escape, gen
 
-from database import Redis, AntiCrawler, CaptchaResource
+from database import AntiCrawler, CaptchaResource, Redis
 
 escape.json_encode = lambda value: json.dumps(value, ensure_ascii=False)
 logging.basicConfig(level=logging.INFO)

yyetsweb/migration/add_year.py

@@ -7,11 +7,12 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
-import pymongo
-import time
-import re
-from tqdm import tqdm
 import logging
+import re
+import time
+
+import pymongo
+from tqdm import tqdm
 
 logging.basicConfig(level=logging.INFO)
 

yyetsweb/migration/change_datetime.py

@@ -7,9 +7,10 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
-import pymongo
 import time
 
+import pymongo
+
 client = pymongo.MongoClient()
 from bson import ObjectId
 

yyetsweb/migration/convert_to_sqlite.py

@@ -8,9 +8,9 @@
 __author__ = "Benny <benny.think@gmail.com>"
 
 import json
+import sqlite3
 
 import pymongo
-import sqlite3
 
 mongo = pymongo.MongoClient()
 yyets = mongo["zimuzu"]["yyets"]

yyetsweb/migration/douban_fix.py

@@ -8,10 +8,10 @@
 __author__ = "Benny <benny.think@gmail.com>"
 
 import argparse
+import pathlib
+import sys
 
 import requests
-import sys
-import pathlib
 
 lib_path = pathlib.Path(__file__).parent.parent.resolve().as_posix()
 sys.path.append(lib_path)

yyetsweb/migration/douban_sync.py

@@ -8,11 +8,11 @@
 __author__ = "Benny <benny.think@gmail.com>"
 
 import contextlib
+import logging
+import pathlib
 import random
 import sys
-import pathlib
 import time
-import logging
 
 import requests
 from tqdm import tqdm

yyetsweb/migration/grafana_test_data.py

@@ -7,10 +7,11 @@
 
 __author__ = "Benny <benny.think@gmail.com>"
 
-import pymongo
 import random
 from datetime import date, timedelta
 
+import pymongo
+
 client = pymongo.MongoClient()
 col = client["zimuzu"]["metrics"]