diff options
Diffstat (limited to 'Pb/Breaker/__init__.py')
| -rwxr-xr-x | Pb/Breaker/__init__.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Pb/Breaker/__init__.py b/Pb/Breaker/__init__.py index 14e33b5..2d2f573 100755 --- a/Pb/Breaker/__init__.py +++ b/Pb/Breaker/__init__.py @@ -17,28 +17,32 @@ HEADER_OFFSET = 2000 class Breaker(Pb): def __init__(self, url=None, breaktype=None, finalformat=DEFAULT_FINALFORMAT, - breakmode=None, breakangle=None, username=None, expanded=None): + breakmode=None, breakangle=None, username=None, expanded=None, firsttime=None): super(Breaker,self).__init__(); self.params.breaktype = self._get_breaktype(breaktype); self.params.url = url _frame = inspect.currentframe(); - _args_vals = inspect.getargvalues(frame); + _args_vals = inspect.getargvalues(_frame); for arg in _args_vals.args: - if arg not in ['breaktype', 'url']: - self.params.__setattr__(arg, self.bool_correct(_args_vals.locals[arg])) - - self.params = Params(**self.params); + if arg == "self": + continue + try: + if arg not in ['breaktype', 'url']: + self.params.__setattr__(arg, self.bool_correct(str(_args_vals.locals.get(arg)))) + except Exception as e: + sys.stderr.write("\n"+str(e)+"\n") self.tag = "imBreak" self.commands = []; self._now = self.now() self.files_created = [] - self.basename, self._first_format = self._get_filename_and_type_from_url(); + self.basename, self._first_format = self._get_filename_and_type_from_url(self.params.url); self._downloaded_file = self.tempname_create(basename=self.basename, fmt=self._first_format) + try: self.download(self.params.url, self._downloaded_file) self.files_created.append(self._downloaded_file) @@ -60,7 +64,7 @@ class Breaker(Pb): self._conversion_file = self.tempname_create(basename=self.basename, fmt=self.params.breaktype); def _call_cmd(self, cmd): - super(Breaker,self)._call_cmd(cmd, error) + super(Breaker,self)._call_cmd(cmd) self.commands.append(" ".join(cmd)); def _get_breaktype(self, key): |