Compare commits

...

7 Commits

Author SHA1 Message Date
Matteo Cypriani 28e8089316 README: missing dependency 2018-07-05 20:31:14 +02:00
Matteo Cypriani 6dbb4152f5 gcp: fix bug introduced in cbd9648
gcp was not exiting after copying.
2018-07-04 20:57:38 +02:00
Matteo Cypriani c3a865920e Move test_gcp.py to test/ subdir 2018-07-04 20:36:18 +02:00
Matteo Cypriani 4a2c1224f9 Get rid of MANIFEST.in 2018-07-04 20:36:18 +02:00
Matteo Cypriani 7ba62cdfca Tune setup.py 2018-07-04 20:36:18 +02:00
Matteo Cypriani de8fe1900c Tune MANIFEST.in 2018-07-04 19:02:04 +02:00
Matteo Cypriani b2d16599a4 Rename COPYING -> LICENSE.txt
To comply with Python packaging guidelines.
2018-07-04 19:02:04 +02:00
6 changed files with 15 additions and 13 deletions

View File

@ -1,5 +0,0 @@
include MANIFEST.in gcp.1
global-include *.py
global-include *.po *.mo
global-include CHANGELOG COPYING* README*
global-exclude *.un~ *.swp

View File

@ -59,6 +59,7 @@ complete the installation (Debian packages names, but you get the idea):
- libdbus-glib-1-dev
- libgirepository1.0-dev
- libcairo2-dev
- python3-cairo-dev
On Debian-based systems
-----------------------

11
gcp
View File

@ -317,13 +317,15 @@ class GCP():
def __copyNextFile(self):
"""Takes the last file in the list and launches the copy using glib
io_watch event."""
io_watch event.
@return: True a file was added, False otherwise."""
if not self.copy_list:
# Nothing left to copy, we quit
if self.progress:
self.__pbar_finish()
self.journal.showErrors()
self.loop.quit()
return False
source_file, dest_path, options = self.copy_list.pop()
self.journal.startFile(source_file)
@ -333,7 +335,7 @@ class GCP():
self.journal.copyFailed()
self.journal.error("can't open source")
self.journal.closeFile()
return
return True
filename = os.path.basename(source_file)
assert(filename)
@ -348,7 +350,7 @@ class GCP():
self.journal.error("already exists")
self.journal.closeFile()
source_fd.close()
return
return True
try:
dest_fd = open(dest_file, 'wb')
@ -357,7 +359,7 @@ class GCP():
self.journal.error("can't open dest")
self.journal.closeFile()
source_fd.close()
return
return True
GObject.io_add_watch(source_fd, GObject.IO_IN,self._copyFile,
(dest_fd, options),
@ -365,6 +367,7 @@ class GCP():
if not self.progress:
info(_("COPYING %(source)s ==> %(dest)s")
% {"source":source_file, "dest":dest_file})
return True
def __copyFailed(self, reason, source_fd, dest_fd):
"""Write the failure in the journal and close files descriptors"""

View File

@ -1,10 +1,10 @@
#!/usr/bin/env python3
from setuptools import setup
import setuptools
name = 'gcp'
setup(
setuptools.setup(
name=name,
version='0.2.0',
url='https://code.lm7.fr/mcy/gcp',
@ -36,12 +36,15 @@ setup(
'Topic :: Utilities',
],
scripts=['gcp'],
# entry_points={
# 'console_scripts': ['gcp=gcp:main'],
# },
data_files=[
('share/locale/fr/LC_MESSAGES', ['i18n/fr/LC_MESSAGES/gcp.mo']),
('share/man/man1', ["gcp.1"]),
('share/doc/%s' % name, ['COPYING', 'README.md']),
('share/doc/%s' % name, ['CHANGELOG', 'LICENSE.txt', 'README.md']),
],
scripts=['gcp'],
install_requires=['PyGObject', 'dbus-python'],
python_requires='>=3',
)