diff --git a/install b/install index 0a6598ca8..afb1f1b00 100755 --- a/install +++ b/install @@ -313,8 +313,10 @@ else fi # Check if composer exists and install if it doesn't +set +e eval hash "composer" 2>/dev/null commandFound=$? +set -e if [[ ! ${commandFound} -eq 0 ]]; then curl -sS https://getcomposer.org/installer | php mv composer.phar /usr/local/bin/composer diff --git a/python_apps/pypo/pypo/pypofetch.py b/python_apps/pypo/pypo/pypofetch.py index a0890e186..6406436ac 100644 --- a/python_apps/pypo/pypo/pypofetch.py +++ b/python_apps/pypo/pypo/pypofetch.py @@ -348,7 +348,6 @@ class PypoFetch(Thread): fileExt = self.sanity_check_media_item(media_item) dst = os.path.join(download_dir, unicode(media_item['id']) + unicode(fileExt)) media_item['dst'] = dst - self.logger.info(media_item['dst']) media_item['file_ready'] = False media_filtered[key] = media_item @@ -378,7 +377,7 @@ class PypoFetch(Thread): end = datetime.strptime(media_item['end'], "%Y-%m-%d-%H-%M-%S") mime = media_item['metadata']['mime'] - mimetypes.init("%s/mime.types" % os.path.dirname(os.path.realpath(__file__))) + mimetypes.init(["%s/mime.types" % os.path.dirname(os.path.realpath(__file__))]) mime_ext = mimetypes.guess_extension(mime, strict=False) length1 = pure.date_interval_to_seconds(end - start) diff --git a/python_apps/pypo/pypo/pypofile.py b/python_apps/pypo/pypo/pypofile.py index 157c8e1b5..f4288af53 100644 --- a/python_apps/pypo/pypo/pypofile.py +++ b/python_apps/pypo/pypo/pypofile.py @@ -61,7 +61,7 @@ class PypoFile(Thread): media_item['file_ready'] = not do_copy if do_copy: - self.logger.debug("copying from %s to local cache %s" % (src, dst)) + self.logger.info("copying from %s to local cache %s" % (src, dst)) try: CONFIG_SECTION = "general" username = self._config.get(CONFIG_SECTION, 'api_key')