kallithea Changeset - ce0dfe6333e2

Changeset - ce0dfe6333e2

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Søren Løvborg - 9 years ago 2017-01-18 17:10:22
sorenl@unity3d.com

model: inline GistModel._get_gist calls

1 file changed with 3 insertions and 11 deletions:

kallithea/model/gist.py

0 comments (0 inline, 0 general)

kallithea/model/gist.py

➞

Show inline comments

@@ @@ -44,20 +44,12 @@ log = logging.getLogger(__name__) @@
 GIST_STORE_LOC = '.rc_gist_store'
 GIST_METADATA_FILE = '.rc_gist_metadata'
 class GistModel(BaseModel):
     def _get_gist(self, gist):
         """
         Helper method to get gist by ID, or gist_access_id as a fallback
         :param gist: GistID, gist_access_id, or Gist instance
         """
         return Gist.guess_instance(gist)
     def __delete_gist(self, gist):
         """
         removes gist from filesystem
         :param gist: gist object
         """
@@ @@ -82,13 +74,13 @@ class GistModel(BaseModel): @@
             'gist_updated': time.time(),
+        }
         with open(os.path.join(repo.path, '.hg', GIST_METADATA_FILE), 'wb') as f:
             f.write(json.dumps(metadata))
     def get_gist(self, gist):
-        return self._get_gist(gist)
+        return Gist.guess_instance(gist)
     def get_gist_files(self, gist_access_id, revision=None):
         """
         Get files for given gist
         :param gist_access_id:
@@ @@ -168,26 +160,26 @@ class GistModel(BaseModel): @@
         self._store_metadata(repo, gist.gist_id, gist.gist_access_id,
                              owner.user_id, gist.gist_type, gist.gist_expires)
         return gist
     def delete(self, gist, fs_remove=True):
-        gist = self._get_gist(gist)
+        gist = Gist.guess_instance(gist)
         try:
             self.sa.delete(gist)
             if fs_remove:
                 self.__delete_gist(gist)
             else:
                 log.debug('skipping removal from filesystem')
         except Exception:
             log.error(traceback.format_exc())
             raise
     def update(self, gist, description, owner, gist_mapping, gist_type,
                lifetime):
-        gist = self._get_gist(gist)
+        gist = Gist.guess_instance(gist)
         gist_repo = gist.scm_instance
         lifetime = safe_int(lifetime, -1)
         if lifetime == 0:  # preserve old value
             gist_expires = gist.gist_expires
         else:

0 comments (0 inline, 0 general)