From 8cb3a506a04403b93c5609d5ce5157dbd7b4c49e Mon Sep 17 00:00:00 2001 From: CronyAkatsuki Date: Sat, 3 Jul 2021 18:22:32 +0200 Subject: [PATCH] pypi package and testing script --- .gitignore | 3 + README.md | 2 +- adl.py | 354 ----------------- py_adl/__init__.py | 0 py_adl/adl.py | 357 ++++++++++++++++++ good_title.txt => py_adl/good_title.txt | 0 problem_title.txt => py_adl/problem_title.txt | 0 setup.py | 44 +++ test.py | 3 + 9 files changed, 408 insertions(+), 355 deletions(-) create mode 100644 .gitignore delete mode 100644 adl.py create mode 100644 py_adl/__init__.py create mode 100644 py_adl/adl.py rename good_title.txt => py_adl/good_title.txt (100%) rename problem_title.txt => py_adl/problem_title.txt (100%) create mode 100644 setup.py create mode 100644 test.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e1bc65a --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/py_adl.egg-info +/dist +/py_adl/__pycache__ \ No newline at end of file diff --git a/README.md b/README.md index 6e77daf..4544162 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# pyadl +# py-adl My python version of the popular adl wrapper for trackma and anime downloader I created this program because I really like the idea of the original [adl](https://github.com/RaitaroH/adl) wrapper script for [anime-downloader](https://github.com/anime-dl/anime-downloader) and [trackma](https://github.com/z411/trackma), but wasn't able to use once I got over to windows and now here I'm trying to port it to python. diff --git a/adl.py b/adl.py deleted file mode 100644 index 02acd78..0000000 --- a/adl.py +++ /dev/null @@ -1,354 +0,0 @@ -import os, subprocess, sys, argparse -from iterfzf import iterfzf -from time import sleep - -# global variables -account = "0" # trackma account -retrieve = True # retrieve new list -player = "mpv" # specific player -download = False # specify whether to download or not -msg = "watching" # msg for the watch prompt -good_title = open("good_title.txt").readlines() # the list of good titles -problematic_titles = open("problem_title.txt").readlines() # list of problematic titles - -ap = argparse.ArgumentParser() - -ap.add_argument("-a", "--account", required=False, - help="By default trackma will use account 1. Use '-a 2' for example to change trackma account") -ap.add_argument("-p", "--player", required=False, - help="Define player used for streaming. Ex: \033[0;36mpyadl -p mpv\033[0m") -ap.add_argument("-d", "--download", required=False, type=bool, nargs='?', const=True, default=False, - help="Download instead of streaming") -ap.add_argument("-v", "--version", required=False, nargs='?', const=True, - help="Display version and exit") - -args = vars(ap.parse_args()) - -if args['account']: - account = str(int(args["account"]) - 1) - -if args["player"]: - player = str(args["player"]) - -if args["download"]: - download = True - msg = "downloading" - -if args["version"]: - print("Pyadl version 0.1") - sys.exit() - -# colored print -def color_print(text): - print("\033[0;36m" + text + " \033[0m") - -# colored watch primpt -def watch_prompt(title, episode): - print("Now " + msg + " \033[0;34m" + title + "\033[0m, episode \033[0;34m" + str(episode) + " \033[0m") - -# colored input -def color_prommpt(text): - return input("\033[0;34m" + text + "\033[0m") - -# iter the list -def iter_list(alist): - for anime in alist: - yield anime.strip() - sleep(0.01) - -# retrieve new list -def retrieve_list(): - color_print ("Running trackma retrieve for account " + account + "...") - os.system("trackma -a " + account + " retrieve") - os.system("cls") - -# retrieve updated list -def retrieve_list_update(account): - color_print("Running trackma retrieve for account " + account + " to get the updated list...") - os.system("trackma -a " + account + " retrieve") - os.system("cls") - -# load list -def load_list(): - alist = subprocess.getoutput("trackma -a " + account + " list").splitlines() - alist.pop(0) - alist.pop() - return alist - -# exit prompt -def exit_ask(): - while True: - os.system("cls") - choice = color_prommpt("Want to watch another anime? [Y/n]: ") - if choice == "": - sys.exit() - elif choice == "N" or choice == "n": - sys.exit() - elif choice == "Y" or choice == "y": - return - -# check for problematic title -def check_title(title): - for problem in problematic_titles: - if problem.__contains__(title): - title = good_title[problematic_titles.index(problem)] - return title - -# get your title -def get_title(full_choice): - full_choice = full_choice[9:55] - full_choice = full_choice.rstrip(".") - title = check_title(full_choice) - return title - -# get episode -def get_episode(full_choice): - full_choice = full_choice[58:60] - return int(full_choice) - -# get all episodes -def get_all_episodes(full_choice): - full_choice = full_choice[63:65] - return full_choice - -# get score -def get_score(full_choice): - full_choice = full_choice[68:71] - return full_choice - -# next episode -def next_episode(title,episode): - if not download: - watch_next = True - while watch_next: - episode = episode + 1 - watch_prompt(title, str(episode)) - os.system('anime dl "' + title + '" --episodes ' + str(episode) + ' --play ' + player) - while True: - color_print("Current watched episode: " + str(episode)) - yn = color_prommpt("Wanna watch next episode? [Y/n]: ") - if yn == "Y" or yn == "y": - break - elif yn == "N" or yn == "n": - watch_next = False - break - else: - episode = episode + 1 - watch_prompt(title, str(episode)) - os.system('anime dl "' + title + '" --episodes ' + str(episode)) - -# all from last watched -def all_from_last(title,episode): - watch_prompt(title, str(episode) + " all left episodes") - if not download: - os.system('anime dl "' + title + '" --episodes ' + str(episode + 1) + ': --play' + player) - else: - os.system('anime dl "' + title + '" --episodes ' + str(episode + 1) + ':') - -# all episode -def all_episodes(title): - watch_prompt(title, "all") - if not download: - os.system('anime dl "' + title + '" --episodes 1: --play ' + player) - else: - os.system('anime dl "' + title + '" --episodes 1:') - -# watch from custom range -def custom_episode_range(title): - begginig = color_prommpt("Beggining of interval?: ") - end = color_prommpt("End of interval?: ") - watch_prompt(title, begginig + " to " + end) - if not download: - os.system('anime dl "' + title + '" --episodes ' + begginig + ':' + end +' --play ' + player) - else: - os.system('anime dl "' + title + '" --episodes ' + begginig + ':' + end) - -# add to last watched m -def next_plus_n(title, episode, action): - watch_prompt(title, str(episode + int(action))) - if not download: - os.system('anime dl "' + title + '" --episodes ' + str(episode + int(action)) + ' --play ' + player) - else: - os.system('anime dl "' + title + '" --episodes ' + str(episode + int(action))) - -# rewatch current episode -def rewatch_episode(title, episode): - watch_prompt(title, str(episode)) - if not download: - os.system('anime dl "' + title + '" --episodes ' + str(episode) + ' --play ' + player) - else: - os.system('anime dl "' + title + '" --episodes ' + str(episode)) - -# watch custom episode -def custom_episode(title): - episode = color_prommpt("Enter custom episode: ") - watch_prompt(title, episode) - if not download: - os.system('anime dl "' + title + '" --episodes ' + episode + ' --play ' + player) - else: - os.system('anime dl "' + title + '" --episodes ' + episode) - -# update title -def update_title(title, episode): - color_print("Current episode for " + title + " is " + str(episode)) - custom = color_prommpt("Enter updated episode number: ") - if custom != "": - os.system('trackma -a ' + account + ' update "' + title + '" ' + custom) - os.system('trackma -a' + account + ' send') - retrieve_list_update(account) - else: - color_print("Skipping updating...") - -# update score -def update_score(title, score): - color_print("Current score for " + title + " is " + score) - custom = color_prommpt("Enter updated score: ") - if custom != "": - os.system('trackma -a ' + account + ' score "' + title + '" ' + custom) - os.system('trackma -a' + account + ' send') - retrieve_list_update(account) - else: - color_print("Skipping updating...") - -# update question -def update_question(title, episode, score): - while True: - color_print("Skipping watching episodes. Modifing entry.") - choice = color_prommpt("Update episode number or update score [E/s]: ") - if choice == "e" or choice == "E": - update_title(title, episode) - break - elif choice == "s" or choice == "S": - update_score(title, score) - break - -# ask if you wanna continus watching -def wanna_continu_watch(): - while True: - if not download: - yn = color_prommpt("Wanna continue watching? [Y/n]: ") - else: - yn = color_prommpt("Wanna continue downloading? [Y/n]: ") - if yn == "y" or yn == "Y": - return True - elif yn == "n" or yn == "N": - return False - -# ask if you wanna update title meta after watch -def wanna_update_title_after_watch(title, episode, score): - if not download: - while True: - yn = color_prommpt("Wanna update episode number or update score of watched anime? [N/e/s]: ") - if yn == "E" or yn == "e": - update_title(title, episode) - break - elif yn == "S" or yn == "s": - update_score(title, score) - break - elif yn == "N" or yn == "n": - break - -# choose what to do with episode -def choose_episode(): - os.system("cls") - color_print("Enter lowercase or uppercase to issue command:") - color_print(" N - Next episode (default, press )") - color_print(" L - from current to Last known:") - color_print(" A - All available, from episode 1") - color_print(" I - custom Interval (range) of episodes") - color_print(" 0-9 - Plus n episodes relative to last seen (type number)") - color_print(" R - Rewatch/redownload current episode in list") - color_print(" C - Custom episode") - color_print(" U - Update entry chosen instead of streaming") - color_print(" S - Skip. Choose another show.") - return color_prommpt("Your choice? [N/l/a/i/0-9/r/c/u/s]: ") - -# main loop -while True: - # retrieving the list on start - if retrieve: - retrieve_list() - retrieve = False - - # get the list of anime - alist = load_list() - # choose an anime from the list - choice = iterfzf(iter_list(alist)) - - if choice: - # get the whole choice into a string - full_choice = "".join(choice) - # get the title - title = get_title(full_choice) - # get current episode - episode = get_episode(full_choice) - # get latest episode - last_episode = get_all_episodes(full_choice) - # get current score - score = get_score(full_choice) - - # the watch loop - while True: - # choose what to do with the choosen anime - action = choose_episode() - # watch next episode - if action == "": - next_episode(title, episode) - wanna_update_title_after_watch(title, episode, score) - break - # same - elif action == "n" or action == "N": - next_episode(title, episode) - wanna_update_title_after_watch(title, episode, score) - break - # watch all left episodes - elif action == "l" or action == "L": - all_from_last(title, episode,last_episode) - wanna_update_title_after_watch(title, episode, score) - break - # watch every episode available - elif action == "a" or action == "A": - all_episodes(title) - wanna_update_title_after_watch(title, episode, score) - break - # custom range of episodes - elif action == "i" or action == "I": - custom_episode_range(title) - if wanna_continu_watch(): - continue - else: - wanna_update_title_after_watch(title, episode, score) - break - # something? - elif action == "1" or action == "2" or action == "3" or action == "4" or action == "5" or action == "6" or action == "7" or action == "8" or action == "9": - next_plus_n(title, episode, action) - if wanna_continu_watch(): - continue - else: - wanna_update_title_after_watch(title, episode, score) - break - # rewatch current episode - elif action == "r" or action == "R": - rewatch_episode(title, episode) - if wanna_continu_watch(): - continue - else: - wanna_update_title_after_watch(title, episode, score) - break - # watch custom episode - elif action == "c" or action == "C": - custom_episode(title) - if wanna_continu_watch(): - continue - else: - wanna_update_title_after_watch(title, episode, score) - break - # update anime meta - elif action == "u" or action == "U": - update_question(title, episode, score) - break - # skip the anime - elif action == "s" or action == "S": - break - else: - exit_ask() \ No newline at end of file diff --git a/py_adl/__init__.py b/py_adl/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/py_adl/adl.py b/py_adl/adl.py new file mode 100644 index 0000000..72cdeda --- /dev/null +++ b/py_adl/adl.py @@ -0,0 +1,357 @@ +import os, subprocess, sys, argparse +from iterfzf import iterfzf +from time import sleep + +# global variables +def main(): + dn = os.path.dirname(os.path.realpath(__file__)) + account = "0" # trackma account + retrieve = True # retrieve new list + player = "mpv" # specific player + download = False # specify whether to download or not + msg = "watching" # msg for the watch prompt + good_title = open(dn + "/good_title.txt").readlines() # the list of good titles + problematic_titles = open(dn + "/problem_title.txt").readlines() # list of problematic titles + + ap = argparse.ArgumentParser() + + ap.add_argument("-a", "--account", required=False, + help="By default trackma will use account 1. Use '-a 2' for example to change trackma account") + ap.add_argument("-p", "--player", required=False, + help="Define player used for streaming. Ex: \033[0;36mpyadl -p mpv\033[0m") + ap.add_argument("-d", "--download", required=False, type=bool, nargs='?', const=True, default=False, + help="Download instead of streaming") + ap.add_argument("-v", "--version", required=False, nargs='?', const=True, + help="Display version and exit") + + args = vars(ap.parse_args()) + + if args['account']: + account = str(int(args["account"]) - 1) + + if args["player"]: + player = str(args["player"]) + + if args["download"]: + download = True + msg = "downloading" + + if args["version"]: + print("Py-adl version 0.1") + sys.exit() + + # colored print + def color_print(text): + print("\033[0;36m" + text + " \033[0m") + + # colored watch primpt + def watch_prompt(title, episode): + print("Now " + msg + " \033[0;34m" + title + "\033[0m, episode \033[0;34m" + str(episode) + " \033[0m") + + # colored input + def color_prommpt(text): + return input("\033[0;34m" + text + "\033[0m") + + # iter the list + def iter_list(alist): + for anime in alist: + yield anime.strip() + sleep(0.01) + + # retrieve new list + def retrieve_list(): + color_print ("Running trackma retrieve for account " + account + "...") + os.system("trackma -a " + account + " retrieve") + os.system("cls") + + # retrieve updated list + def retrieve_list_update(account): + color_print("Running trackma retrieve for account " + account + " to get the updated list...") + os.system("trackma -a " + account + " retrieve") + os.system("cls") + + # load list + def load_list(): + alist = subprocess.getoutput("trackma -a " + account + " list").splitlines() + alist.pop(0) + alist.pop() + return alist + + # exit prompt + def exit_ask(): + while True: + os.system("cls") + choice = color_prommpt("Want to watch another anime? [Y/n]: ") + if choice == "": + sys.exit() + elif choice == "N" or choice == "n": + sys.exit() + elif choice == "Y" or choice == "y": + return + + # check for problematic title + def check_title(title): + for problem in problematic_titles: + if problem.__contains__(title): + title = good_title[problematic_titles.index(problem)] + return title + + # get your title + def get_title(full_choice): + full_choice = full_choice[9:55] + full_choice = full_choice.rstrip(".") + title = check_title(full_choice) + return title + + # get episode + def get_episode(full_choice): + full_choice = full_choice[58:60] + return int(full_choice) + + # get all episodes + def get_all_episodes(full_choice): + full_choice = full_choice[63:65] + return full_choice + + # get score + def get_score(full_choice): + full_choice = full_choice[68:71] + return full_choice + + # next episode + def next_episode(title,episode): + if not download: + watch_next = True + while watch_next: + episode = episode + 1 + watch_prompt(title, str(episode)) + os.system('anime dl "' + title + '" --episodes ' + str(episode) + ' --play ' + player) + while True: + color_print("Current watched episode: " + str(episode)) + yn = color_prommpt("Wanna watch next episode? [Y/n]: ") + if yn == "Y" or yn == "y": + break + elif yn == "N" or yn == "n": + watch_next = False + break + else: + episode = episode + 1 + watch_prompt(title, str(episode)) + os.system('anime dl "' + title + '" --episodes ' + str(episode)) + + # all from last watched + def all_from_last(title,episode): + watch_prompt(title, str(episode) + " all left episodes") + if not download: + os.system('anime dl "' + title + '" --episodes ' + str(episode + 1) + ': --play' + player) + else: + os.system('anime dl "' + title + '" --episodes ' + str(episode + 1) + ':') + + # all episode + def all_episodes(title): + watch_prompt(title, "all") + if not download: + os.system('anime dl "' + title + '" --episodes 1: --play ' + player) + else: + os.system('anime dl "' + title + '" --episodes 1:') + + # watch from custom range + def custom_episode_range(title): + begginig = color_prommpt("Beggining of interval?: ") + end = color_prommpt("End of interval?: ") + watch_prompt(title, begginig + " to " + end) + if not download: + os.system('anime dl "' + title + '" --episodes ' + begginig + ':' + end +' --play ' + player) + else: + os.system('anime dl "' + title + '" --episodes ' + begginig + ':' + end) + + # add to last watched m + def next_plus_n(title, episode, action): + watch_prompt(title, str(episode + int(action))) + if not download: + os.system('anime dl "' + title + '" --episodes ' + str(episode + int(action)) + ' --play ' + player) + else: + os.system('anime dl "' + title + '" --episodes ' + str(episode + int(action))) + + # rewatch current episode + def rewatch_episode(title, episode): + watch_prompt(title, str(episode)) + if not download: + os.system('anime dl "' + title + '" --episodes ' + str(episode) + ' --play ' + player) + else: + os.system('anime dl "' + title + '" --episodes ' + str(episode)) + + # watch custom episode + def custom_episode(title): + episode = color_prommpt("Enter custom episode: ") + watch_prompt(title, episode) + if not download: + os.system('anime dl "' + title + '" --episodes ' + episode + ' --play ' + player) + else: + os.system('anime dl "' + title + '" --episodes ' + episode) + + # update title + def update_title(title, episode): + color_print("Current episode for " + title + " is " + str(episode)) + custom = color_prommpt("Enter updated episode number: ") + if custom != "": + os.system('trackma -a ' + account + ' update "' + title + '" ' + custom) + os.system('trackma -a' + account + ' send') + retrieve_list_update(account) + else: + color_print("Skipping updating...") + + # update score + def update_score(title, score): + color_print("Current score for " + title + " is " + score) + custom = color_prommpt("Enter updated score: ") + if custom != "": + os.system('trackma -a ' + account + ' score "' + title + '" ' + custom) + os.system('trackma -a' + account + ' send') + retrieve_list_update(account) + else: + color_print("Skipping updating...") + + # update question + def update_question(title, episode, score): + while True: + color_print("Skipping watching episodes. Modifing entry.") + choice = color_prommpt("Update episode number or update score [E/s]: ") + if choice == "e" or choice == "E": + update_title(title, episode) + break + elif choice == "s" or choice == "S": + update_score(title, score) + break + + # ask if you wanna continus watching + def wanna_continu_watch(): + while True: + if not download: + yn = color_prommpt("Wanna continue watching? [Y/n]: ") + else: + yn = color_prommpt("Wanna continue downloading? [Y/n]: ") + if yn == "y" or yn == "Y": + return True + elif yn == "n" or yn == "N": + return False + + # ask if you wanna update title meta after watch + def wanna_update_title_after_watch(title, episode, score): + if not download: + while True: + yn = color_prommpt("Wanna update episode number or update score of watched anime? [N/e/s]: ") + if yn == "E" or yn == "e": + update_title(title, episode) + break + elif yn == "S" or yn == "s": + update_score(title, score) + break + elif yn == "N" or yn == "n": + break + + # choose what to do with episode + def choose_episode(): + os.system("cls") + color_print("Enter lowercase or uppercase to issue command:") + color_print(" N - Next episode (default, press )") + color_print(" L - from current to Last known:") + color_print(" A - All available, from episode 1") + color_print(" I - custom Interval (range) of episodes") + color_print(" 0-9 - Plus n episodes relative to last seen (type number)") + color_print(" R - Rewatch/redownload current episode in list") + color_print(" C - Custom episode") + color_print(" U - Update entry chosen instead of streaming") + color_print(" S - Skip. Choose another show.") + return color_prommpt("Your choice? [N/l/a/i/0-9/r/c/u/s]: ") + + + # main loop + while True: + # retrieving the list on start + if retrieve: + retrieve_list() + retrieve = False + + # get the list of anime + alist = load_list() + # choose an anime from the list + choice = iterfzf(iter_list(alist)) + + if choice: + # get the whole choice into a string + full_choice = "".join(choice) + # get the title + title = get_title(full_choice) + # get current episode + episode = get_episode(full_choice) + # get latest episode + last_episode = get_all_episodes(full_choice) + # get current score + score = get_score(full_choice) + + # the watch loop + while True: + # choose what to do with the choosen anime + action = choose_episode() + # watch next episode + if action == "": + next_episode(title, episode) + wanna_update_title_after_watch(title, episode, score) + break + # same + elif action == "n" or action == "N": + next_episode(title, episode) + wanna_update_title_after_watch(title, episode, score) + break + # watch all left episodes + elif action == "l" or action == "L": + all_from_last(title, episode,last_episode) + wanna_update_title_after_watch(title, episode, score) + break + # watch every episode available + elif action == "a" or action == "A": + all_episodes(title) + wanna_update_title_after_watch(title, episode, score) + break + # custom range of episodes + elif action == "i" or action == "I": + custom_episode_range(title) + if wanna_continu_watch(): + continue + else: + wanna_update_title_after_watch(title, episode, score) + break + # something? + elif action == "1" or action == "2" or action == "3" or action == "4" or action == "5" or action == "6" or action == "7" or action == "8" or action == "9": + next_plus_n(title, episode, action) + if wanna_continu_watch(): + continue + else: + wanna_update_title_after_watch(title, episode, score) + break + # rewatch current episode + elif action == "r" or action == "R": + rewatch_episode(title, episode) + if wanna_continu_watch(): + continue + else: + wanna_update_title_after_watch(title, episode, score) + break + # watch custom episode + elif action == "c" or action == "C": + custom_episode(title) + if wanna_continu_watch(): + continue + else: + wanna_update_title_after_watch(title, episode, score) + break + # update anime meta + elif action == "u" or action == "U": + update_question(title, episode, score) + break + # skip the anime + elif action == "s" or action == "S": + break + else: + exit_ask() \ No newline at end of file diff --git a/good_title.txt b/py_adl/good_title.txt similarity index 100% rename from good_title.txt rename to py_adl/good_title.txt diff --git a/problem_title.txt b/py_adl/problem_title.txt similarity index 100% rename from problem_title.txt rename to py_adl/problem_title.txt diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..effa0c3 --- /dev/null +++ b/setup.py @@ -0,0 +1,44 @@ +from setuptools import setup, find_packages + +try: + LONG_DESCRIPTION = open("README.md").read() +except IOError: + LONG_DESCRIPTION = __doc__ + +VERSION = '0.1.33' +NAME = "py-adl" +DESCRIPTION = 'Python wrapper for trackma and anime-downloader' +REQUIREMENTS = ['trackma', 'pillow', 'iterfzf'] + +setup( + name=NAME, + version=VERSION, + packages=find_packages(), + + install_requires=REQUIREMENTS, + + entry_points=''' + [console_scripts] + py-adl=py_adl.adl:main + ''', + package_data={'': ['py_adl/good_title.txt', 'py_adl/problem_title.txt']}, + include_package_data=True, + + author='CronyAkatsuki', + author_email='cronyakatsuki@gmail.com', + description=DESCRIPTION, + long_description=LONG_DESCRIPTION, + long_description_content_type='text/markdown', + url='https://github.com/cronyakatsuki/py-adl', + keywords='list manager, anime, watch', + license="GPL-3", + classifiers=[ + 'Intended Audience :: End Users/Desktop', + 'Topic :: Internet', + 'Programming Language :: Python :: 3', + 'Operating System :: Unix', + 'Operating System :: MacOS :: MacOS X', + 'Operating System :: Microsoft :: Windows', + 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', + ] + ) \ No newline at end of file diff --git a/test.py b/test.py new file mode 100644 index 0000000..d8840fb --- /dev/null +++ b/test.py @@ -0,0 +1,3 @@ +from py_adl.adl import main + +main() \ No newline at end of file