diff --git a/app/blueprints/book_bp.py b/app/blueprints/book_bp.py index 20f2ace..29e378a 100644 --- a/app/blueprints/book_bp.py +++ b/app/blueprints/book_bp.py @@ -1,6 +1,6 @@ from flask import Blueprint, current_app, Response -from app.services import BookService +from app.services.book_service import BookService bp = Blueprint("book", __name__) diff --git a/app/blueprints/file_bp.py b/app/blueprints/file_bp.py index 78d3911..b72f19e 100644 --- a/app/blueprints/file_bp.py +++ b/app/blueprints/file_bp.py @@ -1,13 +1,13 @@ from typing import List from flask import Blueprint, jsonify -from app.services import FileService +from app.services.file_service import FileService bp = Blueprint("file", __name__) @bp.route('/rename') -def files_rename(): +def file_rename(): paths: List[str] = [ "C:\\迅雷下载\\0_done", "C:\\Users\\Localhost\\Desktop\\BT", diff --git a/app/blueprints/image_bp.py b/app/blueprints/image_bp.py index efa5693..e910ee0 100644 --- a/app/blueprints/image_bp.py +++ b/app/blueprints/image_bp.py @@ -1,6 +1,7 @@ from flask import Blueprint, Response, jsonify -from app.services import ImageService, TorrentService +from app.services.image_service import ImageService +from app.services.torrent_service import TorrentService bp = Blueprint("image", __name__) diff --git a/app/blueprints/music_bp.py b/app/blueprints/music_bp.py index 5f35e3c..81f82ff 100644 --- a/app/blueprints/music_bp.py +++ b/app/blueprints/music_bp.py @@ -1,6 +1,6 @@ from flask import Blueprint, jsonify -from app.services import MusicService +from app.services.music_service import MusicService bp = Blueprint("music", __name__) diff --git a/app/blueprints/torrent_bp.py b/app/blueprints/torrent_bp.py index 8839d0e..543144a 100644 --- a/app/blueprints/torrent_bp.py +++ b/app/blueprints/torrent_bp.py @@ -1,6 +1,6 @@ from flask import Blueprint, jsonify -from app.services import TorrentService +from app.services.torrent_service import TorrentService bp = Blueprint("torrent", __name__) @@ -17,7 +17,12 @@ def torrent_statistics(): return jsonify({"code": 200, "message": torrent_object.statistics()}) -@bp.route("/s/") +@bp.route("/") def torrent_by_name(name): torrent_object = TorrentService(["C:\\Users\\Localhost\\Desktop\\BT"]) - return jsonify({"code": 200, "message": torrent_object.get_by_name(name)}) \ No newline at end of file + return jsonify({"code": 200, "message": torrent_object.get_by_name(name)}) + +# @bp.route("/extract/name") +# def torrent_extract_name(): +# torrent_object = TorrentService([]) +# return jsonify({"code": 200, "message": torrent_object.extract_name("AVSA-429.torrent")}) \ No newline at end of file diff --git a/app/blueprints/video_bp.py b/app/blueprints/video_bp.py index af6052d..159d3a9 100644 --- a/app/blueprints/video_bp.py +++ b/app/blueprints/video_bp.py @@ -1,6 +1,7 @@ from flask import Blueprint, jsonify -from app.services import VideoService, TorrentService +from app.services.video_service import VideoService +from app.services.torrent_service import TorrentService bp = Blueprint("video", __name__) @@ -24,7 +25,6 @@ def video_deduplication(): "E:\\", "F:\\" ]) - return jsonify({"code": 200, "message": video_object.deduplication()}) diff --git a/app/services/__init__.py b/app/services/__init__.py index 14f64d9..e69de29 100644 --- a/app/services/__init__.py +++ b/app/services/__init__.py @@ -1,7 +0,0 @@ -from .folder_service import FolderService -from .file_service import FileService -from .torrent_service import TorrentService -from .book_service import BookService -from .image_service import ImageService -from .music_service import MusicService -from .video_service import VideoService diff --git a/app/services/file_service.py b/app/services/file_service.py index 96d69fa..e629e36 100644 --- a/app/services/file_service.py +++ b/app/services/file_service.py @@ -1,7 +1,7 @@ import os from typing import List, Optional -from app.services import FolderService +from app.services.folder_service import FolderService from app.utils import windows_sort_unicode from app.constants import IGNORE_DIRS, SEPARATORS, SPECIAL_PREFIXES, SPECIAL_DIRS diff --git a/app/services/image_service.py b/app/services/image_service.py index 7962858..ab79162 100644 --- a/app/services/image_service.py +++ b/app/services/image_service.py @@ -2,7 +2,7 @@ import os import re import shutil -from app.services import FolderService +from app.services.folder_service import FolderService from app.constants import IMAGE_EXTENSIONS, IGNORE_DIRS diff --git a/app/services/music_service.py b/app/services/music_service.py index 2559b27..25465dd 100644 --- a/app/services/music_service.py +++ b/app/services/music_service.py @@ -1,6 +1,6 @@ import os from typing import List -from app.services import FolderService +from app.services.folder_service import FolderService from app.utils import windows_sort_unicode class MusicService: diff --git a/app/services/torrent_service.py b/app/services/torrent_service.py index fac2835..d081afd 100644 --- a/app/services/torrent_service.py +++ b/app/services/torrent_service.py @@ -4,7 +4,7 @@ from collections import defaultdict from typing import List, Optional from app.constants import IGNORE_DIRS, SEPARATORS, SPECIAL_PREFIXES, SPECIAL_DIRS -from app.services import FolderService +from app.services.folder_service import FolderService from app.utils import to_json_serializable diff --git a/app/services/video_service.py b/app/services/video_service.py index 0daa371..637893b 100644 --- a/app/services/video_service.py +++ b/app/services/video_service.py @@ -4,7 +4,7 @@ import shutil from collections import defaultdict from app.constants import IGNORE_DIRS, TORRENT_ROOT_FOLDER -from app.services import FolderService +from app.services.folder_service import FolderService class VideoService: diff --git a/flask-ui/src/api/index.ts b/flask-ui/src/api/index.ts index ea94024..8c55f12 100644 --- a/flask-ui/src/api/index.ts +++ b/flask-ui/src/api/index.ts @@ -24,7 +24,7 @@ export function video_hasTorrent() { }) } -export function files_rename() { +export function file_rename() { return request({ url: "/file/rename", }) diff --git a/flask-ui/src/views/HomeView.vue b/flask-ui/src/views/HomeView.vue index 7af6c5b..3b40399 100644 --- a/flask-ui/src/views/HomeView.vue +++ b/flask-ui/src/views/HomeView.vue @@ -1,7 +1,7 @@