Image macro references inconsistent with attachment links

[Mikael Relbe]

The format of the reference for Image macro is not aligned with that of attachment: links.

External reference to attachment is stated as "attachment:file:module:id". It would be nice if one could copy an attachment link to the Image macro by just ripping away "attachment:"

Now, one has to swap parts of the attachment reference to suit the Image macro:

attachment:file:module:id > [[Image(module:id:file)]]

This is annoying/confusing.

My view is that the Image macro is fault since both attachment: and comment: links use the same pattern. (Hard to accept, I imagine, since that would break existing image references to external resources.)

[Mikael Relbe]

Sorry, didn't mean to report this as a defect, this is of cource an enhancement proposal (however painful…)

[Christian Boos]

So we should support [[Image(file:module:id)]] ↔ attachment:file:module:id.

As a first step, it shouldn't be that problematic to try supporting both.

Given 1:2:3, check whether:

• 2:3 refers to a resource (using extract_link) (new syntax)
• if not, that 1:2 refers to a resource (old syntax)

[Ryan J Ollos <ryano@…>]

It looks like module:id:file is a legacy TracLink syntax, supported by the attachment module trunk/trac/attachment.py@11112:966-975#L962​. From the documentation for the attachment TracLink: Note that the older way, putting the filename at the end, is still supported: attachment:ticket:753:the_file.txt.

I started an implementation that is patterned after that for the attachment module. I couldn't see a way to do it using extract_link that was as clean. There seems to be some undocumented intertrac support, however it doesn't seem to work, and I can't understand how the ImageMacro could even benefit from intertrac support.

So here is a partial patch that would not preserve the existing intertrac functionality, but I'm hoping to get some feedback on how to deal with that before proceeding.

trac-trunk/trac/wiki/macros.py

@@ -26 +26 @@
 
 from trac.core import *
 from trac.resource import (
-    Resource, ResourceNotFound, get_resource_name, get_resource_summary,
-    get_resource_url
+    Resource, ResourceNotFound, ResourceSystem, get_resource_name,
+    get_resource_summary, get_resource_url
 )
 from trac.util.datefmt import format_date, from_utimestamp, user_time
 from trac.util.html import escape, find_element
@@ -595 +595 @@
             if params:
                 url += '?' + params
             raw_url, desc = url, filespec
-        elif len(parts) == 3:                 # realm:id:attachment-filename
-            #                                 # or intertrac:realm:id
-            realm, id, filename = parts
+        elif len(parts) == 3: 
+            known_realms = ResourceSystem(self.env).get_known_realms()
+            if parts[1] in known_realms: # new-style: filename:realm:id
+                filename, realm, id = parts
+            else: # old-style: realm:id:filename       
+                realm, id, filename = parts
             intertrac_target = "%s:%s" % (id, filename)
-            it = formatter.get_intertrac_url(realm, intertrac_target)
+            it = formatter.get_intertrac_url(realm, intertrac_target) # intertrac:realm:id
             if it:
                 url, desc = it
                 raw_url = url + unicode_quote('?format=raw')

[Ryan J Ollos]

Retargetting tickets to narrow focus for milestone:1.2. Please move the ticket back to milestone:next-dev-1.1.x if you intend to resolve it by milestone:1.2.