Skip to content

Save username and password to a file and fix default_output_fmt AttributeError #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
b1337xyz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Save username and password to a file and fix default_output_fmt AttributeError #41

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5bccd1
Save username and password to a file and fix default_output_fmt Attri…
b1337xyz Sep 6, 2023
d1ff445
fix return TypError
b1337xyz Sep 6, 2023
d424829
fix TypeError: expected str, bytes or os.PathLike
b1337xyz Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions subdl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import io, gzip, base64
import re
import argparse
import pdb
import json

OSDB_SERVER_URI = "https://api.opensubtitles.org/xml-rpc"
xmlrpc_server = None
Expand Down Expand Up @@ -403,11 +403,29 @@ def ListLanguages():
print(language["SubLanguageID"], language["ISO639"], language["LanguageName"])


def save_login(username='', password=''):
file = os.path.join(os.getenv('XDG_CONFIG_HOME', os.getenv('HOME')),
'subdl.json')

login = {'username': username, 'password': password}
if username and password:
with open(file, 'w') as f:
json.dump(login, f, indent=2)
elif os.path.isfile(file):
with open(file, 'r') as f:
return json.load(f).values()
return login.values()


def osdb_connect():
global xmlrpc_server, login, osdb_token

username, password = save_login(options.osdb_username,
options.osdb_password)

xmlrpc_server = xmlrpc.client.ServerProxy(OSDB_SERVER_URI)
login = xmlrpc_server.LogIn(
options.osdb_username, options.osdb_password, "en", NAME + " " + VERSION
username, password, "en", NAME + " " + VERSION
)
if login["status"] != "200 OK":
fatal_error("Failed connecting to opensubtitles.org: " + login["status"])
Expand Down Expand Up @@ -506,24 +524,22 @@ def parseargs(args):
options.download = "query"
options.existing = "query"

if (
options.download
if (options.download
not in [
"all",
"first",
"query",
"none",
"best-rating",
"most-downloaded",
]
and not isnumber(options.download)
] and not isnumber(options.download)
):
fatal_error(
"Argument to --download must be numeric subtitle id or one: all, first, query, none"
)

if not options.output:
options.output = default_output_fmt()
options.output = default_output_fmt(options)

if options.utf8:
try:
Expand All @@ -545,7 +561,7 @@ def parseargs(args):
return options


def default_output_fmt():
def default_output_fmt(options):
if options.download == "all":
return "{m}.{L}.{I}.{S}"
elif options.lang == "all" or "," in options.lang:
Expand Down