| @@ -538,25 +538,25 @@ def gatherdata(directory): | |||||
| if debug: | if debug: | ||||
| print(f"{releasedata['artist']} < English = {en}") | print(f"{releasedata['artist']} < English = {en}") | ||||
| if en == False: | if en == False: | ||||
| if artists: | |||||
| input_english_artist = artists | |||||
| if artist: | |||||
| input_english_artist = artist | |||||
| else: | else: | ||||
| input_english_artist = input("\n" + "_" * 100 + "\nPlease enter the romaji/english artist name. Separate multiple main artists with \",\".\n") | |||||
| input_english_artist = [x.strip() for x in input_english_artist.split(',')] | |||||
| releasedata['idols[]'] = input_english_artist | |||||
| if editiontitle: | |||||
| releasedata['remaster_title'] = editiontitle | |||||
| else: | |||||
| input_editiontitle = input("\n" + "_" * 100 + "\nEnter the edition TITLE. Press enter to skip.\n") | |||||
| print(input_editiontitle) | |||||
| if input_editiontitle != "": | |||||
| if editionyear: | |||||
| releasedata["remaster_year"] = editionyear | |||||
| else: | |||||
| input_editionyear = input("\n" + "_" * 100 + "\nEnter the edition year as YYYY.\n") | |||||
| releasedata["remaster_year"] = input_editionyear | |||||
| releasedata['remaster_title'] = input_editiontitle | |||||
| input_english_artist = input("\n" + "_" * 100 + "\nPlease enter the romaji/english artist name.\n") | |||||
| releasedata['artist'] = input_english_artist | |||||
| # doesnt work | |||||
| # if editiontitle: | |||||
| # releasedata['remaster_title'] = editiontitle | |||||
| # else: | |||||
| # input_editiontitle = input("\n" + "_" * 100 + "\nEnter the edition TITLE. Press enter to skip.\n") | |||||
| # print(input_editiontitle) | |||||
| # if input_editiontitle != "": | |||||
| # if editionyear: | |||||
| # releasedata["remaster_year"] = editionyear | |||||
| # else: | |||||
| # input_editionyear = input("\n" + "_" * 100 + "\nEnter the edition year as YYYY.\n") | |||||
| # releasedata["remaster_year"] = input_editionyear | |||||
| # releasedata['remaster_title'] = input_editiontitle | |||||
| return releasedata | return releasedata | ||||
| @@ -693,7 +693,7 @@ if __name__ == "__main__": | |||||
| args = getargs() | args = getargs() | ||||
| # TODO consider calling args[] directly, we will then not need this line | # TODO consider calling args[] directly, we will then not need this line | ||||
| dryrun = freeleech = tags = directory = editiontitle = editionyear = artist = torrentdescription = releasetype = debug = audio_info = None | |||||
| dryrun = freeleech = tags = directory = editiontitle = editionyear = artist = torrentdescription = releasetype = debug = audio_info = imageURL = None | |||||
| directory = args.directory | directory = args.directory | ||||
| additional_tags = args.tags | additional_tags = args.tags | ||||
| @@ -756,9 +756,10 @@ if __name__ == "__main__": | |||||
| local_watch_folder = cfg['local_prefs']['local_watch_folder'] | local_watch_folder = cfg['local_prefs']['local_watch_folder'] | ||||
| local_downloads_folder = cfg['local_prefs']['local_downloads_folder'] | local_downloads_folder = cfg['local_prefs']['local_downloads_folder'] | ||||
| if dryrun != True: | |||||
| if cfg['ftp_prefs']['enable_ftp']: | |||||
| ftp_transfer(fileSource=torrentfile, fileDestination=ftp_downloads_folder, directory=directory, folder_name=folder_name, watch_folder=ftp_watch_folder) | |||||
| if cfg['ftp_prefs']['enable_ftp']: | |||||
| ftp_transfer(fileSource=torrentfile, fileDestination=ftp_downloads_folder, directory=directory, folder_name=folder_name, watch_folder=ftp_watch_folder) | |||||
| if cfg['local_prefs']['add_to_watch_folder'] or cfg['local_prefs']['add_to_downloads_folder']: | |||||
| localfileorganization(torrent=torrentfile, directory=directory, watch_folder=local_watch_folder, downloads_folder=local_downloads_folder) | |||||
| if dryrun != True: | |||||
| if cfg['local_prefs']['add_to_watch_folder'] or cfg['local_prefs']['add_to_downloads_folder']: | |||||
| localfileorganization(torrent=torrentfile, directory=directory, watch_folder=local_watch_folder, downloads_folder=local_downloads_folder) | |||||