Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

v1.0.3: A few useless changes.

Signed-off-by: Kwpolska <kwpolska@gmail.com>
  • Loading branch information...
commit 0c06d4beb955ec2c875b677b3bbb079de8535866 1 parent 2b45ebe
Chris Warrick authored
4 PKGBUILD
View
@@ -1,6 +1,6 @@
# Maintainer: Kwpolska <kwpolska@kwpolska.tk>
pkgname=trashman
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
pkgdesc='A Python trash manager. Python 3 build.'
arch=('any')
@@ -9,7 +9,7 @@ license=('BSD')
depends=('python')
options=(!emptydirs)
source=("http://pypi.python.org/packages/source/t/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f5133126a89bbeebb8788d2151ae81e4')
+md5sums=('e50ab675f18498dcfe8a7908230c65b9')
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
38 PKGBUILD-git
View
@@ -0,0 +1,38 @@
+# Maintainer: Kwpolska <kwpolska@kwpolska.tk>
+pkgname=trashman-git
+pkgver=20120908
+pkgrel=1
+pkgdesc='A Python trash manager. Python 3 build, version from git.'
+arch=('any')
+url='https://github.com/Kwpolska/trashman'
+license=('BSD')
+depends=('python')
+makedepends=('git')
+options=(!emptydirs)
+
+_gitroot=git://github.com/Kwpolska/trashman.git
+_gitname=trashman
+
+package() {
+ cd "${srcdir}"
+ msg "Connecting to GIT server...."
+
+ if [[ -d "${_gitname}" ]]; then
+ cd "${_gitname}" && git pull origin
+ msg "The local files are updated."
+ else
+ git clone "${_gitroot}" "${_gitname}"
+ fi
+
+ msg "GIT checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "${srcdir}/${_gitname}-build"
+ git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
+ cd "${srcdir}/${_gitname}-build"
+
+ python setup.py install --root="${pkgdir}/" --optimize=1
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${_gitname}/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
4 README
View
@@ -4,8 +4,8 @@ Trashman. A Python trash manager.
:Info: This is the README file for Trashman.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
PURPOSE
-------
4 README.rst
View
@@ -4,8 +4,8 @@ Trashman. A Python trash manager.
:Info: This is the README file for Trashman.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
PURPOSE
-------
4 docs/CHANGELOG.rst
View
@@ -3,8 +3,8 @@ CHANGELOG for Trashman
======================
:Author: Kwpolska
:Copyright: See Appendix A.
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
.. index:: CHANGELOG
4 docs/LICENSE.rst
View
@@ -3,8 +3,8 @@ Appendix A. License for Trashman
================================
:Info: This is an appendix to the Trashman documentation.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
.. index:: LICENSE
4 docs/README.rst
View
@@ -4,8 +4,8 @@ Trashman. A Python trash manager.
:Info: This is the README file for Trashman.
:Author: Kwpolska <kwpolska@kwpolska.tk>
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
PURPOSE
-------
4 docs/TODO.rst
View
@@ -3,8 +3,8 @@ TODO for Trashman
=================
:Author: Kwpolska
:Copyright: See Appendix A.
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
.. index:: TODO
4 docs/conf.py
View
@@ -51,9 +51,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.0.2'
+version = '1.0.3'
# The full version, including alpha/beta/rc tags.
-release = '1.0.2'
+release = '1.0.3'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
4 docs/functions.rst
View
@@ -3,8 +3,8 @@ Global Functions and Modules List
=================================
:Author: Kwpolska
:Copyright: See Appendix A.
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
.. index:: global functions
BIN  docs/trashman.8.gz
View
Binary file not shown
4 docs/trashman.rst
View
@@ -4,8 +4,8 @@ Trashman
:Author: Kwpolska <kwpolska@kwpolska.tk>
:Copyright: See Appendix A.
-:Date: 2012-08-29
-:Version: 1.0.2
+:Date: 2012-09-08
+:Version: 1.0.3
:Manual section: 1
:Manual group: Trashman manual
BIN  locale/en/LC_MESSAGES/trashman.mo
View
Binary file not shown
65 locale/en/LC_MESSAGES/trashman.po
View
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 1.0.2\n"
+"Project-Id-Version: 1.0.3\n"
"Report-Msgid-Bugs-To: Kwpolska <kwpolska@kwpolska.tk>\n"
-"POT-Creation-Date: 2012-08-29 10:52+0200\n"
+"POT-Creation-Date: 2012-09-08 12:05+0200\n"
"PO-Revision-Date: 2012-08-13 20:48+0200\n"
"Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
@@ -30,44 +30,48 @@ msgstr "options"
msgid "operations"
msgstr "operations"
-#: trashman/main.py:36
+#: trashman/main.py:33
+msgid "show version number and quit"
+msgstr "show version number and quit"
+
+#: trashman/main.py:37
msgid "explain what is being done"
msgstr "explain what is being done"
-#: trashman/main.py:38
+#: trashman/main.py:39
msgid "select the backend (default: config->auto->xdg)"
msgstr ""
"select the backend (default: config->auto->xdg)"
-#: trashman/main.py:42
-msgid "empty the trash and exit"
-msgstr "empty the trash and exit"
+#: trashman/main.py:43
+msgid "empty the trash and quit"
+msgstr "empty the trash and quit"
-#: trashman/main.py:44
+#: trashman/main.py:45
msgid ""
"list the files in trash and "
-"exit"
+"quit"
msgstr ""
"list the files in trash and "
-"exit"
+"quit"
-#: trashman/main.py:47
+#: trashman/main.py:48
msgid "restore FILE(s) from trash"
msgstr "restore FILE(s) from trash"
-#: trashman/main.py:49
-msgid "print the trash location and exit"
-msgstr "print the trash location and exit"
+#: trashman/main.py:50
+msgid "print the trash location and quit"
+msgstr "print the trash location and quit"
-#: trashman/main.py:52
-msgid "print the trashed files location and exit"
-msgstr "print the trashed files location and exit"
+#: trashman/main.py:53
+msgid "print the trashed files location and quit"
+msgstr "print the trashed files location and quit"
-#: trashman/main.py:54
+#: trashman/main.py:55
msgid "FILE"
msgstr "FILE"
-#: trashman/main.py:55
+#: trashman/main.py:56
msgid "files to trash"
msgstr "files to trash"
@@ -125,14 +129,31 @@ msgstr "Backend didn’t implement this functionality"
msgid "emptied the trash\n"
msgstr "emptied the trash\n"
-#: trashman/backends/xdgtrash.py:150
+#: trashman/backends/xdgtrash.py:151
msgid "trashed '{}'\n"
msgstr "trashed ‘{}’\n"
-#: trashman/backends/xdgtrash.py:165
+#: trashman/backends/xdgtrash.py:166
msgid "restored {} to {}\n"
msgstr "restored {} to {}\n"
-#: trashman/backends/xdgtrash.py:170
+#: trashman/backends/xdgtrash.py:171
msgid "no such file in trash"
msgstr "no such file to trash"
+
+#. A module only for gettext locale provision.
+#: localeprovider.py:2
+msgid "usage"
+msgstr "usage"
+
+#: localeprovider.py:2
+msgid "positional arguments"
+msgstr "positional arguments"
+
+#: localeprovider.py:2
+msgid "optional arguments"
+msgstr "optional arguments"
+
+#: localeprovider.py:2
+msgid "show this help message and exit"
+msgstr "show this help message and quit"
BIN  locale/pl/LC_MESSAGES/trashman.mo
View
Binary file not shown
58 locale/pl/LC_MESSAGES/trashman.po
View
@@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 1.0.2\n"
+"Project-Id-Version: 1.0.3\n"
"Report-Msgid-Bugs-To: Kwpolska <kwpolska@kwpolska.tk>\n"
-"POT-Creation-Date: 2012-08-29 10:52+0200\n"
+"POT-Creation-Date: 2012-09-08 12:05+0200\n"
"PO-Revision-Date: 2012-08-13 20:48+0200\n"
"Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
@@ -29,41 +29,46 @@ msgstr "opcje"
msgid "operations"
msgstr "operacje"
-#: trashman/main.py:36
+#: trashman/main.py:33
+#, fuzzy
+msgid "show version number and quit"
+msgstr "pokaż wersję i wyjdź"
+
+#: trashman/main.py:37
msgid "explain what is being done"
msgstr "wyjaśnianie co się dzieje"
-#: trashman/main.py:38
+#: trashman/main.py:39
msgid "select the backend (default: config->auto->xdg)"
msgstr "wybierz backend (domyślnie: config->auto->xdg)"
-#: trashman/main.py:42
-msgid "empty the trash and exit"
+#: trashman/main.py:43
+msgid "empty the trash and quit"
msgstr "opróźnij śmietnik i wyjdź"
-#: trashman/main.py:44
+#: trashman/main.py:45
msgid ""
"list the files in trash and "
-"exit"
+"quit"
msgstr "wylistuj pliki w śmietniku i wyjdź"
-#: trashman/main.py:47
+#: trashman/main.py:48
msgid "restore FILE(s) from trash"
msgstr "przywróć PLIK(i) ze śmietnika"
-#: trashman/main.py:49
-msgid "print the trash location and exit"
+#: trashman/main.py:50
+msgid "print the trash location and quit"
msgstr "wypisz lokalizację śmietnika i wyjdź"
-#: trashman/main.py:52
-msgid "print the trashed files location and exit"
+#: trashman/main.py:53
+msgid "print the trashed files location and quit"
msgstr "wypisz lokalizację plików w śmietniku i wyjdź"
-#: trashman/main.py:54
+#: trashman/main.py:55
msgid "FILE"
msgstr "PLIK"
-#: trashman/main.py:55
+#: trashman/main.py:56
msgid "files to trash"
msgstr "pliki do wyrzucenia"
@@ -121,14 +126,31 @@ msgstr "Backend nie zaimplementował tej funkcjonalności"
msgid "emptied the trash\n"
msgstr "opróżniono śmietnik\n"
-#: trashman/backends/xdgtrash.py:150
+#: trashman/backends/xdgtrash.py:151
msgid "trashed '{}'\n"
msgstr "wyrzucony „{}”\n"
-#: trashman/backends/xdgtrash.py:165
+#: trashman/backends/xdgtrash.py:166
msgid "restored {} to {}\n"
msgstr "przywrócony {} do {}\n"
-#: trashman/backends/xdgtrash.py:170
+#: trashman/backends/xdgtrash.py:171
msgid "no such file in trash"
msgstr "nie ma takiego pliku w śmietniku"
+
+#. A module only for gettext locale provision.
+#: localeprovider.py:2
+msgid "usage"
+msgstr "sposób użycia"
+
+#: localeprovider.py:2
+msgid "positional arguments"
+msgstr "argumenty pozycyjne:"
+
+#: localeprovider.py:2
+msgid "optional arguments"
+msgstr "argumenty opcjonalne:"
+
+#: localeprovider.py:2
+msgid "show this help message and exit"
+msgstr "pokaż ten opis i wyjdź"
2  localeprovider.py
View
@@ -0,0 +1,2 @@
+# A module only for gettext locale provision.
+translationcheat = _('usage') + _('positional arguments') + _('optional arguments') + _('show this help message and exit')
59 messages.pot
View
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 1.0.2\n"
+"Project-Id-Version: 1.0.3\n"
"Report-Msgid-Bugs-To: Kwpolska <kwpolska@kwpolska.tk>\n"
-"POT-Creation-Date: 2012-08-29 10:52+0200\n"
-"PO-Revision-Date: 2012-08-29 10:52+0200\n"
+"POT-Creation-Date: 2012-09-08 12:05+0200\n"
+"PO-Revision-Date: 2012-09-08 12:05+0200\n"
"Last-Translator: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language-Team: Kwpolska <kwpolska@kwpolska.tk>\n"
"Language: en\n"
@@ -29,41 +29,45 @@ msgstr ""
msgid "operations"
msgstr ""
-#: trashman/main.py:36
+#: trashman/main.py:33
+msgid "show version number and quit"
+msgstr ""
+
+#: trashman/main.py:37
msgid "explain what is being done"
msgstr ""
-#: trashman/main.py:38
+#: trashman/main.py:39
msgid "select the backend (default: config->auto->xdg)"
msgstr ""
-#: trashman/main.py:42
-msgid "empty the trash and exit"
+#: trashman/main.py:43
+msgid "empty the trash and quit"
msgstr ""
-#: trashman/main.py:44
+#: trashman/main.py:45
msgid ""
"list the files in trash and "
-"exit"
+"quit"
msgstr ""
-#: trashman/main.py:47
+#: trashman/main.py:48
msgid "restore FILE(s) from trash"
msgstr ""
-#: trashman/main.py:49
-msgid "print the trash location and exit"
+#: trashman/main.py:50
+msgid "print the trash location and quit"
msgstr ""
-#: trashman/main.py:52
-msgid "print the trashed files location and exit"
+#: trashman/main.py:53
+msgid "print the trashed files location and quit"
msgstr ""
-#: trashman/main.py:54
+#: trashman/main.py:55
msgid "FILE"
msgstr ""
-#: trashman/main.py:55
+#: trashman/main.py:56
msgid "files to trash"
msgstr ""
@@ -121,14 +125,31 @@ msgstr ""
msgid "emptied the trash\n"
msgstr ""
-#: trashman/backends/xdgtrash.py:150
+#: trashman/backends/xdgtrash.py:151
msgid "trashed '{}'\n"
msgstr ""
-#: trashman/backends/xdgtrash.py:165
+#: trashman/backends/xdgtrash.py:166
msgid "restored {} to {}\n"
msgstr ""
-#: trashman/backends/xdgtrash.py:170
+#: trashman/backends/xdgtrash.py:171
msgid "no such file in trash"
msgstr ""
+
+#. A module only for gettext locale provision.
+#: localeprovider.py:2
+msgid "usage"
+msgstr ""
+
+#: localeprovider.py:2
+msgid "positional arguments"
+msgstr ""
+
+#: localeprovider.py:2
+msgid "optional arguments"
+msgstr ""
+
+#: localeprovider.py:2
+msgid "show this help message and exit"
+msgstr ""
2  release
View
@@ -33,7 +33,7 @@ rm docs/trashman.8.gz | true
rst2man docs/trashman.rst > docs/trashman.8
gzip docs/trashman.8
-xgettext -c ./trashman/*.py ./trashman/backends/*.py -o ./messages.pot
+xgettext -c ./trashman/*.py ./trashman/backends/*.py ./localeprovider.py -o ./messages.pot
sed '1,+17d' ./messages.pot > ./messages.pot.tmp
2  setup.py
View
@@ -6,7 +6,7 @@
from distutils.core import setup
setup(name='trashman',
- version='1.0.2',
+ version='1.0.3',
description='A Python trash manager.',
author='Kwpolska',
author_email='kwpolska@kwpolska.tk',
4 trashman/__init__.py
View
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.2
+# Trashman v1.0.3
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# All rights reserved.
@@ -44,7 +44,7 @@
"""
__title__ = 'Trashman'
-__version__ = '1.0.2'
+__version__ = '1.0.3'
__author__ = 'Kwpolska'
__license__ = '3-clause BSD'
__docformat__ = 'restructuredtext en'
2  trashman/backends/__init__.py
View
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.2
+# Trashman v1.0.3
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
2  trashman/backends/dummytrash.py
View
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.2
+# Trashman v1.0.3
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
2  trashman/backends/trash.py
View
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.2
+# Trashman v1.0.3
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
2  trashman/backends/xdgtrash.py
View
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.2
+# Trashman v1.0.3
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
31 trashman/main.py
View
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
-# Trashman v1.0.2
+# Trashman v1.0.3
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
@@ -30,7 +30,8 @@ def main():
argopr = parser.add_argument_group(_('operations'))
parser.add_argument('-V', '--version', action='version',
- version='Trashman v' + __version__)
+ version='Trashman v' + __version__, help=_('show \
+ version number and quit'))
argopt.add_argument('-v', '--verbose', action='store_true', default=False,
dest='verbose', help=_('explain what is being done'))
@@ -39,54 +40,54 @@ def main():
config->auto->xdg)'))
argopr.add_argument('-e', '--empty', action='store_true', default=False,
- dest='empty', help=_('empty the trash and exit'))
+ dest='empty', help=_('empty the trash and quit'))
argopr.add_argument('-l', '--list', action='store_true', default=False,
dest='flist', help=_('list the files in trash and \
- exit'))
+ quit'))
argopr.add_argument('-r', '--restore', action='store_true', default=False,
dest='restore', help=_('restore FILE(s) from trash'))
argopr.add_argument('-w', '--trash-location', action='store_true',
default=False, dest='showtloc', help=_('print the \
- trash location and exit'))
+ trash location and quit'))
argopr.add_argument('-W', '--files-location', action='store_true',
default=False, dest='showfloc', help=_('print the \
- trashed files location and exit'))
+ trashed files location and quit'))
parser.add_argument('files', metavar=_('FILE'), action='store', nargs='*',
help=_('files to trash'))
args = parser.parse_args()
- exit_notrash = False
+ quit_notrash = False
select(args.backend)
if args.backend == 'info':
- sys.exit(0)
+ quit_notrash = True
else:
DS.trash.regenerate()
if args.flist:
DS.trash.list()
- exit_notrash = True
+ quit_notrash = True
if args.showtloc:
print(DS.trash.trashdir)
- exit_notrash = True
+ quit_notrash = True
if args.showfloc:
print(DS.trash.filedir)
- exit_notrash = True
+ quit_notrash = True
if args.restore:
for fileres in args.files:
DS.trash.restore(fileres, args.verbose)
- exit_notrash = True
+ quit_notrash = True
if args.empty:
DS.trash.empty(args.verbose)
- exit_notrash = True
+ quit_notrash = True
- if exit_notrash:
+ if quit_notrash:
exit()
else:
- # Did not exit? We can trash.
+ # Did not quit? We can trash.
for filedel in args.files:
DS.trash.trash(filedel, args.verbose)
2  trashman/tmds.py
View
@@ -1,6 +1,6 @@
#!/usr/bin/python3
# -*- encoding: utf-8 -*-
-# Trashman v1.0.2
+# Trashman v1.0.3
# A Python trash manager.
# Copyright (C) 2011-2012, Kwpolska.
# See /LICENSE for licensing information.
Please sign in to comment.
Something went wrong with that request. Please try again.