Browse Source

Fix small differences caused by the rebase of "develop" to "master".

pull/7/head
ShyPike 14 years ago
parent
commit
dd95becdff
  1. 1
      .gitignore
  2. 73
      README.md
  3. 738
      po/main/SABnzbd.pot
  4. 48
      po/nsis/SABnsis.pot
  5. 1
      sabnzbd/api.py
  6. 23
      sabnzbd/emailer.py
  7. 1
      sabnzbd/postproc.py
  8. 1
      sabnzbd/skintext.py

1
.gitignore

@ -17,6 +17,7 @@ po/*/ro.po
SABnzbd*.zip SABnzbd*.zip
SABnzbd*.exe SABnzbd*.exe
SABnzbd*.gz SABnzbd*.gz
SABnzbd*.dmg
# WingIDE project file # WingIDE project file
*.wpr *.wpr

73
README.md

@ -1,19 +1,54 @@
SABnzbd Development branch SABnzbd - The automated Usenet download tool
========================== ============================================
What's new: SABnzbd is an Open Source Binary Newsreader written in Python.
-----------
- Quotum management It's totally free, incredibly easy to use, and works practically everywhere.
- Universal Growl support
- Limited article retries for servers SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.
- Pre-download check
If you want to know more you can head over to our website: http://sabnzbd.org.
About:
----- ## Resolving Dependencies
> SABnzbd is an open-source cross-platform binary newsreader.
> It simplifies the process of downloading from Usenet dramatically, SABnzbd has a good deal of dependencies you'll need before you can get running. If you've previously run SABnzbd from one of the various Linux packages floating around (Ubuntu, Debian, Fedora, etc), then you likely already have all the needed dependencies. If not, here's what you're looking for:
> thanks to its friendly web-based user interface and advanced
> built-in post-processing options that automatically verify, repair, - `python` (We support Python 2.5-2.7, preferably 2.6 or 2.7.)
> extract and clean up posts downloaded from Usenet. - `python-cheetah`
> - `python-configobj`
> (c) Copyright 2007-2011 by "The SABnzbd-team" <team@sabnzbd.org> - `python-feedparser`
- `python-dbus`
- `python-openssl`
- `python-support`
- `python-yenc`
- `par2` (Multi-threaded par2 can be downloaded from [ChuChuSoft](http://chuchusoft.com/par2_tbb/download.html) )
- `unrar` (Make sure you get the "official" non-free version of unrar)
- `unzip`
Your package manager should supply these. If not, we've got links in our more in-depth [installation guide](https://github.com/sabnzbd/sabnzbd/blob/master/INSTALL.txt).
## Running SABnzbd from source
Once you've sorted out all the dependencies, simply run:
```
python SABnzbd.py
```
Or, if you want to run in the background:
```
python -d -f /path/to/sabnzbd.ini
```
If you want multi-language support, run:
```
python tools/make_mo.py
```
Our many other commandline options are explained in depth [here](http://wiki.sabnzbd.org/command-line-parameters).
## About Our Repo
We're going to be attempting to follow the [gitflow model](http://nvie.com/posts/a-successful-git-branching-model/), so you can consider "master" to be whatever our present stable release build is (presently 0.6.x) and "develop" to be whatever our next build will be (presently 0.7.x). Once we transition from unstable to stable dev builds we'll create release branches, and encourage you to follow along and help us test.

738
po/main/SABnzbd.pot

File diff suppressed because it is too large

48
po/nsis/SABnsis.pot

@ -5,7 +5,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: SABnzbd-0.6.x\n" "Project-Id-Version: SABnzbd-0.7.x\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: shypike@sabnzbd.org\n" "Last-Translator: shypike@sabnzbd.org\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -13,55 +13,75 @@ msgstr ""
"Content-Type: text/plain; charset=ASCII\n" "Content-Type: text/plain; charset=ASCII\n"
"Content-Transfer-Encoding: 7bit\n" "Content-Transfer-Encoding: 7bit\n"
#: NSIS_Installer.nsi:350 #: NSIS_Installer.nsi:408
msgid "Start SABnzbd (hidden)" msgid "Start SABnzbd (hidden)"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:359 #: NSIS_Installer.nsi:417
msgid "Show Release Notes" msgid "Show Release Notes"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:368 #: NSIS_Installer.nsi:426
msgid "Support the project, Donate!" msgid "Support the project, Donate!"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:377 #: NSIS_Installer.nsi:435
msgid "Please close \"SABnzbd.exe\" first" msgid "Please close \"SABnzbd.exe\" first"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:386 #: NSIS_Installer.nsi:444
msgid " >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the release notes or go to http://wiki.sabnzbd.org/introducing-0-6-0 !" msgid " >>>> WARNING <<<<\\r\\n\\r\\nPlease, first check the release notes or go to http://wiki.sabnzbd.org/introducing-0-6-0 !"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:395 #: NSIS_Installer.nsi:453
msgid "This will uninstall SABnzbd from your system" msgid "This will uninstall SABnzbd from your system"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:404 #: NSIS_Installer.nsi:462
msgid "Run at startup" msgid "Run at startup"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:413 #: NSIS_Installer.nsi:471
msgid "Desktop Icon" msgid "Desktop Icon"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:422 #: NSIS_Installer.nsi:480
msgid "NZB File association" msgid "NZB File association"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:431 #: NSIS_Installer.nsi:489
msgid "Delete Program" msgid "Delete Program"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:440 #: NSIS_Installer.nsi:498
msgid "Delete Settings" msgid "Delete Settings"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:449 #: NSIS_Installer.nsi:507
msgid "Delete Logs" msgid "Delete Logs"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:458 #: NSIS_Installer.nsi:516
msgid "Delete Cache" msgid "Delete Cache"
msgstr "" msgstr ""
#: NSIS_Installer.nsi:525
msgid "This system requires the Microsoft runtime library VC90 to be installed first. Do you want to do that now?"
msgstr ""
#: NSIS_Installer.nsi:534
msgid "Downloading Microsoft runtime installer..."
msgstr ""
#: NSIS_Installer.nsi:543
msgid "Download error, retry?"
msgstr ""
#: NSIS_Installer.nsi:552
msgid "Cannot install without runtime library, retry?"
msgstr ""
#: NSIS_Installer.nsi:561
msgid "You cannot overwrite an existing installation. \\n\\nClick `OK` to remove the previous version or `Cancel` to cancel this upgrade."
msgstr ""

1
sabnzbd/api.py

@ -969,6 +969,7 @@ def build_queue(web_dir=None, root=None, verbose=False, prim=True, verbose_list=
info['script_list'] = list_scripts() info['script_list'] = list_scripts()
info['cat_list'] = list_cats(output is None) info['cat_list'] = list_cats(output is None)
n = 0 n = 0
found_active = False found_active = False
running_bytes = 0 running_bytes = 0

23
sabnzbd/emailer.py

@ -163,18 +163,21 @@ def send_with_template(prefix, parm):
sent = False sent = False
for temp in lst: for temp in lst:
if os.access(temp, os.R_OK): if os.access(temp, os.R_OK):
sent = True
source = _decode_file(temp) source = _decode_file(temp)
if source: if source:
for recipient in cfg.email_to(): sent = True
parm['to'] = recipient if len(cfg.email_to()):
message = Template(source=source, for recipient in cfg.email_to():
searchList=[parm], parm['to'] = recipient
filter=EmailFilter, message = Template(source=source,
compilerSettings={'directiveStartToken': '<!--#', searchList=[parm],
'directiveEndToken': '#-->'}) filter=EmailFilter,
ret = send(message.respond(), recipient) compilerSettings={'directiveStartToken': '<!--#',
del message 'directiveEndToken': '#-->'})
ret = send(message.respond(), recipient)
del message
else:
ret = T('No recipients given, no email sent')
else: else:
ret = T('Invalid encoding of email template %s') % temp ret = T('Invalid encoding of email template %s') % temp
errormsg(ret) errormsg(ret)

1
sabnzbd/postproc.py

@ -744,4 +744,3 @@ def collapse_folder(oldpath, newpath):
remove_dir(orgpath) remove_dir(orgpath)
except: except:
pass pass

1
sabnzbd/skintext.py

@ -443,6 +443,7 @@ SKIN_TEXT = {
'opt-max_opt_only' : TT('Only for optional servers'), 'opt-max_opt_only' : TT('Only for optional servers'),
'explain-max_opt_only' : TT('Apply maximum retries only to optional servers'), 'explain-max_opt_only' : TT('Apply maximum retries only to optional servers'),
# Config->Server # Config->Server
'configServer' : TT('Server configuration'), 'configServer' : TT('Server configuration'),
'defServer' : TT('Server definition'), 'defServer' : TT('Server definition'),

Loading…
Cancel
Save