Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Filesystemshuffle #489

Merged
merged 2 commits into from

2 participants

Memphiz Joakim Plate
Memphiz
Owner

This PR renames the files and classes in xbmc/filesystem so that the protocol is prefix instead of suffix. This makes it easier to find things in the projects. It also splits HDHomeRun and Slingbox into appropriate File and Directory implementations for beeing consistent.

I've compile tested this on ios/osx/linux/win32. I'm good with waiting for this to be merged after eden.

Joakim Plate
Collaborator

I think squashing rename + include fix + buildsystem, you'd still keep history intact (the change in the files should be small enough for git to detect the rename i think). That way we still get a bisectable tree.
Test above but keep old branch around until we verify that it worked.

Memphiz
Owner

Since the order of the commits doesn't allow to fullfill your suggestion, the only option would be to squash this all into one commit for beeing bisectable :(

Joakim Plate
Collaborator

Why?

Only squash:
"[fix] - buildsystem/projects after file renaming"
"[rename] - rename all iFile and iDirectory implementations to have the p.."
"[fix] - includes after file renaming"

Which are in the correct order.
Leave the other commits separate. I think it should still detect the rename.

Joakim Plate
Collaborator

Actually squash the splits of hdhomerun/slingbox into that too. Just keep the class name rename separate.

Memphiz
Owner

Yeah - i'll do that ... the splitups where offending to the sqash because they are in the middle (because that was the order i did the work ...)

Memphiz
Owner
  • done - the only thing git didn't get right is the rename of Slingbox.h -> SlingboxFile.h ... dunno why - i've used git mv when doint it :(
Joakim Plate
Collaborator

@cptspiff what do you think?

My only thought is that stuff like DirectoryFactory/DirectoryCache should remain with directory first too keep them together. They are helper functions not actual protocols. But nothing i'll push for.

Deleted user

i agree.

Memphiz
Owner

Rebased the PR and changed renamed the cache files back again. That would be the FileList (class names are same with prefixed "C" as usual):

http://pastebin.com/LvDsJhhL

Ready to go from my side...

PS: please keep the noise low ... that renaming stuff is really annoying work ;)

Memphiz
Owner

rebase for the sake of the green button

Deleted user ghost was assigned
Memphiz
Owner

cptspiff signed off (well kind of) on irc

Joakim Plate
Collaborator

You have my sign of.

Memphiz added some commits
Memphiz Memphiz [rename] - rename all iFile and iDirectory implementations to have th…
…e protocol in suffix instead of prefix in filesystem

- fix includes after file renaming
- split Slingbox to SlingboxFile and SlingboxDirectory
- split HDHomeRun to HDHomeRunFile and HDHomeRunDirectory
- fix buildsystem/projects after file renaming
018224c
Memphiz Memphiz i[rename] - class names according to filenames for filesystem impleme…
…ntations
2031bb8
Memphiz Memphiz merged commit aef4bcb into from
Dale Hamel dalehamel referenced this pull request from a commit in RasPlex/plex-home-theatre
Tobias Hieta tru Fix windows install directory
Fixes #489
66463f5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 27, 2012
  1. Memphiz

    [rename] - rename all iFile and iDirectory implementations to have th…

    Memphiz authored
    …e protocol in suffix instead of prefix in filesystem
    
    - fix includes after file renaming
    - split Slingbox to SlingboxFile and SlingboxDirectory
    - split HDHomeRun to HDHomeRunFile and HDHomeRunDirectory
    - fix buildsystem/projects after file renaming
  2. Memphiz
Something went wrong with that request. Please try again.