kallithea Changeset - 979edf6a2990

Changeset - 979edf6a2990

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2013-05-11 21:33:45
marcin@python-works.com

Prefix gist storage with rc, and store some metadata info into
gist store repos

1 file changed with 15 insertions and 3 deletions:

rhodecode/model/gist.py

0 comments (0 inline, 0 general)

rhodecode/model/gist.py

➞

Show inline comments

@@ @@ -13,44 +13,46 @@ @@
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import with_statement
 import os
 import time
 import logging
 import traceback
 import shutil
 from pylons.i18n.translation import _
 from rhodecode.lib.utils2 import safe_unicode, unique_id, safe_int, \
     time_to_datetime, safe_str, AttributeDict
 from rhodecode.lib.compat import json
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.db import Gist
 from rhodecode.model.repo import RepoModel
 from rhodecode.model.scm import ScmModel
 from rhodecode.lib.vcs import get_repo
 log = logging.getLogger(__name__)
 GIST_STORE_LOC = '.gist_store'
 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 self._get_instance(Gist, gist,
                                   callback=Gist.get_by_access_id)
@@ @@ -134,25 +136,35 @@ class GistModel(BaseModel): @@
         #fake RhodeCode Repository object
         fake_repo = AttributeDict(dict(
             repo_name=gist_repo_path,
             scm_instance_no_cache=lambda: repo,
         ))
         ScmModel().create_nodes(
             user=owner.user_id, repo=fake_repo,
             message=message,
             nodes=processed_mapping,
             trigger_push_hook=False
+        )
         # store metadata inside the gist, this can be later used for imports
         # or gist identification
         metadata = {
             'gist_db_id': gist.gist_id,
             'gist_access_id': gist.gist_access_id,
             'gist_owner_id': owner.user_id,
             'gist_type': gist.gist_type,
             'gist_exipres': gist.gist_expires
+        }
         with open(os.path.join(repo.path, '.hg', GIST_METADATA_FILE), 'wb') as f:
             f.write(json.dumps(metadata))
         return gist
     def delete(self, gist, fs_remove=True):
         gist = self._get_gist(gist)
         try:
             self.sa.delete(gist)
             if fs_remove:
                 self.__delete_gist(gist)
             else:
                 log.debug('skipping removal from filesystem')

0 comments (0 inline, 0 general)