separate downloads and personal stash
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import os
|
||||
from shutil import copyfile
|
||||
from flask import render_template, session, redirect, url_for, flash, request, current_app
|
||||
from . import main
|
||||
from .forms import Ripper
|
||||
@@ -16,7 +17,7 @@ def download_comic_files(soup):
|
||||
comic_files = []
|
||||
|
||||
# set the image_folder name to the title of the comic
|
||||
image_folder = os.path.join(current_app.config['STASH_FOLDER'], ripper.get_title(soup))
|
||||
image_folder = os.path.join(current_app.config['DOWNLOAD_FOLDER'], ripper.get_title(soup))
|
||||
print(image_folder)
|
||||
|
||||
# append each comic link found in the bs4 response to the comic file list
|
||||
@@ -24,11 +25,21 @@ def download_comic_files(soup):
|
||||
comic_files.append(link)
|
||||
|
||||
# download the completed comic list
|
||||
ripper.download_img_links(comic_files, soup, current_app.config['STASH_FOLDER'])
|
||||
ripper.download_img_links(comic_files, soup, current_app.config['DOWNLOAD_FOLDER'])
|
||||
|
||||
# create a comic archive from all images in image_folder
|
||||
zipper.create_comic_archive(ripper.get_title(soup), image_folder)
|
||||
|
||||
# copy comic to stash
|
||||
print('Copying comic to personal stash')
|
||||
filename = ripper.get_title(soup) + '.cbr'
|
||||
src = str(os.path.join(image_folder, filename))
|
||||
print(src)
|
||||
dest = str(os.path.join(current_app.config['STASH_FOLDER'], filename))
|
||||
print(dest)
|
||||
copyfile(src, dest)
|
||||
|
||||
|
||||
|
||||
@main.route('/', methods=accepted_methods)
|
||||
def index():
|
||||
@@ -37,6 +48,6 @@ def index():
|
||||
if form.validate_on_submit():
|
||||
soup = ripper.get_soup_obj(form.search.data, headers)
|
||||
download_comic_files(soup)
|
||||
return render_template('success.html')
|
||||
return render_template('success.html', title=ripper.get_title(soup))
|
||||
|
||||
return render_template('index.html', form=form)
|
||||
Reference in New Issue
Block a user