Commit: c3595fcc6a027b6137547577286749981844abc8 - allura (git)

allura

Commit MetaInfo

• Revision: c3595fcc6a027b6137547577286749981844abc8 (tree)
• Zeit: 2012-06-12 00:47:42
• Autor: Dave Brondsema <dbrondsema@geek...>
• Commiter: Dave Brondsema

Log Message

[#4254] remove source/hash logic from blog post slugs, since they were causing view/edit links not to work. Moreover, they aren't really necessary and make the URL uglier

Ändern Zusammenfassung

• modified: ForgeBlog/forgeblog/command/rssfeeds.py
• modified: ForgeBlog/forgeblog/model/blog.py

Diff

--- a/ForgeBlog/forgeblog/command/rssfeeds.py
+++ b/ForgeBlog/forgeblog/command/rssfeeds.py
@@ -182,7 +182,7 @@ class RssFeedsCommand(base.BlogCommand):
 
             updated = datetime.utcfromtimestamp(mktime(e.updated_parsed))
 
-            base_slug = BM.BlogPost.make_base_slug(title, updated, feed_url)
+            base_slug = BM.BlogPost.make_base_slug(title, updated)
             b_count = BM.BlogPost.query.find(dict(slug=base_slug, app_config_id=appid)).count()
             if b_count == 0:
                 post = BM.BlogPost(title=title, text=content, timestamp=updated,
@@ -190,7 +190,7 @@ class RssFeedsCommand(base.BlogCommand):
                                tool_version={'blog': version.__version__},
                                state='published')
                 post.neighborhood_id=c.project.neighborhood_id
-                post.make_slug(source=feed_url)
+                post.make_slug()
                 post.commit()
 
         session(BM.BlogPost).flush()

--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -139,26 +139,17 @@ class BlogPost(M.VersionedArtifact):
         return '%s@%s%s' % (self.title.replace('/', '.'), domain, config.common_suffix)
 
     @staticmethod
-    def make_base_slug(title, timestamp, source = None):
+    def make_base_slug(title, timestamp):
         slugsafe = ''.join(
             ch.lower()
             for ch in title.replace(' ', '-')
             if ch.isalnum() or ch == '-')
-        if source is None:
-            base = '%s/%s' % (
+        return '%s/%s' % (
                 timestamp.strftime('%Y/%m'),
                 slugsafe)
-        else:
-            m = hashlib.md5()
-            m.update(source)
-            link_hash_key = m.hexdigest()[:16]
-            base = '%s/%s/%s' % (
-                timestamp.strftime('%Y/%m'),
-                link_hash_key, slugsafe)
-        return base
 
-    def make_slug(self, source = None):
-        base = BlogPost.make_base_slug(self.title, self.timestamp, source)
+    def make_slug(self):
+        base = BlogPost.make_base_slug(self.title, self.timestamp)
         self.slug = base
         while True:
             try:
@@ -166,7 +157,6 @@ class BlogPost(M.VersionedArtifact):
                 return self.slug
             except DuplicateKeyError:
                 self.slug = base + '-%.3d' % randint(0,999)
-                return self.slug
 
     def url(self):
         return self.app.url + self.slug + '/'