looking great

3 files changed, 16 insertions, 23 deletions

diff --git a/photoblaster/_file.py b/photoblaster/_file.py
index cf07510..4a16000 100644
--- a/photoblaster/_file.py
+++ b/photoblaster/_file.py
@@ -196,6 +196,8 @@ class File(object):
             BIN_GIFSICLE,
             self.get_filepath(),
             "--optimize=2",
+            "--colors",
+            "256"
         ]
         call(cmd, stdout=f)
         cmd2 = ["mv", filepath_tmp, self.get_filepath()]
diff --git a/photoblaster/modules/pbbreaker/__init__.py b/photoblaster/modules/pbbreaker/__init__.py
index bac5372..fb3f26a 100755
--- a/photoblaster/modules/pbbreaker/__init__.py
+++ b/photoblaster/modules/pbbreaker/__init__.py
@@ -152,13 +152,18 @@ class PbBreaker(ModuleBase):
                 extension="jpg",
             )
             self._call_cmd(
-                [BIN_CONVERT, self.params.url.path, jpg_file.get_filepath()])
+                [
+                    BIN_CONVERT,
+                    self.params.url.get_file().get_filepath(),
+                    jpg_file.get_filepath()
+                ]
+            )
             self._files_created.append(jpg_file)
             self._conversion_file = jpg_file
 
     def _first_conversion(self):
         if self.params.url.mimetype == self.params.breaktype:
-            self._conversion_file = self.params.url.path
+            self._conversion_file = self.params.url.get_file().get_filepath()
             return
         self._call_cmd([BIN_CONVERT,
                         self.params.url.get_file().get_filepath(),
diff --git a/photoblaster/param/img_url.py b/photoblaster/param/img_url.py
index 4ff7423..6e87c71 100644
--- a/photoblaster/param/img_url.py
+++ b/photoblaster/param/img_url.py
@@ -34,17 +34,17 @@ class Img_url(Param):
 
             )
             self._image_download(value)
-            self.mimetype = self._image_mimetype(self.get_filepath())
-            self.set_filepath(
-                "%s.%s" % (self.get_filepath(), self.mimetype),
+            self.mimetype = self._image_mimetype(self._file.get_filepath())
+            self._file.set_filepath(
+                "%s.%s" % (self._file.get_filepath(), self.mimetype),
                 module=module
             )
             self.url = value
 
     def __dict__(self):
         return {
-            'filename': self.get_filename(),
-            'path': self.get_filepath(),
+            'filename': self.get_file().get_filename(),
+            'path': self.get_file().get_filepath(),
             'url': self.url,
             'mimetype': self.mimetype
         }
@@ -65,7 +65,8 @@ class Img_url(Param):
         if self.username in SPECIAL_DOWNLOADERS:
             max_size = SPECIAL_DOWNLOADERS_MAX_SIZE
         try:
-            self._download(url, self.get_filepath(), max_size=max_size)
+            self._download(
+                url, self.get_file().get_filepath(), max_size=max_size)
         except Exception:
             self.err_warn("Download failed")
 
@@ -114,20 +115,5 @@ class Img_url(Param):
         except Exception:
             self.err_warn("Couldn't determine mimetype")
 
-    def delete(self):
-        self._file.delete()
-
-    def get_filename(self):
-        return self._file.get_filename()
-
-    def get_filepath(self):
-        return self._file.get_filepath()
-
-    def set_filepath(self, *args, **kwargs):
-        return self._file.set_filepath(*args, **kwargs)
-
-    def get_file_dimensions(self):
-        return self._file.get_dimensions()
-
     def get_file(self):
         return self._file