Commit 153aee8e authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

GITHUB_PLUGIN now works and can be used under Linux immediately. 

Other platforms to follow as volunteers test support and get openssl in 
place.
parent 0a3e76a7

pcbnew/dialogs/dialog_fp_lib_table.cpp

+7 −1
Original line number Original line Diff line number Diff line
@@ -628,11 +628,17 @@ public: 




        wxArrayString choices;

        wxArrayString choices;

        choices.Add( IO_MGR::ShowType( IO_MGR::KICAD ) );

        choices.Add( IO_MGR::ShowType( IO_MGR::KICAD ) );

#if defined(BUILD_GITHUB_PLUGIN)

        choices.Add( IO_MGR::ShowType( IO_MGR::GITHUB ) );

#endif

        choices.Add( IO_MGR::ShowType( IO_MGR::LEGACY ) );

        choices.Add( IO_MGR::ShowType( IO_MGR::LEGACY ) );

        choices.Add( IO_MGR::ShowType( IO_MGR::EAGLE ) );

        choices.Add( IO_MGR::ShowType( IO_MGR::EAGLE ) );

        choices.Add( IO_MGR::ShowType( IO_MGR::PCAD ) );

        choices.Add( IO_MGR::ShowType( IO_MGR::GEDA_PCB ) );

        choices.Add( IO_MGR::ShowType( IO_MGR::GEDA_PCB ) );





        /* PCAD_PLUGIN does not support Footprint*() functions

        choices.Add( IO_MGR::ShowType( IO_MGR::GITHUB ) );

        */



        wxGridCellAttr* attr;

        wxGridCellAttr* attr;





        attr = new wxGridCellAttr;

        attr = new wxGridCellAttr;

pcbnew/github/github_plugin.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -61,10 +61,10 @@ typedef MODULE_MAP::const_iterator MODULE_CITER; 








/**

/**

 * Class FPL_CACHE

 * Class GH_CACHE

 * assists only within GITHUB_PLUGIN and hold a map of footprint name to wxZipEntry

 * assists only within GITHUB_PLUGIN and hold a map of footprint name to wxZipEntry

 */

 */

struct FPL_CACHE : public MODULE_MAP

struct GH_CACHE : public MODULE_MAP

{

{

    // MODULE_MAP is a boost::ptr_map template, made into a class hereby.

    // MODULE_MAP is a boost::ptr_map template, made into a class hereby.

};

};
@@ -157,7 +157,7 @@ void GITHUB_PLUGIN::cacheLib( const wxString& aLibraryPath ) throw( IO_ERROR ) 
    if( !m_cache || m_lib_path != aLibraryPath )

    if( !m_cache || m_lib_path != aLibraryPath )

    {

    {

        delete m_cache;

        delete m_cache;

        m_cache = new FPL_CACHE();

        m_cache = new GH_CACHE();

        remote_get_zip( aLibraryPath );

        remote_get_zip( aLibraryPath );

        m_lib_path = aLibraryPath;

        m_lib_path = aLibraryPath;

pcbnew/github/github_plugin.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 
#define GITHUB_PLUGIN_H_

#define GITHUB_PLUGIN_H_









struct FPL_CACHE;

struct GH_CACHE;









/**

/**
@@ -82,7 +82,7 @@ private: 




    wxString    m_lib_path;     ///< from aLibraryPath, something like https://github.com/liftoff-sr/pretty_footprints

    wxString    m_lib_path;     ///< from aLibraryPath, something like https://github.com/liftoff-sr/pretty_footprints

    std::string m_zip_image;    ///< byte image of the zip file in its entirety.

    std::string m_zip_image;    ///< byte image of the zip file in its entirety.

    FPL_CACHE*  m_cache;

    GH_CACHE*  m_cache;

};

};





#endif // GITHUB_PLUGIN_H_
 
#endif // GITHUB_PLUGIN_H_